feat: Adjust MoreMenu order in public views

cozy · Nov 28, 2024 · b65fee1 · b65fee1
1 parent 1f17339
commit b65fee1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/modules/public/PublicToolbarByLink.jsx b/src/modules/public/PublicToolbarByLink.jsx
@@ -1,6 +1,7 @@
 import { useDisplayedFolder } from 'hooks'
 import React from 'react'
 
+import Divider from 'cozy-ui/transpiled/react/Divider'
 import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
 import { BarRightOnMobile } from 'components/Bar'
@@ -49,12 +50,15 @@ const PublicToolbarByLink = ({
             showSelectionBar={showSelectionBar}
             actions={[]}
           >
-            {isMobile && <OpenExternalLinkItem link={HOME_LINK_HREF} />}
             {isMobile && files.length > 0 && (
               <DownloadButtonItem files={files} />
             )}
-            {isMobile && hasWriteAccess && <AddMenuItem />}
             {files.length > 1 && <SelectableItem onClick={showSelectionBar} />}
+            {isMobile && hasWriteAccess && <AddMenuItem />}
+            {isMobile && (files.length > 1 || hasWriteAccess) && (
+              <Divider className="u-mv-half" />
+            )}
+            {isMobile && <OpenExternalLinkItem link={HOME_LINK_HREF} />}
           </PublicToolbarMoreMenu>
         )}
       </AddMenuProvider>

diff --git a/src/modules/public/PublicToolbarCozyToCozy.jsx b/src/modules/public/PublicToolbarCozyToCozy.jsx
@@ -1,5 +1,6 @@
 import React from 'react'
 
+import Divider from 'cozy-ui/transpiled/react/Divider'
 import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints'
 
 import { BarRightOnMobile } from 'components/Bar'
@@ -34,12 +35,15 @@ const PublicToolbarCozyToCozy = ({
         showSelectionBar={showSelectionBar}
         actions={[]}
       >
+        {isMobile && files.length > 0 && <DownloadButtonItem files={files} />}
+        {files.length > 1 && <SelectableItem onClick={showSelectionBar} />}
+        {((isMobile && files.length > 0) || files.length > 1) && (
+          <Divider className="u-mv-half" />
+        )}
         <OpenExternalLinkItem
           isSharingShortcutCreated={isSharingShortcutCreated}
           link={discoveryLink}
         />
-        {isMobile && files.length > 0 && <DownloadButtonItem files={files} />}
-        {files.length > 1 && <SelectableItem onClick={showSelectionBar} />}
       </PublicToolbarMoreMenu>
     </BarRightOnMobile>
   )