refactor: menu items (#2057)

packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx

@@ -9,7 +9,6 @@ import { AccountMenuPane } from './AccountMenuPane'
 import Menu from '@/Components/Menu/Menu'
 import MenuItem from '@/Components/Menu/MenuItem'
 import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import WorkspaceSwitcherOption from './WorkspaceSwitcher/WorkspaceSwitcherOption'
 import { ApplicationGroup } from '@/Application/ApplicationGroup'
 import { formatLastSyncDate } from '@/Utils/DateUtils'
@@ -150,23 +149,23 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({
         />
         <MenuItemSeparator />
         {user ? (
-          <MenuItem type={MenuItemType.IconButton} onClick={openPreferences}>
+          <MenuItem onClick={openPreferences}>
             <Icon type="user" className={iconClassName} />
             Account settings
           </MenuItem>
         ) : (
           <>
-            <MenuItem type={MenuItemType.IconButton} onClick={activateRegisterPane}>
+            <MenuItem onClick={activateRegisterPane}>
               <Icon type="user" className={iconClassName} />
               Create free account
             </MenuItem>
-            <MenuItem type={MenuItemType.IconButton} onClick={activateSignInPane}>
+            <MenuItem onClick={activateSignInPane}>
               <Icon type="signIn" className={iconClassName} />
               Sign in
             </MenuItem>
           </>
         )}
-        <MenuItem className="justify-between" type={MenuItemType.IconButton} onClick={openHelp}>
+        <MenuItem className="justify-between" onClick={openHelp}>
           <div className="flex items-center">
             <Icon type="help" className={iconClassName} />
             Help &amp; feedback
@@ -176,7 +175,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({
         {user ? (
           <>
             <MenuItemSeparator />
-            <MenuItem type={MenuItemType.IconButton} onClick={signOut}>
+            <MenuItem onClick={signOut}>
               <Icon type="signOut" className={iconClassName} />
               Sign out workspace
             </MenuItem>

packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx

@@ -1,6 +1,4 @@
 import Icon from '@/Components/Icon/Icon'
-import MenuItem from '@/Components/Menu/MenuItem'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import { KeyboardKey } from '@standardnotes/ui-services'
 import { ApplicationDescriptor } from '@standardnotes/snjs'
 import {
@@ -13,6 +11,7 @@ import {
   useRef,
   useState,
 } from 'react'
+import MenuRadioButtonItem from '@/Components/Menu/MenuRadioButtonItem'
 
 type Props = {
   descriptor: ApplicationDescriptor
@@ -56,8 +55,7 @@ const WorkspaceMenuItem: FunctionComponent<Props> = ({
   }, [inputValue, renameDescriptor])
 
   return (
-    <MenuItem
-      type={MenuItemType.RadioButton}
+    <MenuRadioButtonItem
       className="flex w-full cursor-pointer items-center border-0 bg-transparent px-3 py-2 text-left text-sm text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none"
       onClick={onClick}
       checked={descriptor.primary}
@@ -100,7 +98,7 @@ const WorkspaceMenuItem: FunctionComponent<Props> = ({
           </div>
         )}
       </div>
-    </MenuItem>
+    </MenuRadioButtonItem>
   )
 }
 

packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx

@@ -7,7 +7,6 @@ import Icon from '@/Components/Icon/Icon'
 import Menu from '@/Components/Menu/Menu'
 import MenuItem from '@/Components/Menu/MenuItem'
 import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import WorkspaceMenuItem from './WorkspaceMenuItem'
 
 type Props = {
@@ -85,13 +84,13 @@ const WorkspaceSwitcherMenu: FunctionComponent<Props> = ({
       ))}
       <MenuItemSeparator />
 
-      <MenuItem type={MenuItemType.IconButton} onClick={addAnotherWorkspace}>
+      <MenuItem onClick={addAnotherWorkspace}>
         <Icon type="user-add" className="mr-2 text-neutral" />
         Add another workspace
       </MenuItem>
 
       {!hideWorkspaceOptions && (
-        <MenuItem type={MenuItemType.IconButton} onClick={signoutAll}>
+        <MenuItem onClick={signoutAll}>
           <Icon type="signOut" className="mr-2 text-neutral" />
           Sign out all workspaces
         </MenuItem>

packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx

@@ -6,7 +6,6 @@ import { FunctionComponent, useCallback, useRef, useState } from 'react'
 import Icon from '@/Components/Icon/Icon'
 import WorkspaceSwitcherMenu from './WorkspaceSwitcherMenu'
 import MenuItem from '@/Components/Menu/MenuItem'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import Popover from '@/Components/Popover/Popover'
 import { MenuItemIconSize } from '@/Constants/TailwindClassNames'
 
@@ -25,13 +24,7 @@ const WorkspaceSwitcherOption: FunctionComponent<Props> = ({ mainApplicationGrou
 
   return (
     <>
-      <MenuItem
-        tabIndex={FOCUSABLE_BUT_NOT_TABBABLE}
-        ref={buttonRef}
-        type={MenuItemType.IconButton}
-        onClick={toggleMenu}
-        className="justify-between"
-      >
+      <MenuItem tabIndex={FOCUSABLE_BUT_NOT_TABBABLE} ref={buttonRef} onClick={toggleMenu} className="justify-between">
         <div className="flex items-center">
           <Icon type="user-switch" className={`mr-2 text-neutral ${MenuItemIconSize}`} />
           Switch workspace