Skip to content

fix(array): add an edit button to list rows and make the edit dialog dismissable #1645

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.

Sign up for GitHub

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

Open
bacarndiaye wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(array): add an edit button to list rows and make the edit dialog dismissable #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/array-edit-button-and-dismiss.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystatic/core': patch
---

Array fields: add a visible "Edit" button to each list row (next to "Delete", and with an accessible name on both icon buttons), and make the "Edit item" dialog dismissable with a close button or by clicking outside. The "Add item" dialog is unchanged and keeps its "Cancel" button.
44 changes: 33 additions & 11 deletions packages/keystatic/src/form/fields/array/ui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import {
} from '@keystar/ui/drag-and-drop';
import { FieldDescription, FieldLabel, FieldMessage } from '@keystar/ui/field';
import { Icon } from '@keystar/ui/icon';
import { pencilIcon } from '@keystar/ui/icon/icons/pencilIcon';
import { trash2Icon } from '@keystar/ui/icon/icons/trash2Icon';
import { VStack } from '@keystar/ui/layout';
import { Flex, VStack } from '@keystar/ui/layout';
import { Item, ListView } from '@keystar/ui/list-view';
import { Content } from '@keystar/ui/slots';
import { Tooltip, TooltipTrigger } from '@keystar/ui/tooltip';
Expand Down Expand Up @@ -93,7 +94,14 @@ export function ArrayFieldInput<Element extends ComponentSchema>(
<FieldMessage {...errorMessageProps}>{errorMessage}</FieldMessage>
)}

{/*
Editing is live (changes apply as you type, "Done" only closes the
dialog), so the edit dialog can safely be dismissed with a close button
or by clicking outside. The "add" dialog has its own "Cancel" button and
is not dismissable, to avoid discarding a half-filled item by accident.
*/}
<DialogContainer
isDismissable={modalState.state === 'edit'}
onDismiss={() => {
setModalState({ state: 'closed' });
}}
Expand Down Expand Up @@ -397,16 +405,30 @@ export function ArrayFieldListView<Element extends ComponentSchema>(
return (
<Item key={item.key} textValue={label}>
<Text>{label}</Text>
<TooltipTrigger placement="start">
<ActionButton
onPress={() => {
onRemoveKey(item.key);
}}
>
<Icon src={trash2Icon} />
</ActionButton>
<Tooltip>{stringFormatter.format('delete')}</Tooltip>
</TooltipTrigger>
<Flex gridArea="actions" alignItems="center" gap="small">
<TooltipTrigger placement="start">
<ActionButton
aria-label={stringFormatter.format('edit')}
onPress={() => {
props.onOpenItem(props.elements.indexOf(item));
}}
>
<Icon src={pencilIcon} />
</ActionButton>
<Tooltip>{stringFormatter.format('edit')}</Tooltip>
</TooltipTrigger>
<TooltipTrigger placement="start">
<ActionButton
aria-label={stringFormatter.format('delete')}
onPress={() => {
onRemoveKey(item.key);
}}
>
<Icon src={trash2Icon} />
</ActionButton>
<Tooltip>{stringFormatter.format('delete')}</Tooltip>
</TooltipTrigger>
</Flex>
</Item>
);
}}
Expand Down