Skip to content

armgit / ente

Public Imported from GitHub
0

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

fix(photos):scope-wider-drawers-to-settings

Aswin Asokf83b38c41da5
diff --git a/web/apps/photos/src/components/sidebar/FreeUpSpace.tsx b/web/apps/photos/src/components/sidebar/FreeUpSpace.tsx
index 190eefd1a9..a28a25f086 100644
--- a/web/apps/photos/src/components/sidebar/FreeUpSpace.tsx
+++ b/web/apps/photos/src/components/sidebar/FreeUpSpace.tsx
@@ -64,6 +64,7 @@ export const FreeUpSpace: React.FC<FreeUpSpaceProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("free_up_space")}
diff --git a/web/apps/photos/src/components/sidebar/Help.tsx b/web/apps/photos/src/components/sidebar/Help.tsx
index beb5d8d771..2f4c2e3b8f 100644
--- a/web/apps/photos/src/components/sidebar/Help.tsx
+++ b/web/apps/photos/src/components/sidebar/Help.tsx
@@ -112,6 +112,7 @@ export const Help: React.FC<HelpProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("help")}
diff --git a/web/apps/photos/src/components/sidebar/ReferralSettings.tsx b/web/apps/photos/src/components/sidebar/ReferralSettings.tsx
index 8a05b1f34d..ce00002fbe 100644
--- a/web/apps/photos/src/components/sidebar/ReferralSettings.tsx
+++ b/web/apps/photos/src/components/sidebar/ReferralSettings.tsx
@@ -270,6 +270,7 @@ export const ReferralSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open }}
onClose={handleClose}
onRootClose={handleRootClose}
diff --git a/web/apps/photos/src/components/sidebar/Sidebar.tsx b/web/apps/photos/src/components/sidebar/Sidebar.tsx
index 404bca7551..59b11548ef 100644
--- a/web/apps/photos/src/components/sidebar/Sidebar.tsx
+++ b/web/apps/photos/src/components/sidebar/Sidebar.tsx
@@ -230,7 +230,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
}, [pendingAction]);
return (
- <RootSidebarDrawer open={open} onClose={onClose}>
+ <RootSidebarDrawer open={open} onClose={onClose} maxWidth="440px">
<HeaderSection onCloseSidebar={onClose} />
<UserDetailsSection
sidebarOpen={open}
diff --git a/web/apps/photos/src/components/sidebar/WatchFolder.tsx b/web/apps/photos/src/components/sidebar/WatchFolder.tsx
index b16c58a8fa..3950171d4d 100644
--- a/web/apps/photos/src/components/sidebar/WatchFolder.tsx
+++ b/web/apps/photos/src/components/sidebar/WatchFolder.tsx
@@ -138,6 +138,7 @@ export const WatchFolder: React.FC<NestedSidebarDrawerVisibilityProps> = ({
return (
<>
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("watch_folders")}
diff --git a/web/apps/photos/src/components/sidebar/account/SessionsSettings.tsx b/web/apps/photos/src/components/sidebar/account/SessionsSettings.tsx
index d9a0786dd4..5d4a9faba3 100644
--- a/web/apps/photos/src/components/sidebar/account/SessionsSettings.tsx
+++ b/web/apps/photos/src/components/sidebar/account/SessionsSettings.tsx
@@ -47,6 +47,7 @@ export const SessionsSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("active_sessions")}
diff --git a/web/apps/photos/src/components/sidebar/account/TwoFactorSettings.tsx b/web/apps/photos/src/components/sidebar/account/TwoFactorSettings.tsx
index 6fd6207426..69899a44bd 100644
--- a/web/apps/photos/src/components/sidebar/account/TwoFactorSettings.tsx
+++ b/web/apps/photos/src/components/sidebar/account/TwoFactorSettings.tsx
@@ -48,6 +48,7 @@ export const TwoFactorSettings: React.FC<
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("two_factor_authentication")}
diff --git a/web/apps/photos/src/components/sidebar/accounts/Account.tsx b/web/apps/photos/src/components/sidebar/accounts/Account.tsx
index d5e546fed5..c999314d0a 100644
--- a/web/apps/photos/src/components/sidebar/accounts/Account.tsx
+++ b/web/apps/photos/src/components/sidebar/accounts/Account.tsx
@@ -286,6 +286,7 @@ export const Account: React.FC<AccountProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("account")}
diff --git a/web/apps/photos/src/components/sidebar/preferences/AppLockSettings.tsx b/web/apps/photos/src/components/sidebar/preferences/AppLockSettings.tsx
index f08567a153..c187af73ee 100644
--- a/web/apps/photos/src/components/sidebar/preferences/AppLockSettings.tsx
+++ b/web/apps/photos/src/components/sidebar/preferences/AppLockSettings.tsx
@@ -177,6 +177,7 @@ export const AppLockSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
return (
<>
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("app_lock")}
@@ -852,6 +853,7 @@ const AutoLockOptionsDrawer: React.FC<AutoLockOptionsDrawerProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
anchor="left"
{...{ open, onClose }}
onRootClose={onRootClose}
diff --git a/web/apps/photos/src/components/sidebar/preferences/MLSettings.tsx b/web/apps/photos/src/components/sidebar/preferences/MLSettings.tsx
index 8bd93d4a1c..23889daa21 100644
--- a/web/apps/photos/src/components/sidebar/preferences/MLSettings.tsx
+++ b/web/apps/photos/src/components/sidebar/preferences/MLSettings.tsx
@@ -65,6 +65,7 @@ export const MLSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
return (
<>
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("ml_search")}
@@ -140,6 +141,7 @@ const FaceConsentDrawer: React.FC<FaceConsentDrawerProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("ml_consent_title")}
diff --git a/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx b/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx
index 099a65ce72..74b5805525 100644
--- a/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx
+++ b/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx
@@ -177,6 +177,7 @@ export const Preferences: React.FC<PreferencesProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("preferences")}
@@ -394,6 +395,7 @@ const DomainSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("custom_domains")}
@@ -553,6 +555,7 @@ const MapSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("map")}
@@ -619,6 +622,7 @@ const AdvancedSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
return (
<TitledNestedSidebarDrawer
+ maxWidth="440px"
{...{ open, onClose }}
onRootClose={handleRootClose}
title={t("advanced")}
diff --git a/web/packages/base/components/mui/SidebarDrawer.tsx b/web/packages/base/components/mui/SidebarDrawer.tsx
index 5a8c596fde..6156a3c07b 100644
--- a/web/packages/base/components/mui/SidebarDrawer.tsx
+++ b/web/packages/base/components/mui/SidebarDrawer.tsx
@@ -13,9 +13,12 @@ import { isDesktop } from "ente-base/app";
import type { ModalVisibilityProps } from "ente-base/components/utils/modal";
import React from "react";
-export const SidebarDrawer: React.FC<DrawerProps> = ({
+type SidebarDrawerProps = DrawerProps & { maxWidth?: string };
+
+export const SidebarDrawer: React.FC<SidebarDrawerProps> = ({
slotProps,
children,
+ maxWidth = "375px",
...rest
}) => (
<Drawer
@@ -24,7 +27,7 @@ export const SidebarDrawer: React.FC<DrawerProps> = ({
...(slotProps ?? {}),
paper: {
sx: {
- maxWidth: "440px",
+ maxWidth,
width: "100%",
scrollbarWidth: "thin",
// Extra specificity overrides inherited padding.
@@ -56,7 +59,7 @@ export type NestedSidebarDrawerVisibilityProps = ModalVisibilityProps & {
};
const NestedSidebarDrawer: React.FC<
- NestedSidebarDrawerVisibilityProps & DrawerProps
+ NestedSidebarDrawerVisibilityProps & SidebarDrawerProps
> = ({ onClose, onRootClose, ...rest }) => {
// Backdrop taps close the entire stack.
const handleClose: DrawerProps["onClose"] = (_, reason) => {
@@ -135,11 +138,11 @@ export const SidebarDrawerTitlebar: React.FC<SidebarDrawerTitlebarProps> = ({
export const TitledNestedSidebarDrawer: React.FC<
React.PropsWithChildren<
NestedSidebarDrawerVisibilityProps &
- Pick<DrawerProps, "anchor"> &
+ Pick<SidebarDrawerProps, "anchor" | "maxWidth"> &
SidebarDrawerTitlebarProps
>
-> = ({ open, onClose, onRootClose, anchor, children, ...rest }) => (
- <NestedSidebarDrawer {...{ open, onClose, onRootClose, anchor }}>
+> = ({ open, onClose, onRootClose, anchor, maxWidth, children, ...rest }) => (
+ <NestedSidebarDrawer {...{ open, onClose, onRootClose, anchor, maxWidth }}>
<Stack sx={{ gap: "4px", py: "12px" }}>
<SidebarDrawerTitlebar {...{ onClose, onRootClose }} {...rest} />
{children}