remove sidebar props from context

This commit is contained in:
Abhinav 2022-06-09 12:45:29 +05:30
parent 31b976fa87
commit 9d4e30d9ea
3 changed files with 14 additions and 13 deletions

View file

@ -1,4 +1,4 @@
import React, { useContext } from 'react'; import React from 'react';
import NavigationSection from './NavigationSection'; import NavigationSection from './NavigationSection';
import UtilitySection from './UtilitySection'; import UtilitySection from './UtilitySection';
@ -9,14 +9,17 @@ import { DrawerSidebar, PaddedDivider } from './styledComponents';
import HeaderSection from './Header'; import HeaderSection from './Header';
import { CollectionSummaries } from 'types/collection'; import { CollectionSummaries } from 'types/collection';
import UserDetailsSection from './userDetailsSection'; import UserDetailsSection from './userDetailsSection';
import { GalleryContext } from 'pages/gallery';
interface Iprops { interface Iprops {
collectionSummaries: CollectionSummaries; collectionSummaries: CollectionSummaries;
sidebarView: boolean;
closeSidebar: () => void;
} }
export default function Sidebar({ collectionSummaries }: Iprops) { export default function Sidebar({
const { sidebarView, closeSidebar } = useContext(GalleryContext); collectionSummaries,
sidebarView,
closeSidebar,
}: Iprops) {
return ( return (
<DrawerSidebar open={sidebarView} onClose={closeSidebar}> <DrawerSidebar open={sidebarView} onClose={closeSidebar}>
<HeaderSection closeSidebar={closeSidebar} /> <HeaderSection closeSidebar={closeSidebar} />

View file

@ -130,8 +130,6 @@ const defaultGalleryContext: GalleryContextType = {
syncWithRemote: () => null, syncWithRemote: () => null,
setNotificationAttributes: () => null, setNotificationAttributes: () => null,
setBlockingLoad: () => null, setBlockingLoad: () => null,
sidebarView: false,
closeSidebar: () => null,
}; };
export const GalleryContext = createContext<GalleryContextType>( export const GalleryContext = createContext<GalleryContextType>(
@ -204,7 +202,7 @@ export default function Gallery() {
const [electronFiles, setElectronFiles] = useState<ElectronFile[]>(null); const [electronFiles, setElectronFiles] = useState<ElectronFile[]>(null);
const [uploadTypeSelectorView, setUploadTypeSelectorView] = useState(false); const [uploadTypeSelectorView, setUploadTypeSelectorView] = useState(false);
const [sidebarView, setSidebarView] = useState(false); const [sidebarView, setSidebarView] = useState(true);
const closeSidebar = () => setSidebarView(false); const closeSidebar = () => setSidebarView(false);
const openSidebar = () => setSidebarView(true); const openSidebar = () => setSidebarView(true);
@ -584,8 +582,6 @@ export default function Gallery() {
syncWithRemote, syncWithRemote,
setNotificationAttributes, setNotificationAttributes,
setBlockingLoad, setBlockingLoad,
closeSidebar,
sidebarView,
}}> }}>
<FullScreenDropZone <FullScreenDropZone
getRootProps={getRootProps} getRootProps={getRootProps}
@ -683,7 +679,11 @@ export default function Gallery() {
setUploadTypeSelectorView={setUploadTypeSelectorView} setUploadTypeSelectorView={setUploadTypeSelectorView}
showSessionExpiredMessage={showSessionExpiredMessage} showSessionExpiredMessage={showSessionExpiredMessage}
/> />
<Sidebar collectionSummaries={collectionSummaries} /> <Sidebar
collectionSummaries={collectionSummaries}
sidebarView={sidebarView}
closeSidebar={closeSidebar}
/>
<PhotoFrame <PhotoFrame
files={files} files={files}

View file

@ -24,6 +24,4 @@ export type GalleryContextType = {
syncWithRemote: (force?: boolean, silent?: boolean) => Promise<void>; syncWithRemote: (force?: boolean, silent?: boolean) => Promise<void>;
setNotificationAttributes: (attributes: NotificationAttributes) => void; setNotificationAttributes: (attributes: NotificationAttributes) => void;
setBlockingLoad: (value: boolean) => void; setBlockingLoad: (value: boolean) => void;
sidebarView: boolean;
closeSidebar: () => void;
}; };