π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[photos][web] Keep icon rail visible when collapsing navigation
AswinAsoke352cd0ba6b6
diff --git a/web/apps/photos/src/components/gallery/PhotosNavigationShell.tsx b/web/apps/photos/src/components/gallery/PhotosNavigationShell.tsxindex 162387d1a3..1f91085c4b 100644--- a/web/apps/photos/src/components/gallery/PhotosNavigationShell.tsx+++ b/web/apps/photos/src/components/gallery/PhotosNavigationShell.tsx@@ -82,22 +82,27 @@ export const PhotosNavigationShell: React.FC<}) => {const isOffline = useIsOffline();const reduceMotion = useMediaQuery("(prefers-reduced-motion: reduce)");- const [railOpen, setRailOpen] = useState(true);const [navigationCollapsed, setNavigationCollapsed] = useState(false);- const toggleRail = () => setRailOpen((open) => !open);const mobile = useMediaQuery(useTheme().breakpoints.down("md"));- const panelOpen =- railOpen &&- !!galleryNavigation &&- !props.isInSearchMode &&- !navigationCollapsed;+ const navigationAvailable = !!galleryNavigation && !props.isInSearchMode;+ const panelOpen = navigationAvailable && !navigationCollapsed;const contentRef = useNavigationContentMotion(- `${mobile}-${panelOpen}-${railOpen}`,+ `${mobile}-${panelOpen}`,reduceMotion,);const { show: showMobileNavigation, props: mobileDrawerProps } =useModalVisibility();const { onClose: closeMobileNavigation } = mobileDrawerProps;+ const navigationOpen =+ navigationAvailable && (mobile ? mobileDrawerProps.open : panelOpen);+ const toggleNavigation = () => {+ if (mobile) {+ if (mobileDrawerProps.open) closeMobileNavigation();+ else showMobileNavigation();+ } else {+ setNavigationCollapsed((collapsed) => !collapsed);+ }+ };const { onSelectCollectionID } = galleryNavigation ?? {};const { onSelectPerson } = props;const selectCollection = useCallback(@@ -200,7 +205,11 @@ export const PhotosNavigationShell: React.FC<{alternateHeader ?? (<NormalHeaderContentsonUpload={props.onUpload}- {...{ railOpen, toggleRail }}+ {...{+ navigationAvailable,+ navigationOpen,+ toggleNavigation,+ }}/>)}</NavbarBase>@@ -211,14 +220,11 @@ export const PhotosNavigationShell: React.FC<minWidth: 0,minHeight: 0,overflow: "clip",- p: {- xs: railOpen ? "0 8px 8px 0" : "0 8px 8px",- sm: railOpen ? "0 11px 11px 0" : "0 11px 11px",- },+ p: { xs: "0 8px 8px 0", sm: "0 11px 11px 0" },}}><NavigationSlide- open={railOpen}+ openwidth={{ xs: 56, sm: 72 }}reduceMotion={reduceMotion}rail@@ -334,10 +340,11 @@ export const PhotosNavigationShell: React.FC<const NormalHeaderContents: React.FC<Pick<PhotosNavigationShellProps, "onUpload"> & {- railOpen: boolean;- toggleRail: () => void;+ navigationAvailable: boolean;+ navigationOpen: boolean;+ toggleNavigation: () => void;}-> = ({ onUpload, railOpen, toggleRail }) => {+> = ({ onUpload, navigationAvailable, navigationOpen, toggleNavigation }) => {return (<Boxsx={{@@ -347,14 +354,25 @@ const NormalHeaderContents: React.FC<flex: 1,}}>- <Tooltip title={railOpen ? ut("Hide sidebar") : ut("Show sidebar")}>+ <Tooltip+ title={+ !navigationAvailable+ ? ""+ : navigationOpen+ ? ut("Hide navigation panel")+ : ut("Show navigation panel")+ }+ ><FocusVisibleButtoncolor="secondary"aria-label={- railOpen ? ut("Hide sidebar") : ut("Show sidebar")+ navigationOpen+ ? ut("Hide navigation panel")+ : ut("Show navigation panel")}- aria-expanded={railOpen}- onClick={toggleRail}+ aria-expanded={navigationOpen}+ disabled={!navigationAvailable}+ onClick={toggleNavigation}sx={{minWidth: 0,width: 38,@@ -373,7 +391,7 @@ const NormalHeaderContents: React.FC<<rect x="3" y="4" width="18" height="16" rx="3" /><pathd={- railOpen+ navigationOpen? "M9 4v16M15 10l-2 2 2 2": "M9 4v16M13 10l2 2-2 2"}