Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
dentou committed Dec 6, 2023
1 parent 8f1a852 commit fc1de6d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 29 deletions.
4 changes: 2 additions & 2 deletions mkdocs_awesome_pages_plugin/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def load_from(path: str) -> "Meta":
context=path,
)
)

if force_collapse is not None:
if not isinstance(force_collapse, bool):
raise TypeError(
Expand All @@ -246,7 +246,7 @@ def load_from(path: str) -> "Meta":
context=path,
)
)

if hide is not None:
if not isinstance(hide, bool):
raise TypeError(
Expand Down
31 changes: 6 additions & 25 deletions mkdocs_awesome_pages_plugin/navigation.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def _process_child_sections(self, children: List[NavigationItem], collapse: bool
items = self._process_section(item, collapse)
result.extend(items)
else:
result.append(item)
result.append(item)
return result

def _order(self, items: List[NavigationItem], meta: Meta):
Expand Down Expand Up @@ -241,36 +241,17 @@ def _set_title(section: Section, meta: Meta):
section.title = meta.title

@staticmethod
def _collapse(section: Section, collapse: Optional[bool], collapse_recursive: bool, force_collapse: bool=False) -> List[NavigationItem]:
# if collapse is None:
# collapse = collapse_recursive

# if collapse and len(section.children) == 1:
# return section.children[0]
# return section

# if collapse is None:
# if collapse_recursive and len(section.children) == 1:
# return [section.children[0]]
# else:
# return [section]

# elif collapse:
# return section.children

# return [section]


def _collapse(
section: Section, collapse: Optional[bool], collapse_recursive: bool, force_collapse: bool = False
) -> List[NavigationItem]:
if collapse is None:
collapse = collapse_recursive

if collapse:
if collapse:
if force_collapse or len(section.children) == 1:
return section.children

return [section]


return [section]

def to_mkdocs(self) -> MkDocsNavigation:
pages = get_by_type(self.items, Page)
Expand Down
20 changes: 18 additions & 2 deletions mkdocs_awesome_pages_plugin/tests/e2e/test_collapse.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,28 @@ def test_local_multichildren(self):
[("a", [("b", [("c", ["page.md"]), ("d", ["page2.md"]), self.pagesFile(collapse=True)])])],
)

self.assertEqual(navigation, [("A", [("B", [("C", [("Page", "/a/b/c/page")]), ("D", [("Page2", "/a/b/d/page2")])])])])
self.assertEqual(
navigation, [("A", [("B", [("C", [("Page", "/a/b/c/page")]), ("D", [("Page2", "/a/b/d/page2")])])])]
)

def test_local_multichildren_force_collapse(self):
navigation = self.mkdocs(
self.config,
[("a", [("b", [("c", ["page.md"]), ("d", ["page2.md"]), self.pagesFile(collapse=True, force_collapse=True)])])],
[
(
"a",
[
(
"b",
[
("c", ["page.md"]),
("d", ["page2.md"]),
self.pagesFile(collapse=True, force_collapse=True),
],
)
],
)
],
)

self.assertEqual(navigation, [("A", [("C", [("Page", "/a/b/c/page")]), ("D", [("Page2", "/a/b/d/page2")])])])
Expand Down

0 comments on commit fc1de6d

Please sign in to comment.