Skip to content
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

Editor: Fix duplicate save panels #62863

Merged
merged 4 commits into from
Jul 2, 2024
Merged

Editor: Fix duplicate save panels #62863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77e63f3
Editor: Fix duplicate save panels
ntsekouras Jun 26, 2024
963da53
small fix to show publish panel if no other entities changes exist
ntsekouras Jun 26, 2024
42d76b5
update e2e test
ntsekouras Jun 26, 2024
6f28519
refactor and render site editor's save panel in sidebar
ntsekouras Jul 2, 2024
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
2 changes: 2 additions & 0 deletions packages/edit-site/src/components/editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import {
useHasEditorCanvasContainer,
} from '../editor-canvas-container';
import SaveButton from '../save-button';
import SavePanel from '../save-panel';
import SiteEditorMoreMenu from '../more-menu';
import SiteIcon from '../site-icon';
import useEditorIframeProps from '../block-editor/use-editor-iframe-props';
Expand Down Expand Up @@ -202,6 +203,7 @@ export default function EditSiteEditor( { isPostsList = false } ) {
customSaveButton={
_isPreviewingTheme && <SaveButton size="compact" />
}
customSavePanel={ _isPreviewingTheme && <SavePanel /> }
forceDisableBlockTools={ ! hasDefaultEditorCanvasView }
title={ title }
icon={ icon }
Expand Down
5 changes: 2 additions & 3 deletions packages/edit-site/src/components/layout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ import { store as editSiteStore } from '../../store';
import SiteHub from '../site-hub';
import ResizableFrame from '../resizable-frame';
import { unlock } from '../../lock-unlock';
import SavePanel from '../save-panel';
import KeyboardShortcutsRegister from '../keyboard-shortcuts/register';
import KeyboardShortcutsGlobal from '../keyboard-shortcuts/global';
import { useIsSiteEditorLoading } from './hooks';
import useMovingAnimation from './animation';
import SidebarContent from '../sidebar';
import SaveHub from '../save-hub';
import SavePanel from '../save-panel';
import useSyncCanvasModeWithURL from '../sync-state-with-url/use-sync-canvas-mode-with-url';

const { useCommands } = unlock( coreCommandsPrivateApis );
Expand Down Expand Up @@ -163,6 +163,7 @@ export default function Layout( { route } ) {
{ areas.sidebar }
</SidebarContent>
<SaveHub />
<SavePanel />
</motion.div>
) }
</AnimatePresence>
Expand Down Expand Up @@ -236,8 +237,6 @@ export default function Layout( { route } ) {
</div>
) }
</div>

<SavePanel />
ntsekouras marked this conversation as resolved.
Show resolved Hide resolved
</div>
</>
);
Expand Down
29 changes: 17 additions & 12 deletions packages/editor/src/components/editor-interface/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export default function EditorInterface( {
disableIframe,
autoFocus,
customSaveButton,
customSavePanel,
forceDisableBlockTools,
title,
icon,
Expand Down Expand Up @@ -214,18 +215,22 @@ export default function EditorInterface( {
)
}
actions={
! isPreviewMode ? (
<SavePublishPanels
closeEntitiesSavedStates={ closeEntitiesSavedStates }
isEntitiesSavedStatesOpen={
entitiesSavedStatesCallback
}
setEntitiesSavedStatesCallback={
setEntitiesSavedStatesCallback
}
forceIsDirtyPublishPanel={ forceIsDirty }
/>
) : undefined
! isPreviewMode
? customSavePanel || (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing these two conditions can be merged using a &&

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They could, but it would be like !x && a || b and because of the || I think it's a bit clearer this way..

<SavePublishPanels
closeEntitiesSavedStates={
closeEntitiesSavedStates
}
isEntitiesSavedStatesOpen={
entitiesSavedStatesCallback
}
setEntitiesSavedStatesCallback={
setEntitiesSavedStatesCallback
}
forceIsDirtyPublishPanel={ forceIsDirty }
/>
)
: undefined
}
shortcuts={ {
previous: previousShortcut,
Expand Down
56 changes: 33 additions & 23 deletions packages/editor/src/components/save-publish-panels/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,28 @@ export default function SavePublishPanels( {
useDispatch( editorStore );
const {
publishSidebarOpened,
hasNonPostEntityChanges,
hasPostMetaChanges,
} = useSelect(
( select ) => ( {
publishSidebarOpened:
select( editorStore ).isPublishSidebarOpened(),
hasNonPostEntityChanges:
select( editorStore ).hasNonPostEntityChanges(),
hasPostMetaChanges: unlock(
select( editorStore )
).hasPostMetaChanges(),
} ),
[]
);
isPublishable,
isDirty,
hasOtherEntitiesChanges,
} = useSelect( ( select ) => {
const {
isPublishSidebarOpened,
isEditedPostPublishable,
isCurrentPostPublished,
isEditedPostDirty,
hasNonPostEntityChanges,
} = select( editorStore );
const _hasOtherEntitiesChanges =
hasNonPostEntityChanges() ||
unlock( select( editorStore ) ).hasPostMetaChanges();
return {
publishSidebarOpened: isPublishSidebarOpened(),
isPublishable:
! isCurrentPostPublished() && isEditedPostPublishable(),
isDirty: _hasOtherEntitiesChanges || isEditedPostDirty(),
hasOtherEntitiesChanges: _hasOtherEntitiesChanges,
};
}, [] );

const openEntitiesSavedStates = useCallback(
() => setEntitiesSavedStatesCallback( true ),
Expand All @@ -62,29 +70,31 @@ export default function SavePublishPanels( {
PostPublishExtension={ PluginPostPublishPanel.Slot }
/>
);
} else if ( hasNonPostEntityChanges || hasPostMetaChanges ) {
} else if ( isPublishable && ! hasOtherEntitiesChanges ) {
unmountableContent = (
<div className="editor-layout__toggle-entities-saved-states-panel">
<div className="editor-layout__toggle-publish-panel">
<Button
variant="secondary"
className="editor-layout__toggle-entities-saved-states-panel-button"
onClick={ openEntitiesSavedStates }
className="editor-layout__toggle-publish-panel-button"
onClick={ togglePublishSidebar }
aria-expanded={ false }
>
{ __( 'Open save panel' ) }
{ __( 'Open publish panel' ) }
</Button>
</div>
);
} else {
unmountableContent = (
<div className="editor-layout__toggle-publish-panel">
<div className="editor-layout__toggle-entities-saved-states-panel">
<Button
variant="secondary"
className="editor-layout__toggle-publish-panel-button"
onClick={ togglePublishSidebar }
className="editor-layout__toggle-entities-saved-states-panel-button"
onClick={ openEntitiesSavedStates }
aria-expanded={ false }
disabled={ ! isDirty }
__experimentalIsFocusable
>
{ __( 'Open publish panel' ) }
{ __( 'Open save panel' ) }
</Button>
</div>
);
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/specs/editor/various/multi-entity-saving.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ test.describe( 'Editor - Multi-entity save flow', () => {
await expect( saveButton ).toBeEnabled();

// Verify multi-entity saving not enabled.
await expect( openSavePanel ).toBeHidden();
await expect( publishPanel ).toBeHidden();

await siteTitleField.fill( `${ originalSiteTitle }!` );

// Multi-entity saving should be enabled.
await expect( openSavePanel ).toBeVisible();
await expect( openSavePanel ).toBeEnabled();
} );

test( 'Site blocks should save individually', async ( {
Expand Down
5 changes: 4 additions & 1 deletion test/e2e/specs/editor/various/switch-to-draft.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ test.describe( 'Clicking "Switch to draft" on a published/scheduled post/page',
.getByRole( 'button', { name: 'Close Settings' } )
.click();
}
await page.getByRole( 'button', { name: 'Save' } ).click();
await page
.getByRole( 'region', { name: 'Editor top bar' } )
.getByRole( 'button', { name: 'Save', exact: true } )
.click();
await expect(
page.getByRole( 'button', {
name: 'Dismiss this notice',
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/site-editor/multi-entity-saving.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test.describe( 'Site Editor - Multi-entity save flow', () => {
).toBeEnabled();
await expect(
page
.getByRole( 'region', { name: 'Save panel' } )
.getByRole( 'region', { name: 'Editor publish' } )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this change needed? The region is for saving not just publishing no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, but that's what we call it for a while.. Should we change it in a follow up?

.getByRole( 'button', { name: 'Open save panel' } )
).toBeVisible();

Expand Down
Loading