π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
refactor(settings):render-export-in-utility-section
Aswin Asok88adbd8e8efe
diff --git a/web/apps/photos/src/components/sidebar/Sidebar.tsx b/web/apps/photos/src/components/sidebar/Sidebar.tsxindex 35d203cdb1..f5a08cd82d 100644--- a/web/apps/photos/src/components/sidebar/Sidebar.tsx+++ b/web/apps/photos/src/components/sidebar/Sidebar.tsx@@ -300,7 +300,12 @@ export const Sidebar: React.FC<SidebarProps> = ({/><UtilitySectiononCloseSidebar={onClose}+ exportVisibilityProps={{+ ...exportVisibilityProps,+ open: open && exportVisibilityProps.open,+ }}{...{+ collectionNameByID,showExport: selectSection(handleShowExport),onAuthenticateUser,onShowPlanSelector,@@ -336,13 +341,6 @@ export const Sidebar: React.FC<SidebarProps> = ({<InfoSection /></Stack></RootSidebarDrawer>- {open && exportVisibilityProps.open && (- <Export- {...exportVisibilityProps}- collectionNameByID={collectionNameByID}- onRootClose={onClose}- />- )}{children}</SidebarDrawerShell>);@@ -628,8 +626,12 @@ const ShortcutSection: React.FC<ShortcutSectionProps> = ({};type UtilitySectionProps = SectionProps &- Pick<SidebarProps, "onAuthenticateUser" | "onShowPlanSelector"> & {+ Pick<+ SidebarProps,+ "onAuthenticateUser" | "onShowPlanSelector" | "collectionNameByID"+ > & {showExport: () => void;+ exportVisibilityProps: ModalVisibilityProps;showAccount: () => void;accountVisibilityProps: ModalVisibilityProps;showReferrals: () => void;@@ -656,6 +658,8 @@ type UtilitySectionProps = SectionProps &const UtilitySection: React.FC<UtilitySectionProps> = ({onCloseSidebar,showExport,+ exportVisibilityProps,+ collectionNameByID,onAuthenticateUser,onShowPlanSelector,showAccount,@@ -724,6 +728,13 @@ const UtilitySection: React.FC<UtilitySectionProps> = ({}onClick={showExport}/>+ {exportVisibilityProps.open && (+ <Export+ {...exportVisibilityProps}+ collectionNameByID={collectionNameByID}+ onRootClose={onCloseSidebar}+ />+ )}{helpVisibilityProps.open && (<Help{...helpVisibilityProps}diff --git a/web/apps/photos/src/components/sidebar/SidebarDrawerShell.tsx b/web/apps/photos/src/components/sidebar/SidebarDrawerShell.tsxindex 0ef7413b9b..48e83638b6 100644--- a/web/apps/photos/src/components/sidebar/SidebarDrawerShell.tsx+++ b/web/apps/photos/src/components/sidebar/SidebarDrawerShell.tsx@@ -23,7 +23,6 @@ export function SidebarDrawerShell({const panel = useRef<HTMLDivElement>(null);const container = () => panel.current;- // ponytail: retain stacked drawers outside the internal wide-screen preview.if (!isInternalUser || !wide) return children;return (