rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix tag context menu [skip e2e]

Browse Source
This commit is contained in:
Aman Harwara
2023-10-24 21:11:33 +05:30
parent c6764b7e92
commit e1dfd29dba
2 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/web/src/javascripts/Components/Tags/TagContextMenu.tsx
View File

@@ -13,6 +13,7 @@ import Popover from '../Popover/Popover'
import IconPicker from '../Icon/IconPicker' import IconPicker from '../Icon/IconPicker'
import AddToVaultMenuOption from '../Vaults/AddToVaultMenuOption' import AddToVaultMenuOption from '../Vaults/AddToVaultMenuOption'
import { useApplication } from '../ApplicationProvider' import { useApplication } from '../ApplicationProvider'
import MenuSection from '../Menu/MenuSection'
type ContextMenuProps = { type ContextMenuProps = {
navigationController: NavigationController navigationController: NavigationController
@@ -80,31 +81,32 @@ const TagContextMenu = ({ navigationController, isEntitledToFolders, selectedTag
useIconGrid={true} useIconGrid={true}
iconGridClassName="max-h-30" iconGridClassName="max-h-30"
/> />
<HorizontalSeparator classes="my-2" /> <MenuSection>
{application.featuresController.isVaultsEnabled() && ( {application.featuresController.isVaultsEnabled() && (
<AddToVaultMenuOption iconClassName="mr-2 text-neutral" items={[selectedTag]} /> <AddToVaultMenuOption iconClassName="mr-2 text-neutral" items={[selectedTag]} />
)} )}
<MenuItem className={'justify-between py-1.5'} onClick={onClickStar}> <MenuItem className={'justify-between py-1.5'} onClick={onClickStar}>
<div className="flex items-center"> <div className="flex items-center">
<Icon type="star" className="mr-2 text-neutral" /> <Icon type="star" className="mr-2 text-neutral" />
{selectedTag.starred ? 'Unfavorite' : 'Favorite'} {selectedTag.starred ? 'Unfavorite' : 'Favorite'}
</div> </div>
</MenuItem> </MenuItem>
<MenuItem className={'justify-between py-1.5'} onClick={onClickAddSubtag}> <MenuItem className={'justify-between py-1.5'} onClick={onClickAddSubtag}>
<div className="flex items-center"> <div className="flex items-center">
<Icon type="add" className="mr-2 text-neutral" /> <Icon type="add" className="mr-2 text-neutral" />
Add subtag Add subtag
</div> </div>
{!isEntitledToFolders && <Icon type={PremiumFeatureIconName} className={PremiumFeatureIconClass} />} {!isEntitledToFolders && <Icon type={PremiumFeatureIconName} className={PremiumFeatureIconClass} />}
</MenuItem> </MenuItem>
<MenuItem className={'py-1.5'} onClick={onClickRename}> <MenuItem className={'py-1.5'} onClick={onClickRename}>
<Icon type="pencil-filled" className="mr-2 text-neutral" /> <Icon type="pencil-filled" className="mr-2 text-neutral" />
Rename Rename
</MenuItem> </MenuItem>
<MenuItem className={'py-1.5'} onClick={onClickDelete}> <MenuItem className={'py-1.5'} onClick={onClickDelete}>
<Icon type="trash" className="mr-2 text-danger" /> <Icon type="trash" className="mr-2 text-danger" />
<span className="text-danger">Delete</span> <span className="text-danger">Delete</span>
</MenuItem> </MenuItem>
</MenuSection>
</Menu> </Menu>
<HorizontalSeparator classes="my-2" /> <HorizontalSeparator classes="my-2" />
<div className="px-3 pb-1.5 pt-1 text-sm font-medium text-neutral lg:text-xs"> <div className="px-3 pb-1.5 pt-1 text-sm font-medium text-neutral lg:text-xs">

4
packages/web/src/javascripts/Components/Tags/TagsListItem.tsx
View File

@@ -323,6 +323,10 @@ export const TagsListItem: FunctionComponent<Props> = observer(
role="button" role="button"
className={'mr-2 cursor-pointer border-0 bg-transparent hover:bg-contrast focus:shadow-inner'} className={'mr-2 cursor-pointer border-0 bg-transparent hover:bg-contrast focus:shadow-inner'}
onClick={toggleContextMenu} onClick={toggleContextMenu}
onMouseDown={(e) => {
e.stopPropagation()
e.preventDefault()
}}
ref={menuButtonRef} ref={menuButtonRef}
> >
<Icon type="more" className="text-neutral" /> <Icon type="more" className="text-neutral" />