diff --git a/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileItem.tsx b/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileItem.tsx index 65f9eaf04..445b9a9a0 100644 --- a/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileItem.tsx +++ b/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileItem.tsx @@ -98,7 +98,7 @@ const PopoverFileItem: FunctionComponent = ({ onBlur={handleFileNameInputBlur} /> ) : ( -
+
{file.name} {file.protected && ( diff --git a/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileSubmenu.tsx b/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileSubmenu.tsx index d6d3218dd..6eb4b7cd9 100644 --- a/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileSubmenu.tsx +++ b/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileSubmenu.tsx @@ -40,7 +40,7 @@ const PopoverFileSubmenu: FunctionComponent = ({ {isAttachedToNote ? ( ) : ( + {selectedFiles.length === 1 && ( <> {isFileAttachedToNote ? ( - + ) : shouldShowAttachOption ? ( - + ) : null} )} - + + Password protection + - + {shouldShowRenameOption && ( - + )} - +
{!hasSelectedMultipleFiles && ( diff --git a/packages/web/src/javascripts/Components/Menu/MenuItem.tsx b/packages/web/src/javascripts/Components/Menu/MenuItem.tsx index 906e03555..d28d4dac6 100644 --- a/packages/web/src/javascripts/Components/Menu/MenuItem.tsx +++ b/packages/web/src/javascripts/Components/Menu/MenuItem.tsx @@ -8,8 +8,8 @@ import { MenuItemType } from './MenuItemType' import RadioIndicator from '../RadioIndicator/RadioIndicator' type MenuItemProps = { - type: MenuItemType children: ReactNode + type?: MenuItemType onClick?: MouseEventHandler onChange?: SwitchProps['onChange'] onBlur?: (event: { relatedTarget: EventTarget | null }) => void @@ -28,7 +28,7 @@ const MenuItem = forwardRef( onChange, onBlur, className = '', - type, + type = MenuItemType.IconButton, checked, icon, iconClassName, @@ -59,7 +59,7 @@ const MenuItem = forwardRef( ref={ref} role={type === MenuItemType.RadioButton ? 'menuitemradio' : 'menuitem'} tabIndex={typeof tabIndex === 'number' ? tabIndex : FOCUSABLE_BUT_NOT_TABBABLE} - className={`flex w-full cursor-pointer items-center border-0 bg-transparent px-3 py-1.5 text-left text-menu-item text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none ${className}`} + className={`flex w-full cursor-pointer items-center border-0 bg-transparent px-3 py-1.5 text-left text-mobile-menu-item text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none md:text-menu-item ${className}`} onClick={onClick} onBlur={onBlur} {...(type === MenuItemType.RadioButton ? { 'aria-checked': checked } : {})} diff --git a/packages/web/src/javascripts/Components/NoteTags/NoteTagsPanel.tsx b/packages/web/src/javascripts/Components/NoteTags/NoteTagsPanel.tsx index c08c1aa67..702626f70 100644 --- a/packages/web/src/javascripts/Components/NoteTags/NoteTagsPanel.tsx +++ b/packages/web/src/javascripts/Components/NoteTags/NoteTagsPanel.tsx @@ -33,7 +33,7 @@ const ListItem = ({ return isSearching ? ( )} {application.platform === Platform.Android && ( )} {unarchived && (