Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(theme-classic): autocollapse sidebar categories when navigating with paginator #7411

Merged
merged 7 commits into from
May 14, 2022
Merged

fix(theme-classic): autocollapse sidebar categories when navigating with paginator #7411

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ae56b3
fix: autocollapse sidebar categories
pranabdas May 13, 2022
6ad75b4
Add autoCollapseCategories in dependency array
pranabdas May 13, 2022
3918a4f
restore collapse button behavior
pranabdas May 13, 2022
f25b705
simplify
pranabdas May 13, 2022
7997c73
hopefully a better fix
pranabdas May 13, 2022
58df297
refactor
Josh-Cena May 14, 2022
33d423c
try this
Josh-Cena May 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ import useIsBrowser from '@docusaurus/useIsBrowser';
function useAutoExpandActiveCategory({
isActive,
collapsed,
setCollapsed,
updateCollapsed,
}: {
isActive: boolean;
collapsed: boolean;
setCollapsed: (b: boolean) => void;
updateCollapsed: (b: boolean) => void;
}) {
const wasActive = usePrevious(isActive);
useEffect(() => {
const justBecameActive = isActive && !wasActive;
if (justBecameActive && collapsed) {
setCollapsed(false);
updateCollapsed(false);
}
}, [isActive, wasActive, collapsed, setCollapsed]);
}, [isActive, wasActive, collapsed, updateCollapsed]);
}

/**
Expand Down Expand Up @@ -105,6 +105,11 @@ export default function DocSidebarItemCategory({
...props
}: Props): JSX.Element {
const {items, label, collapsible, className, href} = item;
const {
docs: {
sidebar: {autoCollapseCategories},
},
} = useThemeConfig();
const hrefWithSSRFallback = useCategoryHrefWithSSRFallback(item);

const isActive = isActiveSidebarItem(item, activePath);
Expand All @@ -121,17 +126,13 @@ export default function DocSidebarItemCategory({
},
});

useAutoExpandActiveCategory({isActive, collapsed, setCollapsed});
const {expandedItem, setExpandedItem} = useDocSidebarItemsExpandedState();
function updateCollapsed(toCollapsed: boolean = !collapsed) {
// Use this instead of `setCollapsed`, because it is also reactive
const updateCollapsed = (toCollapsed: boolean = !collapsed) => {
setExpandedItem(toCollapsed ? null : index);
setCollapsed(toCollapsed);
}
const {
docs: {
sidebar: {autoCollapseCategories},
},
} = useThemeConfig();
};
useAutoExpandActiveCategory({isActive, collapsed, updateCollapsed});
useEffect(() => {
if (
collapsible &&
Expand Down