Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[web][photos] Close settings stack from family panel

AswinAsokda090eb4f441
diff --git a/web/apps/photos/src/components/sidebar/Sidebar.tsx b/web/apps/photos/src/components/sidebar/Sidebar.tsx
index 7ad4004a94..238b1c90d0 100644
--- a/web/apps/photos/src/components/sidebar/Sidebar.tsx
+++ b/web/apps/photos/src/components/sidebar/Sidebar.tsx
@@ -79,7 +79,7 @@ type SidebarProps = ModalVisibilityProps & {
onShowPlanSelector: (plansData?: PlansData) => void;
collectionNameByID: Map<number, string>;
onCloseOverlays: () => void;
- children?: React.ReactNode;
+ children?: (onRootClose: () => void) => React.ReactNode;
onAuthenticateUser: () => Promise<boolean>;
};
@@ -398,7 +398,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
onActionHandled={setPendingFreeUpSpaceAction}
/>
)}
- {children}
+ {children?.(onClose)}
</RootSidebarDrawer>
);
};
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index ad3948dffd..c8a0d9695e 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -2126,7 +2126,7 @@ const Page: React.FC = () => {
return <div></div>;
}
- const subscriptionDialogs = (
+ const renderSubscriptionDialogs = (onRootClose = handleSidebarClose) => (
<>
<PlanSelector
{...planSelectorVisibilityProps}
@@ -2137,7 +2137,7 @@ const Page: React.FC = () => {
{familyManagementVisibilityProps.open && (
<FamilyManagement
{...familyManagementVisibilityProps}
- onRootClose={handleSidebarClose}
+ onRootClose={onRootClose}
onShowPlanSelector={showPlanSelector}
/>
)}
@@ -2159,7 +2159,7 @@ const Page: React.FC = () => {
onDrop={setDragAndDropFiles}
>
{blockingLoad && <TranslucentLoadingOverlay />}
- {!sidebarVisibilityProps.open && subscriptionDialogs}
+ {!sidebarVisibilityProps.open && renderSubscriptionDialogs()}
<CollectionSelector
open={openCollectionSelector}
onClose={handleCloseCollectionSelector}
@@ -2456,7 +2456,10 @@ const Page: React.FC = () => {
onCloseOverlays={closeSidebarOverlays}
onAuthenticateUser={authenticateUser}
>
- {sidebarVisibilityProps.open && subscriptionDialogs}
+ {(onRootClose) =>
+ sidebarVisibilityProps.open &&
+ renderSubscriptionDialogs(onRootClose)
+ }
</Sidebar>
<WhatsNew {...whatsNewVisibilityProps} />
<PeopleConsentDialog