Skip to content

Core Data: Move EntitiesSavedState component out of editor #71948

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

Closed
youknowriad wants to merge 3 commits into from
Closed

Core Data: Move EntitiesSavedState component out of editor #71948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b03c0b
Core Data: Move EntitiesSavedState component out of editor
youknowriad Sep 29, 2025
4c52d9c
Remove useless code
youknowriad Sep 29, 2025
b3d954b
Small fix
youknowriad Sep 29, 2025
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
6 changes: 4 additions & 2 deletions docs/private-apis.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,10 @@ Private selectors:
## core-data

Private exports:
- `EntitiesSavedStates`
- `EntitiesSavedStatesExtensible`
- `getTemplateInfo`
- `getTemplatePartIcon`
- `useEntityRecordsWithPermissions`

### `core` store
Expand Down Expand Up @@ -274,7 +278,6 @@ Private exports:
Private exports:
- `CreateTemplatePartModal`
- `BackButton`
- `EntitiesSavedStatesExtensible`
- `Editor`
- `EditorContentSlotFill`
- `GlobalStylesProvider`
Expand Down Expand Up @@ -318,7 +321,6 @@ Private selectors:
- `getListViewToggleRef`
- `getPostBlocksByName`
- `getPostIcon`
- `hasPostMetaChanges`
- `isEntityReady`

## edit-post
Expand Down
19 changes: 14 additions & 5 deletions lib/client-assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ function gutenberg_register_packages_styles( $styles ) {
$styles,
'wp-edit-post',
gutenberg_url( 'build/edit-post/style.css' ),
array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-block-library', 'wp-commands', 'wp-preferences' ),
array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-block-library', 'wp-commands', 'wp-preferences', 'wp-core-data' ),
$version
);
$styles->add_data( 'wp-edit-post', 'rtl', 'replace' );
Expand Down Expand Up @@ -419,7 +419,7 @@ function gutenberg_register_packages_styles( $styles ) {
$styles,
'wp-edit-site',
gutenberg_url( 'build/edit-site/style.css' ),
array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-block-library-editor', 'common', 'forms', 'wp-commands', 'wp-preferences' ),
array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-block-library-editor', 'common', 'forms', 'wp-commands', 'wp-preferences', 'wp-core-data' ),
$version
);
$styles->add_data( 'wp-edit-site', 'rtl', 'replace' );
Expand All @@ -428,7 +428,7 @@ function gutenberg_register_packages_styles( $styles ) {
$styles,
'wp-edit-widgets',
gutenberg_url( 'build/edit-widgets/style.css' ),
array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-patterns', 'wp-widgets', 'wp-preferences' ),
array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-patterns', 'wp-widgets', 'wp-preferences', 'wp-core-data' ),
$version
);
$styles->add_data( 'wp-edit-widgets', 'rtl', 'replace' );
Expand All @@ -446,7 +446,7 @@ function gutenberg_register_packages_styles( $styles ) {
$styles,
'wp-customize-widgets',
gutenberg_url( 'build/customize-widgets/style.css' ),
array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-widgets', 'wp-preferences' ),
array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-widgets', 'wp-preferences', 'wp-core-data' ),
$version
);
$styles->add_data( 'wp-customize-widgets', 'rtl', 'replace' );
Expand All @@ -473,7 +473,7 @@ function gutenberg_register_packages_styles( $styles ) {
$styles,
'wp-widgets',
gutenberg_url( 'build/widgets/style.css' ),
array( 'wp-components' )
array( 'wp-components', 'wp-core-data' )
);
$styles->add_data( 'wp-widgets', 'rtl', 'replace' );

Expand All @@ -485,6 +485,15 @@ function gutenberg_register_packages_styles( $styles ) {
$version
);
$styles->add_data( 'wp-preferences', 'rtl', 'replace' );

gutenberg_override_style(
$styles,
'wp-core-data',
gutenberg_url( 'build/core-data/style.css' ),
array( 'wp-components' ),
$version
);
$styles->add_data( 'wp-core-data', 'rtl', 'replace' );
}
add_action( 'wp_default_styles', 'gutenberg_register_packages_styles' );

Expand Down
4 changes: 4 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/core-data/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,24 @@
"@wordpress/api-fetch": "file:../api-fetch",
"@wordpress/block-editor": "file:../block-editor",
"@wordpress/blocks": "file:../blocks",
"@wordpress/components": "file:../components",
"@wordpress/compose": "file:../compose",
"@wordpress/data": "file:../data",
"@wordpress/deprecated": "file:../deprecated",
"@wordpress/element": "file:../element",
"@wordpress/html-entities": "file:../html-entities",
"@wordpress/i18n": "file:../i18n",
"@wordpress/icons": "file:../icons",
"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
"@wordpress/notices": "file:../notices",
"@wordpress/private-apis": "file:../private-apis",
"@wordpress/rich-text": "file:../rich-text",
"@wordpress/sync": "file:../sync",
"@wordpress/undo-manager": "file:../undo-manager",
"@wordpress/url": "file:../url",
"@wordpress/warning": "file:../warning",
"change-case": "^4.1.2",
"clsx": "^2.1.1",
"equivalent-key-map": "^0.2.2",
"fast-deep-equal": "^3.1.3",
"memize": "^2.1.0",
Expand Down
21 changes: 4 additions & 17 deletions ...tities-saved-states/entity-record-item.js → ...tities-saved-states/entity-record-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,40 @@
import { CheckboxControl, PanelRow } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useSelect } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
import { decodeEntities } from '@wordpress/html-entities';

/**
* Internal dependencies
*/
import { store as editorStore } from '../../store';
import { unlock } from '../../lock-unlock';
import { STORE_NAME } from '../../name';
import { getTemplateInfo } from '../../utils/get-template-info';

export default function EntityRecordItem( { record, checked, onChange } ) {
const { name, kind, title, key } = record;

// Handle templates that might use default descriptive titles.
const { entityRecordTitle, hasPostMetaChanges } = useSelect(
const { entityRecordTitle } = useSelect(
( select ) => {
if ( 'postType' !== kind || 'wp_template' !== name ) {
return {
entityRecordTitle: title,
hasPostMetaChanges: unlock(
select( editorStore )
).hasPostMetaChanges( name, key ),
};
}

const template = select( coreStore ).getEditedEntityRecord(
const template = select( STORE_NAME ).getEditedEntityRecord(
kind,
name,
key
);

const { default_template_types: templateTypes = [] } =
select( coreStore ).getCurrentTheme() ?? {};
select( STORE_NAME ).getCurrentTheme() ?? {};

return {
entityRecordTitle: getTemplateInfo( {
template,
templateTypes,
} ).title,
hasPostMetaChanges: unlock(
select( editorStore )
).hasPostMetaChanges( name, key ),
};
},
[ name, kind, title, key ]
Expand All @@ -64,11 +56,6 @@ export default function EntityRecordItem( { record, checked, onChange } ) {
className="entities-saved-states__change-control"
/>
</PanelRow>
{ hasPostMetaChanges && (

@youknowriad youknowriad Sep 29, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is the only difference that I made (the "post meta") indicator is removed. For me, this was way too ad-hoc and doesn't really solve any particular issue to be worth keeping.

<ul className="entities-saved-states__changes">
<li>{ __( 'Post Meta.' ) }</li>
</ul>
) }
</>
);
}
6 changes: 3 additions & 3 deletions ...entities-saved-states/entity-type-list.js → ...entities-saved-states/entity-type-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import { __ } from '@wordpress/i18n';
import { useSelect } from '@wordpress/data';
import { PanelBody, PanelRow } from '@wordpress/components';
import { store as coreStore } from '@wordpress/core-data';
import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
import { useContext } from '@wordpress/element';

Expand All @@ -13,6 +12,7 @@ import { useContext } from '@wordpress/element';
*/
import EntityRecordItem from './entity-record-item';
import { unlock } from '../../lock-unlock';
import { STORE_NAME } from '../../name';

const { getGlobalStylesChanges, GlobalStylesContext } = unlock(
blockEditorPrivateApis
Expand All @@ -39,7 +39,7 @@ function GlobalStylesDescription( { record } ) {
useContext( GlobalStylesContext );
const savedRecord = useSelect(
( select ) =>
select( coreStore ).getEntityRecord(
select( STORE_NAME ).getEntityRecord(
record.kind,
record.name,
record.key
Expand Down Expand Up @@ -80,7 +80,7 @@ export default function EntityTypeList( {
const firstRecord = list[ 0 ];
const entityConfig = useSelect(
( select ) =>
select( coreStore ).getEntityConfig(
select( STORE_NAME ).getEntityConfig(
firstRecord.kind,
firstRecord.name
),
Expand Down
8 changes: 6 additions & 2 deletions ...tities-saved-states/hooks/use-is-dirty.js → ...tities-saved-states/hooks/use-is-dirty.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
* WordPress dependencies
*/
import { useSelect } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
import { useMemo, useState } from '@wordpress/element';

/**
* Internal dependencies
*/
import { STORE_NAME } from '../../../name';

/**
* Custom hook that determines if any entities are dirty (edited) and provides a way to manage selected/unselected entities.
*
Expand All @@ -21,7 +25,7 @@ export const useIsDirty = () => {
__experimentalGetDirtyEntityRecords,
getEntityRecordEdits,
getEntityConfig,
} = select( coreStore );
} = select( STORE_NAME );

return {
editedEntities: __experimentalGetDirtyEntityRecords(),
Expand Down
6 changes: 3 additions & 3 deletions ...components/entities-saved-states/index.js → ...components/entities-saved-states/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import { useDispatch } from '@wordpress/data';
*/
import EntityTypeList from './entity-type-list';
import { useIsDirty } from './hooks/use-is-dirty';
import { store as editorStore } from '../../store';
import { unlock } from '../../lock-unlock';
import { STORE_NAME } from '../../name';

function identity( values ) {
return values;
Expand Down Expand Up @@ -89,7 +89,7 @@ export function EntitiesSavedStatesExtensible( {
variant = 'default',
} ) {
const saveButtonRef = useRef();
const { saveDirtyEntities } = unlock( useDispatch( editorStore ) );
const { saveDirtyEntities } = unlock( useDispatch( STORE_NAME ) );
// To group entities by type.
const partitionedSavables = dirtyEntityRecords.reduce( ( acc, record ) => {
const { name } = record;
Expand Down Expand Up @@ -164,7 +164,7 @@ export function EntitiesSavedStatesExtensible( {
close,
} )
}
className="editor-entities-saved-states__save-button"
className="entities-saved-states__save-button"
>
{ saveLabel }
</FlexItem>
Expand Down
0 ...mponents/entities-saved-states/style.scss → ...mponents/entities-saved-states/style.scss
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions ...ntities-saved-states/test/use-is-dirty.js → ...ntities-saved-states/test/use-is-dirty.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,6 @@ jest.mock( '@wordpress/data', () => {
};
} );

jest.mock( '@wordpress/core-data', () => {
return {
store: {
__experimentalGetDirtyEntityRecords: jest.fn(),
getEntityRecordEdits: jest.fn(),
},
};
} );

describe( 'useIsDirty', () => {
it( 'should calculate dirtyEntityRecords', () => {
const { result } = renderHook( () => useIsDirty() );
Expand Down
Loading
Loading