contentOnly patterns: Allow re-entry into contentOnly mode after 'Edit contents' #72044
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,64 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { Button, __experimentalVStack as VStack } from '@wordpress/components'; | ||
| import { useDispatch, useSelect } from '@wordpress/data'; | ||
| import { __ } from '@wordpress/i18n'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import { store as blockEditorStore } from '../../store'; | ||
| import { unlock } from '../../lock-unlock'; | ||
|
|
||
| export default function EditContents( { clientId } ) { | ||
| const { editContentOnlySection, stopEditingContentOnlySection } = unlock( | ||
| useDispatch( blockEditorStore ) | ||
| ); | ||
| const { isWithinSection, isWithinEditedSection, editedContentOnlySection } = | ||
| useSelect( | ||
| ( select ) => { | ||
| const { | ||
| isSectionBlock, | ||
| getParentSectionBlock, | ||
| getEditedContentOnlySection, | ||
| isWithinEditedContentOnlySection, | ||
| } = unlock( select( blockEditorStore ) ); | ||
|
|
||
| return { | ||
| isWithinSection: | ||
| isSectionBlock( clientId ) || | ||
| !! getParentSectionBlock( clientId ), | ||
| isWithinEditedSection: | ||
| isWithinEditedContentOnlySection( clientId ), | ||
| editedContentOnlySection: getEditedContentOnlySection(), | ||
| }; | ||
| }, | ||
| [ clientId ] | ||
| ); | ||
|
|
||
|
Member
There was a problem hiding this comment. Wondering if we should stop editing blocks when this component unmounts too? E.g., useEffect( () => {
return () => {
stopEditingAsBlocks();
};
}, [ stopEditingAsBlocks ] );
Contributor
There was a problem hiding this comment. I guess a problem with doing that would be that if we close the sidebar, then we'd stop editing blocks, which mightn't be desired? |
||
| if ( ! isWithinSection && ! isWithinEditedSection ) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <VStack className="block-editor-block-inspector-edit-contents" expanded> | ||
| <Button | ||
| className="block-editor-block-inspector-edit-contents__button" | ||
| __next40pxDefaultSize | ||
| variant="secondary" | ||
| onClick={ () => { | ||
| if ( ! editedContentOnlySection ) { | ||
| editContentOnlySection( clientId ); | ||
| } else { | ||
| stopEditingContentOnlySection(); | ||
| } | ||
| } } | ||
| > | ||
| { editedContentOnlySection | ||
| ? __( 'Lock design' ) | ||
| : __( 'Unlock design' ) } | ||
| </Button> | ||
| </VStack> | ||
| ); | ||
| } | ||
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.
Since we're flattening the structure, could "go to parent" be enough? (Not a blocker for now, of course)
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.
Ended up removing this, it's from an earlier iteration!