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

Jump to bottom

fix: make mobileControlsData optional #289

Merged
merged 3 commits into from
Sep 19, 2024
Merged

fix: make mobileControlsData optional #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82b55ee
make mobileControlsData optional
JeikZim Sep 19, 2024
1a88b70
fix: make mobileControlsData optional in SidebarNavigation
JeikZim Sep 19, 2024
1eab18a
make mobileControlsData optional in CustomNavigation
JeikZim Sep 19, 2024
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
2 changes: 1 addition & 1 deletion src/components/navigation/CustomNavigation/CustomNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const PC_PARANT_CLASS_NAME = 'pc-layout__navigation';
const b = block(CLASS_NAME);

export interface CustomNavigationProps extends NavigationComponentProps {
mobileControlsData: MobileControlsProps;
mobileControlsData?: MobileControlsProps;
navigationTocData: NavigationTocProps;
}

Expand Down
13 changes: 8 additions & 5 deletions src/components/navigation/SidebarContent/SidebarContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export interface SidebarContentProps extends ClassNameProps {
mainMenuOpenessData?: MainMenuOpenessProps;
pcNavigationData?: PCNavigationProps;
navigationTocData?: NavigationTocProps;
mobileControlsData: MobileControlsProps;
mobileControlsData?: MobileControlsProps;
}

export interface MainMenuOpenessProps {
Expand Down Expand Up @@ -47,8 +47,6 @@ export const SidebarContent: React.FC<SidebarContentProps & PropsWithChildren> =
mobileControlsData,
children,
}) => {
const {controlSize, lang, userSettings} = mobileControlsData;

const toc = navigationTocData &&
navigationTocData.toc &&
mainMenuOpenessData &&
Expand Down Expand Up @@ -95,9 +93,14 @@ export const SidebarContent: React.FC<SidebarContentProps & PropsWithChildren> =
</div>
);

const mobileControls = (
const data = mobileControlsData;
const mobileControls = data && (
<div className={b('controls-wrapper')}>
<MobileControls controlSize={controlSize} lang={lang} userSettings={userSettings} />
<MobileControls
controlSize={data.controlSize}
lang={data.lang}
userSettings={data.userSettings}
/>
</div>
);

Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/SidebarNavigation/SidebarNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const b = block('dc-sidebar-navigation');
export interface SidebarNavigationProps extends ClassNameProps {
isSidebarOpened: boolean;
onSidebarOpenedChange: (isOpened: boolean) => void;
mobileControlsData: MobileControlsProps;
mobileControlsData?: MobileControlsProps;
}

const SidebarNavigation: React.FC<SidebarNavigationProps & PropsWithChildren> = ({
Expand Down
Loading