-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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.
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: Unify right click override preference #57468
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f1ff43e
Editor: Unify right click override preference
youknowriad ff6bbd2
Rename namespace to scope
youknowriad e0a10d5
Migrate preference to core scope
youknowriad f289da3
Handle undefined case
youknowriad eb43d98
Delete the edit site setting as well
youknowriad File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
47 changes: 26 additions & 21 deletions
47
packages/edit-post/src/components/preferences-modal/options/enable-feature.js
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 |
|---|---|---|
| @@ -1,26 +1,31 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { compose } from '@wordpress/compose'; | ||
| import { withSelect, withDispatch } from '@wordpress/data'; | ||
| import { useSelect, useDispatch } from '@wordpress/data'; | ||
| import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface'; | ||
| import { store as preferencesStore } from '@wordpress/preferences'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import { store as editPostStore } from '../../../store'; | ||
|
|
||
| export default compose( | ||
| withSelect( ( select, { featureName } ) => { | ||
| const { isFeatureActive } = select( editPostStore ); | ||
| return { | ||
| isChecked: isFeatureActive( featureName ), | ||
| }; | ||
| } ), | ||
| withDispatch( ( dispatch, { featureName, onToggle = () => {} } ) => ( { | ||
| onChange: () => { | ||
| onToggle(); | ||
| dispatch( editPostStore ).toggleFeature( featureName ); | ||
| }, | ||
| } ) ) | ||
| )( BaseOption ); | ||
| export default function EnableFeature( props ) { | ||
| const { | ||
| scope = 'core/edit-post', | ||
| featureName, | ||
| onToggle = () => {}, | ||
| ...remainingProps | ||
| } = props; | ||
| const isChecked = useSelect( | ||
| ( select ) => !! select( preferencesStore ).get( scope, featureName ), | ||
| [ scope, featureName ] | ||
| ); | ||
| const { toggle } = useDispatch( preferencesStore ); | ||
| const onChange = () => { | ||
| onToggle(); | ||
| toggle( scope, featureName ); | ||
| }; | ||
| return ( | ||
| <BaseOption | ||
| onChange={ onChange } | ||
| isChecked={ isChecked } | ||
| { ...remainingProps } | ||
| /> | ||
| ); | ||
| } |
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
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
27 changes: 27 additions & 0 deletions
27
...references-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /** | ||
| * Internal dependencies | ||
| */ | ||
|
|
||
| export default function convertEditorSettings( data ) { | ||
| let newData = data; | ||
| const settingsToMoveToCore = [ 'allowRightClickOverrides' ]; | ||
|
|
||
| settingsToMoveToCore.forEach( ( setting ) => { | ||
| if ( data?.[ 'core/edit-post' ]?.[ setting ] !== undefined ) { | ||
| newData = { | ||
| ...newData, | ||
| core: { | ||
| ...newData?.core, | ||
| [ setting ]: data[ 'core/edit-post' ][ setting ], | ||
| }, | ||
| }; | ||
| delete newData[ 'core/edit-post' ][ setting ]; | ||
| } | ||
| } ); | ||
|
|
||
| if ( Object.keys( newData?.[ 'core/edit-post' ] )?.length === 0 ) { | ||
youknowriad marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| delete newData[ 'core/edit-post' ]; | ||
| } | ||
|
|
||
| return newData; | ||
| } | ||
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
22 changes: 22 additions & 0 deletions
22
...ences-persistence/src/migrations/preferences-package-data/test/convert-editor-settings.js
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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import convertEditorSettings from '../convert-editor-settings'; | ||
|
|
||
| describe( 'convertEditorSettings', () => { | ||
| it( 'converts the `allowRightClickOverrides` property', () => { | ||
| const input = { | ||
| 'core/edit-post': { | ||
| allowRightClickOverrides: false, | ||
| }, | ||
| }; | ||
|
|
||
| const expectedOutput = { | ||
| core: { | ||
| allowRightClickOverrides: false, | ||
| }, | ||
| }; | ||
|
|
||
| expect( convertEditorSettings( input ) ).toEqual( expectedOutput ); | ||
| } ); | ||
| } ); |
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.
Should we do the same for
core/edit-sitestore? Maybe first check if it's already set incorescope..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.
absence of "core/edit-post" value doesn't really mean we don't have a preference, it just means that it was not explicitly set. So I think we should just keep it simple as is.