Skip to content
This repository has been archived by the owner on Sep 9, 2024. It is now read-only.

fix: discard on mobile #1107

Merged
merged 1 commit into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/core/src/components/entry-editor/EditorToolbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
lg:!hidden;
}

.CMS_EditorToolbar_discard-button {
@apply flex
lg:!hidden;
}

.CMS_EditorToolbar_delete-button {
@apply flex
lg:!hidden;
Expand Down
29 changes: 25 additions & 4 deletions packages/core/src/components/entry-editor/EditorToolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import MenuGroup from '../common/menu/MenuGroup';
import MenuItemButton from '../common/menu/MenuItemButton';
import EditorWorkflowToolbarButtons from './EditorWorkflowToolbarButtons';

import type { WorkflowStatus } from '@staticcms/core/constants/publishModes';
import type { CollectionWithDefaults, EditorPersistOptions } from '@staticcms/core';
import type { WorkflowStatus } from '@staticcms/core/constants/publishModes';
import type { FC, MouseEventHandler } from 'react';

import './EditorToolbar.css';
Expand All @@ -41,6 +41,7 @@ export const classes = generateClassNames('EditorToolbar', [
'more-menu-button',
'more-menu-label-icon',
'preview-toggle',
'discard-button',
'delete-button',
'publish-button',
'publish-button-icon',
Expand Down Expand Up @@ -419,14 +420,34 @@ const EditorToolbar: FC<EditorToolbarProps> = ({
disabled={disabled}
/>
) : null}
{canDelete ? (
{hasChanged ? (
<IconButton
icon={TrashIcon}
key="discard-button"
title={t('editor.editorToolbar.discardChanges')}
color="warning"
variant="text"
onClick={handleDiscardDraft}
rootClassName={classes['discard-button']}
aria-label="discard chnages"
disabled={disabled}
/>
) : canDelete &&
(!useOpenAuthoring || hasUnpublishedChanges) &&
(!useWorkflow || workflowDeleteLabel) ? (
<IconButton
icon={TrashIcon}
key="delete-button"
title={t('editor.editorToolbar.deleteEntry')}
title={useWorkflow ? t(workflowDeleteLabel!) : t('editor.editorToolbar.deleteEntry')}
color="error"
variant="text"
onClick={onDelete}
onClick={
useWorkflow &&
workflowDeleteLabel &&
workflowDeleteLabel !== 'editor.editorToolbar.deletePublishedEntry'
? onDeleteUnpublishedChanges
: onDelete
}
rootClassName={classes['delete-button']}
aria-label="delete"
disabled={disabled}
Expand Down
Loading