-
Notifications
You must be signed in to change notification settings - Fork 407
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(core): support insert menu options in array item context menus #6921
Merged
ricokahler
merged 6 commits into
next
from
feat-insert-menu-options-in-context-menu-take-2
Jun 21, 2024
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7bd555a
chore(core): introduce useInsertMenuMenuItems
christianhg cc08137
chore(core): allow ContextMenuButton.selected
christianhg f908bd7
feat(core): support insert menu options in preview item context menu
christianhg 20d4235
feat(core): support insert menu options in grid item context menu
christianhg faae771
feat(core): support insert menu options in reference item context menu
christianhg af0ba05
chore(core): add array item context menu insert menu test cases
christianhg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
packages/sanity/src/core/form/inputs/arrays/ArrayOfObjectsInput/InsertMenuMenuItems.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| import {InsertAboveIcon, InsertBelowIcon} from '@sanity/icons' | ||
| import {type InsertMenuOptions} from '@sanity/insert-menu' | ||
| import {type SchemaType} from '@sanity/types' | ||
| import {useCallback, useMemo} from 'react' | ||
| import {useTranslation} from 'sanity' | ||
|
|
||
| import {MenuItem} from '../../../../../ui-components' | ||
| import {useInsertMenuPopover} from './InsertMenuPopover' | ||
|
|
||
| /** | ||
| * @internal | ||
| */ | ||
| type InsertMenuItemsProps = { | ||
| insertMenuOptions?: InsertMenuOptions | ||
| onInsert: (pos: 'before' | 'after', type: SchemaType) => void | ||
| referenceElement: HTMLElement | null | ||
| schemaTypes?: SchemaType[] | ||
| } | ||
|
|
||
| /** | ||
| * @internal | ||
| */ | ||
| export function useInsertMenuMenuItems(props: InsertMenuItemsProps) { | ||
| const {t} = useTranslation() | ||
| const {onInsert, schemaTypes: types} = props | ||
| const insertBefore = useInsertMenuPopover({ | ||
| insertMenuProps: { | ||
| ...props.insertMenuOptions, | ||
| schemaTypes: props.schemaTypes ?? [], | ||
| onSelect: (insertType) => { | ||
| props.onInsert('before', insertType) | ||
| }, | ||
| }, | ||
| popoverProps: { | ||
| referenceElement: props.referenceElement, | ||
| placement: 'top-end', | ||
| fallbackPlacements: ['bottom-end'], | ||
| }, | ||
| }) | ||
| const insertAfter = useInsertMenuPopover({ | ||
| insertMenuProps: { | ||
| ...props.insertMenuOptions, | ||
| schemaTypes: props.schemaTypes ?? [], | ||
| onSelect: (insertType) => { | ||
| props.onInsert('after', insertType) | ||
| }, | ||
| }, | ||
| popoverProps: { | ||
| referenceElement: props.referenceElement, | ||
| placement: 'bottom-end', | ||
| fallbackPlacements: ['top-end'], | ||
| }, | ||
| }) | ||
| const handleToggleInsertBefore = useCallback(() => { | ||
| if (!types) { | ||
| return | ||
| } | ||
|
|
||
| if (types.length === 1) { | ||
| onInsert('before', types[0]) | ||
| } else { | ||
| insertBefore.send({type: 'toggle'}) | ||
| } | ||
| }, [insertBefore, onInsert, types]) | ||
| const handleToggleInsertAfter = useCallback(() => { | ||
| if (!types) { | ||
| return | ||
| } | ||
|
|
||
| if (types.length === 1) { | ||
| onInsert('after', types[0]) | ||
| } else { | ||
| insertAfter.send({type: 'toggle'}) | ||
| } | ||
| }, [insertAfter, onInsert, types]) | ||
|
|
||
| const insertBeforeMenuItem = useMemo( | ||
| () => | ||
| types ? ( | ||
| <MenuItem | ||
| text={ | ||
| types.length === 1 | ||
| ? t('inputs.array.action.add-before') | ||
| : `${t('inputs.array.action.add-before')}...` | ||
| } | ||
| icon={InsertAboveIcon} | ||
| onClick={handleToggleInsertBefore} | ||
| /> | ||
| ) : null, | ||
| [handleToggleInsertBefore, t, types], | ||
| ) | ||
| const insertAfterMenuItem = useMemo( | ||
| () => | ||
| types ? ( | ||
| <MenuItem | ||
| text={ | ||
| types.length === 1 | ||
| ? t('inputs.array.action.add-after') | ||
| : `${t('inputs.array.action.add-after')}...` | ||
| } | ||
| icon={InsertBelowIcon} | ||
| onClick={handleToggleInsertAfter} | ||
| /> | ||
| ) : null, | ||
| [handleToggleInsertAfter, t, types], | ||
| ) | ||
|
|
||
| return { | ||
| insertBefore: { | ||
| ...insertBefore, | ||
| menuItem: insertBeforeMenuItem, | ||
| }, | ||
| insertAfter: { | ||
| ...insertAfter, | ||
| menuItem: insertAfterMenuItem, | ||
| }, | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you think it would be better to have this be consistent with
insertAfter? I personally think setting them both to prefer'bottom-end'feels better.This video is the current experience.
CleanShot.2024-06-17.at.14.17.15.mp4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The decision to alter between
top-endandbottom-endis primarily made by @mariuslundgard. The idea is that the placement gives a little more context in terms of where the item is inserted (above or below).