diff --git a/src/app/AppViewSwitcher.tsx b/src/app/AppViewSwitcher.tsx index d5e76480..599ace2e 100644 --- a/src/app/AppViewSwitcher.tsx +++ b/src/app/AppViewSwitcher.tsx @@ -24,9 +24,12 @@ import { KEY_COMMANDS } from '@/photo/key-commands'; import { useAppText } from '@/i18n/state/client'; import IconSort from '@/components/icons/IconSort'; import { getSortConfigFromPath } from '@/photo/db/sort-path'; +import { motion } from 'framer-motion'; export type SwitcherSelection = 'feed' | 'grid' | 'admin'; +const GAP_CLASS = 'mr-1.5 sm:mr-2'; + export default function AppViewSwitcher({ currentSelection, className, @@ -112,13 +115,8 @@ export default function AppViewSwitcher({ />; return ( -
- +
+ {GRID_HOMEPAGE_ENABLED ? renderItemGrid : renderItemFeed} {GRID_HOMEPAGE_ENABLED ? renderItemFeed : renderItemGrid} {/* Show spinner if admin is suspected to be logged in */} @@ -150,31 +148,41 @@ export default function AppViewSwitcher({ />} {showSortControl && - + + + } + tooltip={{ + content: isAscending + ? 'View newest first' + : 'View oldest first', + }} + /> + + } + + } - tooltip={{ - content: isAscending - ? 'View newest first' - : 'View oldest first', - }} + icon={} + onClick={() => setIsCommandKOpen?.(true)} + tooltip={{...SHOW_KEYBOARD_SHORTCUT_TOOLTIPS && { + content: appText.nav.search, + keyCommandModifier: KEY_COMMANDS.search[0], + keyCommand: KEY_COMMANDS.search[1], + }}} /> - } - - } - onClick={() => setIsCommandKOpen?.(true)} - tooltip={{...SHOW_KEYBOARD_SHORTCUT_TOOLTIPS && { - content: appText.nav.search, - keyCommandModifier: KEY_COMMANDS.search[0], - keyCommand: KEY_COMMANDS.search[1], - }}} - /> - + +
); }