Add publish flow in site editor #61136
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,83 +19,3 @@ | |
| } | ||
|
|
||
| @include editor-left(".edit-post-layout .components-editor-notices__snackbar"); | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ import { __unstableMotion as motion } from '@wordpress/components'; | |
| import { store as preferencesStore } from '@wordpress/preferences'; | ||
| import { | ||
| DocumentBar, | ||
| PostSavedState, | ||
| store as editorStore, | ||
| privateApis as editorPrivateApis, | ||
| } from '@wordpress/editor'; | ||
|
|
@@ -31,23 +32,26 @@ import { | |
| } from '../editor-canvas-container'; | ||
| import { unlock } from '../../lock-unlock'; | ||
| import { FOCUSABLE_ENTITIES } from '../../utils/constants'; | ||
| import { isPreviewingTheme } from '../../utils/is-previewing-theme'; | ||
|
|
||
| const { | ||
| CollapsableBlockToolbar, | ||
| MoreMenu, | ||
| PostViewLink, | ||
| PreviewDropdown, | ||
| PinnedItems, | ||
| PostPublishButtonOrToggle, | ||
| } = unlock( editorPrivateApis ); | ||
|
|
||
| export default function HeaderEditMode( { setEntitiesSavedStatesCallback } ) { | ||
| const { | ||
| templateType, | ||
| isDistractionFree, | ||
| blockEditorMode, | ||
| showIconLabels, | ||
| editorCanvasView, | ||
| isFixedToolbar, | ||
| isPublishSidebarOpened, | ||
| } = useSelect( ( select ) => { | ||
| const { getEditedPostType } = select( editSiteStore ); | ||
| const { __unstableGetEditorMode } = select( blockEditorStore ); | ||
|
|
@@ -64,6 +68,8 @@ export default function HeaderEditMode() { | |
| ).getEditorCanvasContainerView(), | ||
| isDistractionFree: getPreference( 'core', 'distractionFree' ), | ||
| isFixedToolbar: getPreference( 'core', 'fixedToolbar' ), | ||
| isPublishSidebarOpened: | ||
| select( editorStore ).isPublishSidebarOpened(), | ||
| }; | ||
| }, [] ); | ||
|
|
||
|
|
@@ -94,6 +100,7 @@ export default function HeaderEditMode() { | |
| ease: 'easeOut', | ||
| }; | ||
|
|
||
| const _isPreviewingTheme = isPreviewingTheme(); | ||
| return ( | ||
| <div | ||
| className={ classnames( 'edit-site-header-edit-mode', { | ||
|
|
@@ -158,7 +165,28 @@ export default function HeaderEditMode() { | |
| </div> | ||
| ) } | ||
| <PostViewLink /> | ||
| { | ||
| // TODO: For now we conditionally render the Save/Publish buttons based on | ||
| // some specific site editor extra handling. Examples are when we're previewing | ||
| // a theme, handling of global styles changes or when we're in 'view' mode, | ||
| // which opens the save panel in a Modal. | ||
| } | ||
| { ! _isPreviewingTheme && ! isPublishSidebarOpened && ( | ||
| // This button isn't completely hidden by the publish sidebar. | ||
| // We can't hide the whole toolbar when the publish sidebar is open because | ||
| // we want to prevent mounting/unmounting the PostPublishButtonOrToggle DOM node. | ||
| // We track that DOM node to return focus to the PostPublishButtonOrToggle | ||
| // when the publish sidebar has been closed. | ||
| <PostSavedState /> | ||
| ) } | ||
| { ! _isPreviewingTheme && ( | ||
| <PostPublishButtonOrToggle | ||
| setEntitiesSavedStatesCallback={ | ||
| setEntitiesSavedStatesCallback | ||
| } | ||
| /> | ||
| ) } | ||
| { _isPreviewingTheme && <SaveButton size="compact" /> } | ||
|
There was a problem hiding this comment. Would love a review from @scruffian or @draganescu to test the theme activation flows There was a problem hiding this comment. For me it tested all right! Edit: I did find the activate button disappears when browsing a previewing theme. Testing more. There was a problem hiding this comment. I found the regression above on trunk as well so not this PR. |
||
| { ! isDistractionFree && <PinnedItems.Slot scope="core" /> } | ||
| <MoreMenu /> | ||
| <SiteEditorMoreMenuItems /> | ||
|
|
||
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.
I think the
edit-sitepackage has selectors/actions for this. See #45200. We should probably put this into theeditorstore and reuse it in both editors.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 we can do it in a follow up to minimize the risk of introducing any regressions? I'd love to minimize the changes per PR, as there are more needed for every step that gets us closer. 😄