From 9e784d0c1cccf912d738ff364fc0844c41990592 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Wed, 25 Oct 2023 20:29:08 +0530 Subject: [PATCH] refactor: menu component props and toolbar menu item colors [skip e2e] --- .../AccountMenu/GeneralAccountMenu.tsx | 1 - .../WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx | 4 +--- .../WorkspaceSwitcherOption.tsx | 2 +- .../LockscreenWorkspaceSwitcher.tsx | 6 +----- .../ChangeEditor/ChangeEditorButton.tsx | 1 - .../ChangeEditor/ChangeEditorMenu.tsx | 4 +--- .../ChangeEditor/ChangeEditorMultipleMenu.tsx | 2 +- .../Components/ClipperView/ClipperView.tsx | 6 +++--- .../Header/AddItemMenuButton.tsx | 2 +- .../Header/ContentListHeader.tsx | 1 - .../Header/DisplayOptionsMenu.tsx | 3 +-- .../Header/DisplayOptionsMenuProps.tsx | 1 - .../ContentTableView/ContentTableView.tsx | 6 +++--- .../FileContextMenu/FileContextMenu.tsx | 2 +- .../FileContextMenu/FileOptionsPanel.tsx | 2 +- .../Components/FilePreview/FilePreviewModal.tsx | 2 +- .../src/javascripts/Components/Menu/Menu.tsx | 1 - .../NotesContextMenu/NotesContextMenu.tsx | 2 +- .../Components/NotesOptions/AddTagOption.tsx | 2 +- .../NotesOptions/ChangeEditorOption.tsx | 1 - .../Components/NotesOptions/NotesOptions.tsx | 2 +- .../NotesOptions/NotesOptionsPanel.tsx | 2 +- .../QuickSettingsMenu/QuickSettingsMenu.tsx | 2 +- .../Plugins/TableCellActionMenuPlugin/index.tsx | 2 +- .../Plugins/ToolbarPlugin/ToolbarPlugin.tsx | 17 ++++++----------- .../Components/Tags/TagContextMenu.tsx | 2 +- .../ManyVaultSelectionMenu.tsx | 2 +- .../SingleVaultSelectionMenu.tsx | 2 +- .../VaultSelectionMenu/VaultOptionsMenu.tsx | 2 +- .../VaultSelectionMenu/VaultSelectionMenu.tsx | 2 +- .../Components/Vaults/AddToVaultMenuOption.tsx | 2 +- 31 files changed, 34 insertions(+), 54 deletions(-) diff --git a/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx b/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx index 4fc31c35f..6610360b5 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx @@ -140,7 +140,6 @@ const GeneralAccountMenu: FunctionComponent = ({ setMenuPane, closeMenu, )} = ({ mainApplicationGroup, - isOpen, hideWorkspaceOptions = false, }: Props) => { const application = useApplication() @@ -71,7 +69,7 @@ const WorkspaceSwitcherMenu: FunctionComponent = ({ }, [mainApplicationGroup]) return ( - + {applicationDescriptors.map((descriptor) => ( = ({ mainApplicationGrou side="right" togglePopover={toggleMenu} > - + ) diff --git a/packages/web/src/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx b/packages/web/src/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx index d5543c43a..e12dabf72 100644 --- a/packages/web/src/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx +++ b/packages/web/src/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx @@ -33,11 +33,7 @@ const LockscreenWorkspaceSwitcher: FunctionComponent = ({ mainApplication side="right" togglePopover={toggleMenu} > - + ) diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx index 793bbe4c1..a20ca4b4b 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx @@ -83,7 +83,6 @@ const ChangeEditorButton: FunctionComponent = ({ noteViewController, onCl > { diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx index 6616a4a29..a02ff42fd 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx @@ -29,7 +29,6 @@ import MenuSection from '../Menu/MenuSection' type ChangeEditorMenuProps = { application: WebApplication closeMenu: () => void - isVisible: boolean note: SNNote | undefined onSelect?: (component: UIFeature) => void setDisableClickOutside?: (value: boolean) => void @@ -40,7 +39,6 @@ const getGroupId = (group: EditorMenuGroup) => group.title.toLowerCase().replace const ChangeEditorMenu: FunctionComponent = ({ application, closeMenu, - isVisible, note, onSelect, setDisableClickOutside, @@ -208,7 +206,7 @@ const ChangeEditorMenu: FunctionComponent = ({ return ( <> - + {groups .filter((group) => group.items && group.items.length) .map((group) => { diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMultipleMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMultipleMenu.tsx index 0b5e42c3d..249e7fe68 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMultipleMenu.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMultipleMenu.tsx @@ -132,7 +132,7 @@ const ChangeEditorMultipleMenu = ({ application, notes, setDisableClickOutside } return ( <> - + {groupsWithItems.map((group) => ( {group.items.map((item) => { diff --git a/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx b/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx index 198232e07..de82d4332 100644 --- a/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx +++ b/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx @@ -328,7 +328,7 @@ const ClipperView = ({ applicationGroup }: { applicationGroup: WebApplicationGro /> ) : ( - + Create free account @@ -343,7 +343,7 @@ const ClipperView = ({ applicationGroup }: { applicationGroup: WebApplicationGro return (
- + {hasSelection && ( {isSyncing && ( <> - +
Syncing...
)} diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/AddItemMenuButton.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/AddItemMenuButton.tsx index 6a6f24a86..73fbb8c9b 100644 --- a/packages/web/src/javascripts/Components/ContentListView/Header/AddItemMenuButton.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/Header/AddItemMenuButton.tsx @@ -79,7 +79,7 @@ const AddItemMenuButton = ({ align="center" className="py-2" > - + { addNewItem() diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/ContentListHeader.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/ContentListHeader.tsx index 736eeb6a9..8217e335d 100644 --- a/packages/web/src/javascripts/Components/ContentListView/Header/ContentListHeader.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/Header/ContentListHeader.tsx @@ -125,7 +125,6 @@ const ContentListHeader = ({ diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx index ef12cf3d6..e8d62d3e3 100644 --- a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx @@ -82,7 +82,6 @@ const TabButton: FunctionComponent<{ const DisplayOptionsMenu: FunctionComponent = ({ application, - isOpen, isFilesSmartView, selectedTag, paneController, @@ -283,7 +282,7 @@ const DisplayOptionsMenu: FunctionComponent = ({ const shouldHideNonApplicableOptions = isTableViewEnabled && !isMobileScreen return ( - +
Preferences for
diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenuProps.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenuProps.tsx index bf35db5f6..ce810a793 100644 --- a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenuProps.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenuProps.tsx @@ -10,7 +10,6 @@ export type DisplayOptionsMenuPositionProps = { export type DisplayOptionsMenuProps = { application: WebApplication selectedTag: AnyTag - isOpen: boolean isFilesSmartView: boolean paneController: PaneController } diff --git a/packages/web/src/javascripts/Components/ContentTableView/ContentTableView.tsx b/packages/web/src/javascripts/Components/ContentTableView/ContentTableView.tsx index 46f9b0dd5..99a727d47 100644 --- a/packages/web/src/javascripts/Components/ContentTableView/ContentTableView.tsx +++ b/packages/web/src/javascripts/Components/ContentTableView/ContentTableView.tsx @@ -75,7 +75,7 @@ const ContextMenuCell = ({ items }: { items: DecryptedItemInterface[] }) => { align="start" className="py-2" > - + {allItemsAreFiles && ( { @@ -366,7 +366,7 @@ const ContentTableView = ({ application, items }: Props) => { className="py-2" > {contextMenuItem instanceof FileItem && ( - + { )} {contextMenuItem instanceof SNNote && ( - + )} diff --git a/packages/web/src/javascripts/Components/FileContextMenu/FileContextMenu.tsx b/packages/web/src/javascripts/Components/FileContextMenu/FileContextMenu.tsx index 856671ab8..1bc5120c3 100644 --- a/packages/web/src/javascripts/Components/FileContextMenu/FileContextMenu.tsx +++ b/packages/web/src/javascripts/Components/FileContextMenu/FileContextMenu.tsx @@ -24,7 +24,7 @@ const FileContextMenu: FunctionComponent = observer(({ filesController, i align="start" className="md:pb-2" > - + setShowFileContextMenu(false)} diff --git a/packages/web/src/javascripts/Components/FileContextMenu/FileOptionsPanel.tsx b/packages/web/src/javascripts/Components/FileContextMenu/FileOptionsPanel.tsx index ef747e75d..9a1d392aa 100644 --- a/packages/web/src/javascripts/Components/FileContextMenu/FileOptionsPanel.tsx +++ b/packages/web/src/javascripts/Components/FileContextMenu/FileOptionsPanel.tsx @@ -26,7 +26,7 @@ const FilesOptionsPanel = ({ itemListController }: Props) => { open={isOpen} className="md:pb-2" > - + { diff --git a/packages/web/src/javascripts/Components/FilePreview/FilePreviewModal.tsx b/packages/web/src/javascripts/Components/FilePreview/FilePreviewModal.tsx index 6049bd2d0..aaa8bb221 100644 --- a/packages/web/src/javascripts/Components/FilePreview/FilePreviewModal.tsx +++ b/packages/web/src/javascripts/Components/FilePreview/FilePreviewModal.tsx @@ -224,7 +224,7 @@ const FilePreviewModal = observer(({ application }: Props) => { className="md:pb-2" overrideZIndex="z-modal" > - + { a11yLabel: string closeMenu?: () => void - isOpen: boolean initialFocus?: number shouldAutoFocus?: boolean } diff --git a/packages/web/src/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx b/packages/web/src/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx index 02c793955..6df87cf32 100644 --- a/packages/web/src/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx +++ b/packages/web/src/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx @@ -29,7 +29,7 @@ const NotesContextMenu = () => { open={contextMenuOpen} togglePopover={closeMenu} > - + = ({ className="py-2" overrideZIndex="z-modal" > - + {navigationController.tags.map((tag) => ( = ({ { setIsOpen(false) }} diff --git a/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx b/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx index d7ed92fea..21a636dde 100644 --- a/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx +++ b/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx @@ -367,7 +367,7 @@ const NotesOptions = ({ notes, closeMenu }: NotesOptionsProps) => { }} className="md:py-1" > - + commandService.triggerCommand(SUPER_EXPORT_JSON, notes[0].title)}> diff --git a/packages/web/src/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx b/packages/web/src/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx index 13b2be8bd..4562e507e 100644 --- a/packages/web/src/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx +++ b/packages/web/src/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx @@ -39,7 +39,7 @@ const NotesOptionsPanel = ({ notesController, onClickPreprocessing }: Props) => open={isOpen} className="select-none" > - + = ({ closeMenu }) => { }, [deactivateAnyNonLayerableTheme]) return ( - + {editorStackComponents.length > 0 && ( {editorStackComponents.map((component) => ( diff --git a/packages/web/src/javascripts/Components/SuperEditor/Plugins/TableCellActionMenuPlugin/index.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/TableCellActionMenuPlugin/index.tsx index 3f8b02a58..cd1da1414 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/TableCellActionMenuPlugin/index.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/TableCellActionMenuPlugin/index.tsx @@ -390,7 +390,7 @@ function TableActionMenu({ onClose, tableCellNode: _tableCellNode, cellMerge }: (tableCellNode.__headerState & TableCellHeaderStates.COLUMN) === TableCellHeaderStates.COLUMN return ( - + {mergeCellButton} {!!mergeCellButton && } insertTableRowAtSelection(false)}> diff --git a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugin/ToolbarPlugin.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugin/ToolbarPlugin.tsx index bf4eee052..f6d809ea7 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugin/ToolbarPlugin.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugin/ToolbarPlugin.tsx @@ -159,7 +159,7 @@ interface ToolbarMenuItemProps extends Omit { const ToolbarMenuItem = ({ name, iconName, active, ...props }: ToolbarMenuItemProps) => { return ( @@ -628,7 +628,7 @@ const ToolbarPlugin = () => { } return ( - + {tableOfContents.map(([key, text, tag]) => { const level = parseInt(tag.slice(1)) || 1 if (level > 3) { @@ -674,12 +674,7 @@ const ToolbarPlugin = () => { disableFlip containerClassName="md:!min-w-60 md:!w-auto" > - setIsTextFormatMenuOpen(false)} - > + setIsTextFormatMenuOpen(false)}> { disableFlip containerClassName="md:!min-w-60 md:!w-auto" > - setIsTextStyleMenuOpen(false)}> + setIsTextStyleMenuOpen(false)}> { disableFlip containerClassName="md:!min-w-60 md:!w-auto" > - setIsAlignmentMenuOpen(false)}> + setIsAlignmentMenuOpen(false)}> { disableFlip containerClassName="md:!min-w-60 md:!w-auto" > - setIsInsertMenuOpen(false)}> + setIsInsertMenuOpen(false)}> navigationController.setContextMenuOpen(!contextMenuOpen)} className="py-2" > - + { ) return ( - + {!vaults.length &&
No vaults found
} {vaults.map((vault) => ( diff --git a/packages/web/src/javascripts/Components/VaultSelectionMenu/SingleVaultSelectionMenu.tsx b/packages/web/src/javascripts/Components/VaultSelectionMenu/SingleVaultSelectionMenu.tsx index c85f2de2b..22603fc6d 100644 --- a/packages/web/src/javascripts/Components/VaultSelectionMenu/SingleVaultSelectionMenu.tsx +++ b/packages/web/src/javascripts/Components/VaultSelectionMenu/SingleVaultSelectionMenu.tsx @@ -32,7 +32,7 @@ const SingleVaultSelectionMenu: FunctionComponent = () => { ) return ( - + {!vaults.length &&
No vaults found
} {vaults.map((vault) => ( diff --git a/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultOptionsMenu.tsx b/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultOptionsMenu.tsx index fbe9383a4..21087c3dc 100644 --- a/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultOptionsMenu.tsx +++ b/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultOptionsMenu.tsx @@ -24,7 +24,7 @@ const VaultOptionsMenu = ({ vault }: Props) => { return ( <> - + Edit vault diff --git a/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultSelectionMenu.tsx b/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultSelectionMenu.tsx index c0fb6cf8a..85ad08205 100644 --- a/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultSelectionMenu.tsx +++ b/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultSelectionMenu.tsx @@ -28,7 +28,7 @@ const VaultSelectionMenu = () => { } return ( - + { const singleItemVault = items.length === 1 ? application.vaults.getItemVault(items[0]) : undefined return ( - + {doSomeItemsBelongToVault && ( {