@@ -151,8 +149,6 @@ export default function DataViews< Item >( {
>
{ header }
diff --git a/packages/dataviews/src/dataviews-layouts/grid/index.tsx b/packages/dataviews/src/dataviews-layouts/grid/index.tsx
index e218172b7900a..2a09fb68efab8 100644
--- a/packages/dataviews/src/dataviews-layouts/grid/index.tsx
+++ b/packages/dataviews/src/dataviews-layouts/grid/index.tsx
@@ -25,6 +25,7 @@ import { useHasAPossibleBulkAction } from '../../components/dataviews-bulk-actio
import type { Action, NormalizedField, ViewGridProps } from '../../types';
import type { SetSelection } from '../../private-types';
import getClickableItemProps from '../utils/get-clickable-item-props';
+import { useUpdatedPreviewSizeOnViewportChange } from './preview-size-picker';
interface GridItemProps< Item > {
selection: string[];
@@ -192,7 +193,6 @@ export default function ViewGrid< Item >( {
isItemClickable,
selection,
view,
- density,
}: ViewGridProps< Item > ) {
const mediaField = fields.find(
( field ) => field.id === view.layout?.mediaField
@@ -223,8 +223,12 @@ export default function ViewGrid< Item >( {
{ visibleFields: [], badgeFields: [] }
);
const hasData = !! data?.length;
- const gridStyle = density
- ? { gridTemplateColumns: `repeat(${ density }, minmax(0, 1fr))` }
+ const updatedPreviewSize = useUpdatedPreviewSizeOnViewportChange();
+ const usedPreviewSize = updatedPreviewSize || view.layout?.previewSize;
+ const gridStyle = usedPreviewSize
+ ? {
+ gridTemplateColumns: `repeat(${ usedPreviewSize }, minmax(0, 1fr))`,
+ }
: {};
return (
<>
diff --git a/packages/dataviews/src/dataviews-layouts/grid/density-picker.tsx b/packages/dataviews/src/dataviews-layouts/grid/preview-size-picker.tsx
similarity index 56%
rename from packages/dataviews/src/dataviews-layouts/grid/density-picker.tsx
rename to packages/dataviews/src/dataviews-layouts/grid/preview-size-picker.tsx
index 34ddf6c3fe52f..b48c6422bd6b3 100644
--- a/packages/dataviews/src/dataviews-layouts/grid/density-picker.tsx
+++ b/packages/dataviews/src/dataviews-layouts/grid/preview-size-picker.tsx
@@ -4,7 +4,13 @@
import { RangeControl } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useViewportMatch } from '@wordpress/compose';
-import { useEffect, useMemo } from '@wordpress/element';
+import { useMemo, useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import DataViewsContext from '../../components/dataviews-context';
+import type { ViewGrid } from '../../types';
const viewportBreaks = {
xhuge: { min: 3, max: 6, default: 5 },
@@ -39,31 +45,32 @@ function useViewPortBreakpoint() {
return null;
}
-export default function DensityPicker( {
- density,
- setDensity,
-}: {
- density: number;
- setDensity: React.Dispatch< React.SetStateAction< number > >;
-} ) {
+export function useUpdatedPreviewSizeOnViewportChange() {
+ const viewport = useViewPortBreakpoint();
+ const view = useContext( DataViewsContext ).view as ViewGrid;
+ return useMemo( () => {
+ const previewSize = view.layout?.previewSize;
+ let newPreviewSize;
+ if ( ! viewport || ! previewSize ) {
+ return;
+ }
+ const breakValues = viewportBreaks[ viewport ];
+ if ( previewSize < breakValues.min ) {
+ newPreviewSize = breakValues.min;
+ }
+ if ( previewSize > breakValues.max ) {
+ newPreviewSize = breakValues.max;
+ }
+ return newPreviewSize;
+ }, [ viewport, view ] );
+}
+
+export default function PreviewSizePicker() {
const viewport = useViewPortBreakpoint();
- useEffect( () => {
- setDensity( ( _density ) => {
- if ( ! viewport || ! _density ) {
- return 0;
- }
- const breakValues = viewportBreaks[ viewport ];
- if ( _density < breakValues.min ) {
- return breakValues.min;
- }
- if ( _density > breakValues.max ) {
- return breakValues.max;
- }
- return _density;
- } );
- }, [ setDensity, viewport ] );
+ const context = useContext( DataViewsContext );
+ const view = context.view as ViewGrid;
const breakValues = viewportBreaks[ viewport || 'mobile' ];
- const densityToUse = density || breakValues.default;
+ const previewSizeToUse = view.layout?.previewSize || breakValues.default;
const marks = useMemo(
() =>
@@ -88,13 +95,19 @@ export default function DensityPicker( {
__next40pxDefaultSize
showTooltip={ false }
label={ __( 'Preview size' ) }
- value={ breakValues.max + breakValues.min - densityToUse }
+ value={ breakValues.max + breakValues.min - previewSizeToUse }
marks={ marks }
min={ breakValues.min }
max={ breakValues.max }
withInputField={ false }
onChange={ ( value = 0 ) => {
- setDensity( breakValues.max + breakValues.min - value );
+ context.onChangeView( {
+ ...view,
+ layout: {
+ ...view.layout,
+ previewSize: breakValues.max + breakValues.min - value,
+ },
+ } );
} }
step={ 1 }
/>
diff --git a/packages/dataviews/src/dataviews-layouts/index.ts b/packages/dataviews/src/dataviews-layouts/index.ts
index eece17d0f4f10..7abdd1eb45932 100644
--- a/packages/dataviews/src/dataviews-layouts/index.ts
+++ b/packages/dataviews/src/dataviews-layouts/index.ts
@@ -17,6 +17,8 @@ import ViewGrid from './grid';
import ViewList from './list';
import { LAYOUT_GRID, LAYOUT_LIST, LAYOUT_TABLE } from '../constants';
import type { View, Field } from '../types';
+import PreviewSizePicker from './grid/preview-size-picker';
+import DensityPicker from './table/density-picker';
export const VIEW_LAYOUTS = [
{
@@ -24,12 +26,14 @@ export const VIEW_LAYOUTS = [
label: __( 'Table' ),
component: ViewTable,
icon: blockTable,
+ viewConfigOptions: DensityPicker,
},
{
type: LAYOUT_GRID,
label: __( 'Grid' ),
component: ViewGrid,
icon: category,
+ viewConfigOptions: PreviewSizePicker,
},
{
type: LAYOUT_LIST,
diff --git a/packages/dataviews/src/dataviews-layouts/table/density-picker.tsx b/packages/dataviews/src/dataviews-layouts/table/density-picker.tsx
new file mode 100644
index 0000000000000..6d3d31aeb7345
--- /dev/null
+++ b/packages/dataviews/src/dataviews-layouts/table/density-picker.tsx
@@ -0,0 +1,57 @@
+/**
+ * WordPress dependencies
+ */
+import {
+ __experimentalToggleGroupControl as ToggleGroupControl,
+ __experimentalToggleGroupControlOption as ToggleGroupControlOption,
+} from '@wordpress/components';
+import { __, _x } from '@wordpress/i18n';
+import { useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import DataViewsContext from '../../components/dataviews-context';
+import type { ViewTable, Density } from '../../types';
+
+export default function DensityPicker() {
+ const context = useContext( DataViewsContext );
+ const view = context.view as ViewTable;
+ return (
+
{
+ context.onChangeView( {
+ ...view,
+ layout: {
+ ...view.layout,
+ density: value as Density,
+ },
+ } );
+ } }
+ isBlock
+ >
+
+
+
+
+ );
+}
diff --git a/packages/dataviews/src/dataviews-layouts/table/index.tsx b/packages/dataviews/src/dataviews-layouts/table/index.tsx
index db76d24b53bfa..7f93a4c14a7dd 100644
--- a/packages/dataviews/src/dataviews-layouts/table/index.tsx
+++ b/packages/dataviews/src/dataviews-layouts/table/index.tsx
@@ -332,7 +332,13 @@ function ViewTable< Item >( {
return (
<>
diff --git a/packages/dataviews/src/dataviews-layouts/table/style.scss b/packages/dataviews/src/dataviews-layouts/table/style.scss
index ea2c614e4339d..3bbb045c73a9d 100644
--- a/packages/dataviews/src/dataviews-layouts/table/style.scss
+++ b/packages/dataviews/src/dataviews-layouts/table/style.scss
@@ -169,6 +169,38 @@
opacity: 1;
}
}
+
+ // Density style overrides.
+ &.has-compact-density {
+ thead {
+ th {
+ &:has(.dataviews-view-table-header-button):not(:first-child) {
+ padding-left: 0;
+ }
+ }
+ }
+ td,
+ th {
+ padding: $grid-unit-05 $grid-unit-10;
+ }
+ }
+
+ &.has-comfortable-density {
+ td,
+ th {
+ padding: $grid-unit-20 $grid-unit-15;
+ }
+ }
+
+ &.has-compact-density,
+ &.has-comfortable-density {
+ td,
+ th {
+ &.dataviews-view-table__checkbox-column {
+ padding-right: 0;
+ }
+ }
+ }
}
/* stylelint-disable-next-line scss/at-rule-no-unknown -- '@container' not globally permitted */
diff --git a/packages/dataviews/src/types.ts b/packages/dataviews/src/types.ts
index 8c4276f2541ec..861dc53404f91 100644
--- a/packages/dataviews/src/types.ts
+++ b/packages/dataviews/src/types.ts
@@ -329,6 +329,8 @@ export interface ColumnStyle {
minWidth?: string | number;
}
+export type Density = 'compact' | 'balanced' | 'comfortable';
+
export interface ViewTable extends ViewBase {
type: 'table';
@@ -347,6 +349,11 @@ export interface ViewTable extends ViewBase {
* The styles for the columns.
*/
styles?: Record< string, ColumnStyle >;
+
+ /**
+ * The density of the view.
+ */
+ density?: Density;
};
}
@@ -389,6 +396,11 @@ export interface ViewGrid extends ViewBase {
* The fields to use as badge fields.
*/
badgeFields?: string[];
+
+ /**
+ * The preview size of the grid.
+ */
+ previewSize?: number;
};
}
@@ -501,7 +513,6 @@ export interface ViewBaseProps< Item > {
onClickItem: ( item: Item ) => void;
isItemClickable: ( item: Item ) => boolean;
view: View;
- density: number;
}
export interface ViewTableProps< Item > extends ViewBaseProps< Item > {
diff --git a/packages/date/CHANGELOG.md b/packages/date/CHANGELOG.md
index a385b61dc1728..21ddf97506403 100644
--- a/packages/date/CHANGELOG.md
+++ b/packages/date/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/date/package.json b/packages/date/package.json
index 0d98f3954d92d..0a1052f13d95f 100644
--- a/packages/date/package.json
+++ b/packages/date/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/date",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "Date module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
index ee79a75513b99..4784e2105f6fb 100644
--- a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
+++ b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 6.13.0 (2024-11-27)
+
## 6.12.0 (2024-11-16)
## 6.11.0 (2024-10-30)
diff --git a/packages/dependency-extraction-webpack-plugin/lib/util.js b/packages/dependency-extraction-webpack-plugin/lib/util.js
index cc99986024476..49b16986cda81 100644
--- a/packages/dependency-extraction-webpack-plugin/lib/util.js
+++ b/packages/dependency-extraction-webpack-plugin/lib/util.js
@@ -5,6 +5,7 @@ const WORDPRESS_NAMESPACE = '@wordpress/';
// !!
const BUNDLED_PACKAGES = [
'@wordpress/dataviews',
+ '@wordpress/dataviews/wp',
'@wordpress/icons',
'@wordpress/interface',
'@wordpress/sync',
diff --git a/packages/dependency-extraction-webpack-plugin/package.json b/packages/dependency-extraction-webpack-plugin/package.json
index f168f379aa819..5738c18f55fff 100644
--- a/packages/dependency-extraction-webpack-plugin/package.json
+++ b/packages/dependency-extraction-webpack-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/dependency-extraction-webpack-plugin",
- "version": "6.12.0",
+ "version": "6.13.0",
"description": "Extract WordPress script dependencies from webpack bundles.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/deprecated/CHANGELOG.md b/packages/deprecated/CHANGELOG.md
index 861aaa9ad69f2..3ec1c350bc2d0 100644
--- a/packages/deprecated/CHANGELOG.md
+++ b/packages/deprecated/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/deprecated/package.json b/packages/deprecated/package.json
index 11d351d17acb4..0da22c081e83d 100644
--- a/packages/deprecated/package.json
+++ b/packages/deprecated/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/deprecated",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "Deprecation utility for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/docgen/CHANGELOG.md b/packages/docgen/CHANGELOG.md
index 7c92855715e32..ea879d77247ac 100644
--- a/packages/docgen/CHANGELOG.md
+++ b/packages/docgen/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 2.13.0 (2024-11-27)
+
## 2.12.0 (2024-11-16)
## 2.11.0 (2024-10-30)
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
index f9df5281bd525..4b7c5e25efe15 100644
--- a/packages/docgen/package.json
+++ b/packages/docgen/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/docgen",
- "version": "2.12.0",
+ "version": "2.13.0",
"description": "Autogenerate public API documentation from exports and JSDoc comments.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/dom-ready/CHANGELOG.md b/packages/dom-ready/CHANGELOG.md
index 2b6647faa8332..27499bdb048a1 100644
--- a/packages/dom-ready/CHANGELOG.md
+++ b/packages/dom-ready/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/dom-ready/package.json b/packages/dom-ready/package.json
index 7302df37787ca..d3aa36e6c6efe 100644
--- a/packages/dom-ready/package.json
+++ b/packages/dom-ready/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/dom-ready",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "Execute callback after the DOM is loaded.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/dom/CHANGELOG.md b/packages/dom/CHANGELOG.md
index f44165f23fd51..0ce2a24565d0d 100644
--- a/packages/dom/CHANGELOG.md
+++ b/packages/dom/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/dom/package.json b/packages/dom/package.json
index a717c1ee0b9a5..f2b96de10b5b6 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/dom",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "DOM utilities module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils-playwright/CHANGELOG.md b/packages/e2e-test-utils-playwright/CHANGELOG.md
index 968963de3b79d..b1a35757f7496 100644
--- a/packages/e2e-test-utils-playwright/CHANGELOG.md
+++ b/packages/e2e-test-utils-playwright/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 1.13.0 (2024-11-27)
+
## 1.12.0 (2024-11-16)
## 1.11.0 (2024-10-30)
diff --git a/packages/e2e-test-utils-playwright/package.json b/packages/e2e-test-utils-playwright/package.json
index 43ef469ac8847..ae91fa25e882d 100644
--- a/packages/e2e-test-utils-playwright/package.json
+++ b/packages/e2e-test-utils-playwright/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/e2e-test-utils-playwright",
- "version": "1.12.0",
+ "version": "1.13.0",
"description": "End-To-End (E2E) test utils for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils/CHANGELOG.md b/packages/e2e-test-utils/CHANGELOG.md
index 1974f72e3fb21..24f73664bd7dc 100644
--- a/packages/e2e-test-utils/CHANGELOG.md
+++ b/packages/e2e-test-utils/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 11.13.0 (2024-11-27)
+
## 11.12.0 (2024-11-16)
## 11.11.0 (2024-10-30)
diff --git a/packages/e2e-test-utils/package.json b/packages/e2e-test-utils/package.json
index ee7a4deaa2ee9..9fcb70294e852 100644
--- a/packages/e2e-test-utils/package.json
+++ b/packages/e2e-test-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/e2e-test-utils",
- "version": "11.12.0",
+ "version": "11.13.0",
"description": "End-To-End (E2E) test utils for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md
index e6f405a0d2111..0148f8b0a51dd 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 8.13.0 (2024-11-27)
+
## 8.12.0 (2024-11-16)
## 8.11.0 (2024-10-30)
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index ee87ea8430654..62008860a8b29 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/e2e-tests",
- "version": "8.12.0",
+ "version": "8.13.0",
"description": "End-To-End (E2E) tests for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/edit-post/CHANGELOG.md b/packages/edit-post/CHANGELOG.md
index 56f37b13ae622..47933552311d1 100644
--- a/packages/edit-post/CHANGELOG.md
+++ b/packages/edit-post/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 8.13.0 (2024-11-27)
+
## 8.12.0 (2024-11-16)
## 8.11.0 (2024-10-30)
diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
index ba2bdea38bbe4..aea81f0568fbe 100644
--- a/packages/edit-post/package.json
+++ b/packages/edit-post/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/edit-post",
- "version": "8.12.0",
+ "version": "8.13.0",
"description": "Edit Post module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/edit-post/src/components/browser-url/index.js b/packages/edit-post/src/components/browser-url/index.js
index 12292cb844721..00492afbdc262 100644
--- a/packages/edit-post/src/components/browser-url/index.js
+++ b/packages/edit-post/src/components/browser-url/index.js
@@ -27,14 +27,13 @@ export class BrowserURL extends Component {
}
componentDidUpdate( prevProps ) {
- const { postId, postStatus, hasHistory } = this.props;
+ const { postId, postStatus } = this.props;
const { historyId } = this.state;
if (
( postId !== prevProps.postId || postId !== historyId ) &&
postStatus !== 'auto-draft' &&
- postId &&
- ! hasHistory
+ postId
) {
this.setBrowserURL( postId );
}
diff --git a/packages/edit-post/src/components/layout/index.js b/packages/edit-post/src/components/layout/index.js
index aec14eab989f0..5dcbfa2c82cea 100644
--- a/packages/edit-post/src/components/layout/index.js
+++ b/packages/edit-post/src/components/layout/index.js
@@ -392,7 +392,6 @@ function Layout( {
showIconLabels,
isDistractionFree,
showMetaBoxes,
- hasHistory,
isWelcomeGuideVisible,
templateId,
enablePaddingAppender,
@@ -595,7 +594,7 @@ function Layout( {
-
+
diff --git a/packages/edit-site/CHANGELOG.md b/packages/edit-site/CHANGELOG.md
index 0c90c024b0cd9..7143b40a59a1b 100644
--- a/packages/edit-site/CHANGELOG.md
+++ b/packages/edit-site/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 6.13.0 (2024-11-27)
+
## 6.12.0 (2024-11-16)
## 6.11.0 (2024-10-30)
diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
index 11ce70b876bc4..81a8164b1e172 100644
--- a/packages/edit-site/package.json
+++ b/packages/edit-site/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/edit-site",
- "version": "6.12.0",
+ "version": "6.13.0",
"description": "Edit Site Page module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/edit-site/src/components/add-new-template/utils.js b/packages/edit-site/src/components/add-new-template/utils.js
index e3e2faf945792..759f3f478cada 100644
--- a/packages/edit-site/src/components/add-new-template/utils.js
+++ b/packages/edit-site/src/components/add-new-template/utils.js
@@ -3,7 +3,6 @@
*/
import { useSelect } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
-import { store as editorStore } from '@wordpress/editor';
import { decodeEntities } from '@wordpress/html-entities';
import { useMemo, useCallback } from '@wordpress/element';
import { __, _x, sprintf } from '@wordpress/i18n';
@@ -69,7 +68,8 @@ export const useExistingTemplates = () => {
export const useDefaultTemplateTypes = () => {
return useSelect(
( select ) =>
- select( editorStore ).__experimentalGetDefaultTemplateTypes(),
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_types || [],
[]
);
};
diff --git a/packages/edit-site/src/components/app/index.js b/packages/edit-site/src/components/app/index.js
index 3588565fcb3c1..7e4c50d7d00f0 100644
--- a/packages/edit-site/src/components/app/index.js
+++ b/packages/edit-site/src/components/app/index.js
@@ -1,11 +1,6 @@
/**
* WordPress dependencies
*/
-import { SlotFillProvider } from '@wordpress/components';
-import {
- UnsavedChangesWarning,
- privateApis as editorPrivateApis,
-} from '@wordpress/editor';
import { store as noticesStore } from '@wordpress/notices';
import { useDispatch } from '@wordpress/data';
import { __, sprintf } from '@wordpress/i18n';
@@ -23,7 +18,6 @@ import useSetCommandContext from '../../hooks/commands/use-set-command-context';
import { useRegisterSiteEditorRoutes } from '../site-editor-routes';
const { RouterProvider } = unlock( routerPrivateApis );
-const { GlobalStylesProvider } = unlock( editorPrivateApis );
function AppLayout() {
useCommonCommands();
@@ -50,14 +44,9 @@ export default function App() {
}
return (
-
-
-
-
-
-
-
-
-
+
+
+
+
);
}
diff --git a/packages/edit-site/src/components/editor/use-editor-title.js b/packages/edit-site/src/components/editor/use-editor-title.js
index 2ad4e94ccc3e8..727b190117e02 100644
--- a/packages/edit-site/src/components/editor/use-editor-title.js
+++ b/packages/edit-site/src/components/editor/use-editor-title.js
@@ -4,33 +4,46 @@
import { _x, sprintf } from '@wordpress/i18n';
import { useSelect } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
-import { store as editorStore } from '@wordpress/editor';
import { decodeEntities } from '@wordpress/html-entities';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
/**
* Internal dependencies
*/
import useTitle from '../routes/use-title';
import { POST_TYPE_LABELS, TEMPLATE_POST_TYPE } from '../../utils/constants';
+import { unlock } from '../../lock-unlock';
+
+const { getTemplateInfo } = unlock( editorPrivateApis );
function useEditorTitle( postType, postId ) {
const { title, isLoaded } = useSelect(
( select ) => {
const { getEditedEntityRecord, hasFinishedResolution } =
select( coreStore );
- const { __experimentalGetTemplateInfo: getTemplateInfo } =
- select( editorStore );
+
const _record = getEditedEntityRecord(
'postType',
postType,
postId
);
+
+ const { default_template_types: templateTypes = [] } =
+ select( coreStore ).getEntityRecord(
+ 'root',
+ '__unstableBase'
+ ) ?? {};
+
+ const templateInfo = getTemplateInfo( {
+ template: _record,
+ templateTypes,
+ } );
+
const _isLoaded = hasFinishedResolution( 'getEditedEntityRecord', [
'postType',
postType,
postId,
] );
- const templateInfo = getTemplateInfo( _record );
return {
title: templateInfo.title,
diff --git a/packages/edit-site/src/components/layout/index.js b/packages/edit-site/src/components/layout/index.js
index cbc0a4661bf3e..47ff65aa2ac67 100644
--- a/packages/edit-site/src/components/layout/index.js
+++ b/packages/edit-site/src/components/layout/index.js
@@ -10,6 +10,7 @@ import {
__unstableMotion as motion,
__unstableAnimatePresence as AnimatePresence,
__unstableUseNavigateRegions as useNavigateRegions,
+ SlotFillProvider,
} from '@wordpress/components';
import {
useReducedMotion,
@@ -23,6 +24,7 @@ import { CommandMenu } from '@wordpress/commands';
import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
import {
EditorSnackbars,
+ UnsavedChangesWarning,
privateApis as editorPrivateApis,
} from '@wordpress/editor';
import { privateApis as coreCommandsPrivateApis } from '@wordpress/core-commands';
@@ -44,12 +46,12 @@ import SavePanel from '../save-panel';
const { useCommands } = unlock( coreCommandsPrivateApis );
const { useGlobalStyle } = unlock( blockEditorPrivateApis );
-const { NavigableRegion } = unlock( editorPrivateApis );
+const { NavigableRegion, GlobalStylesProvider } = unlock( editorPrivateApis );
const { useLocation } = unlock( routerPrivateApis );
const ANIMATION_DURATION = 0.3;
-export default function Layout( { route } ) {
+function Layout( { route } ) {
const { params } = useLocation();
const { canvas = 'view' } = params;
useCommands();
@@ -78,6 +80,7 @@ export default function Layout( { route } ) {
return (
<>
+
{ canvas === 'view' && }
);
}
+
+export default function LayoutWithGlobalStylesProvider( props ) {
+ return (
+
+
+
+
+
+ );
+}
diff --git a/packages/edit-site/src/components/page-patterns/header.js b/packages/edit-site/src/components/page-patterns/header.js
index 641dc577cb7fe..0d3763aec62c1 100644
--- a/packages/edit-site/src/components/page-patterns/header.js
+++ b/packages/edit-site/src/components/page-patterns/header.js
@@ -9,7 +9,7 @@ import {
__experimentalText as Text,
__experimentalVStack as VStack,
} from '@wordpress/components';
-import { store as editorStore } from '@wordpress/editor';
+import { store as coreStore } from '@wordpress/core-data';
import { useSelect } from '@wordpress/data';
import { __, sprintf } from '@wordpress/i18n';
import { moreVertical } from '@wordpress/icons';
@@ -32,7 +32,8 @@ export default function PatternsHeader( {
const { patternCategories } = usePatternCategories();
const templatePartAreas = useSelect(
( select ) =>
- select( editorStore ).__experimentalGetDefaultTemplatePartAreas(),
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_part_areas || [],
[]
);
diff --git a/packages/edit-site/src/components/page-patterns/use-patterns.js b/packages/edit-site/src/components/page-patterns/use-patterns.js
index e226298857c4d..3b3e33d5650e6 100644
--- a/packages/edit-site/src/components/page-patterns/use-patterns.js
+++ b/packages/edit-site/src/components/page-patterns/use-patterns.js
@@ -4,7 +4,6 @@
import { parse } from '@wordpress/blocks';
import { useSelect, createSelector } from '@wordpress/data';
import { store as coreStore } from '@wordpress/core-data';
-import { store as editorStore } from '@wordpress/editor';
import { useMemo } from '@wordpress/element';
/**
@@ -28,8 +27,7 @@ const selectTemplateParts = createSelector(
( select, categoryId, search = '' ) => {
const { getEntityRecords, isResolving: isResolvingSelector } =
select( coreStore );
- const { __experimentalGetDefaultTemplatePartAreas } =
- select( editorStore );
+
const query = { per_page: -1 };
const templateParts =
getEntityRecords( 'postType', TEMPLATE_PART_POST_TYPE, query ) ??
@@ -38,7 +36,10 @@ const selectTemplateParts = createSelector(
// In the case where a custom template part area has been removed we need
// the current list of areas to cross check against so orphaned template
// parts can be treated as uncategorized.
- const knownAreas = __experimentalGetDefaultTemplatePartAreas() || [];
+ const knownAreas =
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_part_areas || [];
+
const templatePartAreas = knownAreas.map( ( area ) => area.area );
const templatePartHasCategory = ( item, category ) => {
@@ -78,7 +79,8 @@ const selectTemplateParts = createSelector(
TEMPLATE_PART_POST_TYPE,
{ per_page: -1 },
] ),
- select( editorStore ).__experimentalGetDefaultTemplatePartAreas(),
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_part_areas,
]
);
diff --git a/packages/edit-site/src/components/page-templates/style.scss b/packages/edit-site/src/components/page-templates/style.scss
index 6a753921f6f40..4432cf6bec492 100644
--- a/packages/edit-site/src/components/page-templates/style.scss
+++ b/packages/edit-site/src/components/page-templates/style.scss
@@ -60,6 +60,7 @@
.dataviews-view-table & {
margin-bottom: $grid-unit-10;
+ display: block;
}
}
diff --git a/packages/edit-site/src/components/posts-app/index.js b/packages/edit-site/src/components/posts-app/index.js
index 72e5b1eb99749..e6eb90c168001 100644
--- a/packages/edit-site/src/components/posts-app/index.js
+++ b/packages/edit-site/src/components/posts-app/index.js
@@ -1,10 +1,6 @@
/**
* WordPress dependencies
*/
-import {
- UnsavedChangesWarning,
- privateApis as editorPrivateApis,
-} from '@wordpress/editor';
import { privateApis as routerPrivateApis } from '@wordpress/router';
/**
@@ -16,7 +12,6 @@ import { unlock } from '../../lock-unlock';
import useActiveRoute from '../layout/router';
const { RouterProvider } = unlock( routerPrivateApis );
-const { GlobalStylesProvider } = unlock( editorPrivateApis );
function PostsLayout() {
useRegisterPostsAppRoutes();
@@ -26,11 +21,8 @@ function PostsLayout() {
export default function PostsApp() {
return (
-
-
-
-
-
-
+
+
+
);
}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/index.js
index 51833443d8d85..f7e5f8bbec34d 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/index.js
@@ -1,24 +1,14 @@
/**
* WordPress dependencies
*/
-import { __, sprintf } from '@wordpress/i18n';
-import { humanTimeDiff } from '@wordpress/date';
-import { createInterpolateElement } from '@wordpress/element';
+import { _n, sprintf } from '@wordpress/i18n';
import { addQueryArgs } from '@wordpress/url';
-import {
- Icon,
- __experimentalItemGroup as ItemGroup,
-} from '@wordpress/components';
+import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
import { backup } from '@wordpress/icons';
/**
* Internal dependencies
*/
-import {
- SidebarNavigationScreenDetailsPanelRow,
- SidebarNavigationScreenDetailsPanelLabel,
- SidebarNavigationScreenDetailsPanelValue,
-} from '../sidebar-navigation-screen-details-panel';
import SidebarNavigationItem from '../sidebar-navigation-item';
export default function SidebarNavigationScreenDetailsFooter( {
@@ -56,33 +46,20 @@ export default function SidebarNavigationScreenDetailsFooter( {
hrefProps.as = 'a';
}
return (
-
+
-
-
- { __( 'Last modified' ) }
-
-
- { createInterpolateElement(
- sprintf(
- /* translators: %s: is the relative time when the post was last modified. */
- __( '' ),
- humanTimeDiff( record.modified )
- ),
- {
- time: ,
- }
- ) }
-
-
-
+ { sprintf(
+ /* translators: %d: Number of Styles revisions. */
+ _n( '%d Revision', '%d Revisions', revisionsCount ),
+ revisionsCount
+ ) }
);
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/style.scss
index 866a36c02174d..0b48d45112966 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/style.scss
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-details-footer/style.scss
@@ -5,8 +5,4 @@
div.edit-site-sidebar-navigation-item.components-item[aria-current] {
background: none;
}
- .edit-site-sidebar-navigation-screen-details-footer__icon {
- margin-left: auto;
- fill: $gray-600;
- }
}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/index.js
deleted file mode 100644
index 7d7a3932c9947..0000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
- __experimentalVStack as VStack,
- __experimentalHeading as Heading,
-} from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import SidebarNavigationScreenDetailsPanelLabel from './sidebar-navigation-screen-details-panel-label';
-import SidebarNavigationScreenDetailsPanelRow from './sidebar-navigation-screen-details-panel-row';
-import SidebarNavigationScreenDetailsPanelValue from './sidebar-navigation-screen-details-panel-value';
-
-function SidebarNavigationScreenDetailsPanel( { title, children, spacing } ) {
- return (
-
- { title && (
-
- { title }
-
- ) }
- { children }
-
- );
-}
-
-export {
- SidebarNavigationScreenDetailsPanel,
- SidebarNavigationScreenDetailsPanelRow,
- SidebarNavigationScreenDetailsPanelLabel,
- SidebarNavigationScreenDetailsPanelValue,
-};
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-label.js b/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-label.js
deleted file mode 100644
index 157eecd557519..0000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-label.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __experimentalText as Text } from '@wordpress/components';
-
-export default function SidebarNavigationScreenDetailsPanelLabel( {
- children,
-} ) {
- return (
-
- { children }
-
- );
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-row.js b/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-row.js
deleted file mode 100644
index 1c7f9abafdf50..0000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-row.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * External dependencies
- */
-import clsx from 'clsx';
-
-/**
- * WordPress dependencies
- */
-import { __experimentalHStack as HStack } from '@wordpress/components';
-
-export default function SidebarNavigationScreenDetailsPanelRow( {
- label,
- children,
- className,
- ...extraProps
-} ) {
- return (
-
- { children }
-
- );
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-value.js b/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-value.js
deleted file mode 100644
index 80e8ba8cf1d53..0000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/sidebar-navigation-screen-details-panel-value.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __experimentalText as Text } from '@wordpress/components';
-
-export default function SidebarNavigationScreenDetailsPanelValue( {
- children,
-} ) {
- return (
-
- { children }
-
- );
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/style.scss
deleted file mode 100644
index 2757ce5a620c5..0000000000000
--- a/packages/edit-site/src/components/sidebar-navigation-screen-details-panel/style.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.edit-site-sidebar-navigation-details-screen-panel {
- margin: $grid-unit-30 0;
-
- &:last-of-type {
- margin-bottom: 0;
- }
-
- .edit-site-sidebar-navigation-details-screen-panel__heading {
- color: $gray-400;
- text-transform: uppercase;
- font-weight: 500;
- font-size: 11px;
- padding: 0;
- margin-bottom: 0;
- }
-}
-
-.edit-site-sidebar-navigation-details-screen-panel__label.edit-site-sidebar-navigation-details-screen-panel__label {
- color: $gray-600;
- width: 100px;
- flex-shrink: 0;
-}
-
-.edit-site-sidebar-navigation-details-screen-panel__value.edit-site-sidebar-navigation-details-screen-panel__value {
- color: $gray-200;
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js
index 772b15aec2a29..72671714479ac 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js
@@ -86,9 +86,8 @@ export default function SidebarNavigationScreenGlobalStyles() {
}, [ openGlobalStyles, setEditorCanvasContainerView ] );
// If there are no revisions, do not render a footer.
- const modifiedDateTime = revisions?.[ 0 ]?.modified;
const shouldShowGlobalStylesFooter =
- revisionsCount > 0 && ! isLoadingRevisions && modifiedDateTime;
+ !! revisionsCount && ! isLoadingRevisions;
return (
<>
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-template-part-areas.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-template-part-areas.js
index 77cbf87b3d439..6a67a8f8a30fb 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-template-part-areas.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/use-template-part-areas.js
@@ -1,9 +1,8 @@
/**
* WordPress dependencies
*/
-import { useEntityRecords } from '@wordpress/core-data';
+import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
import { useSelect } from '@wordpress/data';
-import { store as editorStore } from '@wordpress/editor';
/**
* Internal dependencies
@@ -18,7 +17,8 @@ const useTemplatePartsGroupedByArea = ( items ) => {
const templatePartAreas = useSelect(
( select ) =>
- select( editorStore ).__experimentalGetDefaultTemplatePartAreas(),
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_part_areas || [],
[]
);
@@ -43,7 +43,7 @@ const useTemplatePartsGroupedByArea = ( items ) => {
const key = accumulator[ item.area ]
? item.area
: TEMPLATE_PART_AREA_DEFAULT_CATEGORY;
- accumulator[ key ].templateParts.push( item );
+ accumulator[ key ]?.templateParts?.push( item );
return accumulator;
}, knownAreas );
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen/style.scss
index 1d57472f7e9f9..959115e0fac8c 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen/style.scss
+++ b/packages/edit-site/src/components/sidebar-navigation-screen/style.scss
@@ -18,7 +18,7 @@
.edit-site-sidebar-navigation-screen__content {
padding: 0 $grid-unit-20;
- .components-item-group {
+ .edit-site-sidebar-navigation-screen-details-footer {
margin-left: -$grid-unit-20;
margin-right: -$grid-unit-20;
}
@@ -127,9 +127,14 @@
bottom: 0;
background-color: $gray-900;
gap: 0;
- padding: $grid-unit-20 0;
+ padding: $grid-unit-10 $grid-unit-20;
margin: $grid-unit-20 0 0;
border-top: 1px solid $gray-800;
+
+ .components-item-group {
+ margin-left: -$grid-unit-20;
+ margin-right: -$grid-unit-20;
+ }
}
/* In general style overrides are discouraged.
diff --git a/packages/edit-site/src/index.js b/packages/edit-site/src/index.js
index 7f124e6b5f7ac..b96ce5cb67f5e 100644
--- a/packages/edit-site/src/index.js
+++ b/packages/edit-site/src/index.js
@@ -10,10 +10,7 @@ import {
import { dispatch } from '@wordpress/data';
import deprecated from '@wordpress/deprecated';
import { createRoot, StrictMode } from '@wordpress/element';
-import {
- store as editorStore,
- privateApis as editorPrivateApis,
-} from '@wordpress/editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
import { store as preferencesStore } from '@wordpress/preferences';
import {
registerLegacyWidgetBlock,
@@ -88,15 +85,6 @@ export function initializeEditor( id, settings ) {
dispatch( editSiteStore ).updateSettings( settings );
- // Keep the defaultTemplateTypes in the core/editor settings too,
- // so that they can be selected with core/editor selectors in any editor.
- // This is needed because edit-site doesn't initialize with EditorProvider,
- // which internally uses updateEditorSettings as well.
- dispatch( editorStore ).updateEditorSettings( {
- defaultTemplateTypes: settings.defaultTemplateTypes,
- defaultTemplatePartAreas: settings.defaultTemplatePartAreas,
- } );
-
// Prevent the default browser action for files dropped outside of dropzones.
window.addEventListener( 'dragover', ( e ) => e.preventDefault(), false );
window.addEventListener( 'drop', ( e ) => e.preventDefault(), false );
diff --git a/packages/edit-site/src/style.scss b/packages/edit-site/src/style.scss
index 63ad8244a7c95..dce945a48ee70 100644
--- a/packages/edit-site/src/style.scss
+++ b/packages/edit-site/src/style.scss
@@ -20,7 +20,6 @@
@import "./components/sidebar-navigation-screen/style.scss";
@import "./components/sidebar-navigation-screen-details-footer/style.scss";
@import "./components/sidebar-navigation-screen-navigation-menu/style.scss";
-@import "components/sidebar-navigation-screen-details-panel/style.scss";
@import "./components/sidebar-navigation-screen-patterns/style.scss";
@import "./components/sidebar-dataviews/style.scss";
@import "./components/site-hub/style.scss";
diff --git a/packages/edit-widgets/CHANGELOG.md b/packages/edit-widgets/CHANGELOG.md
index 22d109562d768..f4b11636858dc 100644
--- a/packages/edit-widgets/CHANGELOG.md
+++ b/packages/edit-widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 6.13.0 (2024-11-27)
+
## 6.12.0 (2024-11-16)
## 6.11.0 (2024-10-30)
diff --git a/packages/edit-widgets/package.json b/packages/edit-widgets/package.json
index 4ed1124314f2c..ed375f7430a1a 100644
--- a/packages/edit-widgets/package.json
+++ b/packages/edit-widgets/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/edit-widgets",
- "version": "6.12.0",
+ "version": "6.13.0",
"description": "Widgets Page module for WordPress..",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/editor/CHANGELOG.md b/packages/editor/CHANGELOG.md
index 37f46d1d74ccb..5c00b30fbe96d 100644
--- a/packages/editor/CHANGELOG.md
+++ b/packages/editor/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 14.13.0 (2024-11-27)
+
## 14.12.0 (2024-11-16)
## 14.11.0 (2024-10-30)
diff --git a/packages/editor/package.json b/packages/editor/package.json
index 77399238a9f46..59d3caded3d32 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/editor",
- "version": "14.12.0",
+ "version": "14.13.0",
"description": "Enhanced block editor for WordPress posts.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/editor/src/components/collab-sidebar/comment-button-toolbar.js b/packages/editor/src/components/collab-sidebar/comment-button-toolbar.js
index 2e378a7eaabab..b673ee87fe86c 100644
--- a/packages/editor/src/components/collab-sidebar/comment-button-toolbar.js
+++ b/packages/editor/src/components/collab-sidebar/comment-button-toolbar.js
@@ -11,18 +11,18 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
*/
import { unlock } from '../../lock-unlock';
-const { __unstableCommentIconToolbarFill } = unlock( blockEditorPrivateApis );
+const { CommentIconToolbarSlotFill } = unlock( blockEditorPrivateApis );
const AddCommentToolbarButton = ( { onClick } ) => {
return (
- <__unstableCommentIconToolbarFill>
+
-
+
);
};
diff --git a/packages/editor/src/components/collab-sidebar/comment-button.js b/packages/editor/src/components/collab-sidebar/comment-button.js
index 3b02066181666..373ee0becd92d 100644
--- a/packages/editor/src/components/collab-sidebar/comment-button.js
+++ b/packages/editor/src/components/collab-sidebar/comment-button.js
@@ -12,11 +12,11 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
*/
import { unlock } from '../../lock-unlock';
-const { __unstableCommentIconFill } = unlock( blockEditorPrivateApis );
+const { CommentIconSlotFill } = unlock( blockEditorPrivateApis );
const AddCommentButton = ( { onClick } ) => {
return (
- <__unstableCommentIconFill>
+
-
+
);
};
diff --git a/packages/editor/src/components/create-template-part-modal/index.js b/packages/editor/src/components/create-template-part-modal/index.js
index 5d594cd646cc1..660439ded2300 100644
--- a/packages/editor/src/components/create-template-part-modal/index.js
+++ b/packages/editor/src/components/create-template-part-modal/index.js
@@ -27,7 +27,6 @@ import { serialize } from '@wordpress/blocks';
/**
* Internal dependencies
*/
-import { store as editorStore } from '../../store';
import {
TEMPLATE_PART_POST_TYPE,
TEMPLATE_PART_AREA_DEFAULT_CATEGORY,
@@ -81,9 +80,11 @@ export function CreateTemplatePartModalContents( {
const templatePartAreas = useSelect(
( select ) =>
- select( editorStore ).__experimentalGetDefaultTemplatePartAreas(),
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_part_areas || [],
[]
);
+
async function createTemplatePart() {
if ( ! title || isSubmitting ) {
return;
diff --git a/packages/editor/src/components/document-bar/index.js b/packages/editor/src/components/document-bar/index.js
index 9fffba941a435..7b94a6fbeb3be 100644
--- a/packages/editor/src/components/document-bar/index.js
+++ b/packages/editor/src/components/document-bar/index.js
@@ -29,6 +29,7 @@ import { decodeEntities } from '@wordpress/html-entities';
import { TEMPLATE_POST_TYPES } from '../../store/constants';
import { store as editorStore } from '../../store';
import usePageTypeBadge from '../../utils/pageTypeBadge';
+import { getTemplateInfo } from '../../utils/get-template-info';
/** @typedef {import("@wordpress/components").IconType} IconType */
@@ -65,9 +66,9 @@ export default function DocumentBar( props ) {
getCurrentPostType,
getCurrentPostId,
getEditorSettings,
- __experimentalGetTemplateInfo: getTemplateInfo,
getRenderingMode,
} = select( editorStore );
+
const {
getEditedEntityRecord,
getPostType,
@@ -80,7 +81,15 @@ export default function DocumentBar( props ) {
_postType,
_postId
);
- const _templateInfo = getTemplateInfo( _document );
+
+ const { default_template_types: templateTypes = [] } =
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' ) ??
+ {};
+
+ const _templateInfo = getTemplateInfo( {
+ templateTypes,
+ template: _document,
+ } );
const _postTypeLabel = getPostType( _postType )?.labels?.singular_name;
return {
diff --git a/packages/editor/src/components/entities-saved-states/entity-record-item.js b/packages/editor/src/components/entities-saved-states/entity-record-item.js
index ca9fb2e0b169c..e8219c4cca7ae 100644
--- a/packages/editor/src/components/entities-saved-states/entity-record-item.js
+++ b/packages/editor/src/components/entities-saved-states/entity-record-item.js
@@ -12,6 +12,7 @@ import { decodeEntities } from '@wordpress/html-entities';
*/
import { store as editorStore } from '../../store';
import { unlock } from '../../lock-unlock';
+import { getTemplateInfo } from '../../utils/get-template-info';
export default function EntityRecordItem( { record, checked, onChange } ) {
const { name, kind, title, key } = record;
@@ -33,11 +34,18 @@ export default function EntityRecordItem( { record, checked, onChange } ) {
name,
key
);
+
+ const { default_template_types: templateTypes = [] } =
+ select( coreStore ).getEntityRecord(
+ 'root',
+ '__unstableBase'
+ ) ?? {};
+
return {
- entityRecordTitle:
- select( editorStore ).__experimentalGetTemplateInfo(
- template
- ).title,
+ entityRecordTitle: getTemplateInfo( {
+ template,
+ templateTypes,
+ } ).title,
hasPostMetaChanges: unlock(
select( editorStore )
).hasPostMetaChanges( name, key ),
diff --git a/packages/editor/src/components/header/style.scss b/packages/editor/src/components/header/style.scss
index d12c01506a052..4cbbe992e63fd 100644
--- a/packages/editor/src/components/header/style.scss
+++ b/packages/editor/src/components/header/style.scss
@@ -7,7 +7,7 @@
&:has(> .editor-header__center) {
grid-template: auto / $header-height min-content 1fr min-content $header-height;
@include break-medium {
- grid-template: auto / $header-height minmax(min-content, 1fr) 2fr minmax(min-content, 1fr) $header-height;
+ grid-template: auto / $header-height minmax(min-content, 2fr) 2.5fr minmax(min-content, 2fr) $header-height;
}
}
@include break-mobile {
diff --git a/packages/editor/src/components/post-card-panel/index.js b/packages/editor/src/components/post-card-panel/index.js
index 410b8cfd4447d..8fcca6c6bd6d4 100644
--- a/packages/editor/src/components/post-card-panel/index.js
+++ b/packages/editor/src/components/post-card-panel/index.js
@@ -22,6 +22,7 @@ import {
import { unlock } from '../../lock-unlock';
import PostActions from '../post-actions';
import usePageTypeBadge from '../../utils/pageTypeBadge';
+import { getTemplateInfo } from '../../utils/get-template-info';
export default function PostCardPanel( {
postType,
@@ -30,17 +31,29 @@ export default function PostCardPanel( {
} ) {
const { title, icon } = useSelect(
( select ) => {
- const { __experimentalGetTemplateInfo } = select( editorStore );
const { getEditedEntityRecord } = select( coreStore );
const _record = getEditedEntityRecord(
'postType',
postType,
postId
);
- const _templateInfo =
- [ TEMPLATE_POST_TYPE, TEMPLATE_PART_POST_TYPE ].includes(
- postType
- ) && __experimentalGetTemplateInfo( _record );
+
+ const { default_template_types: templateTypes = [] } =
+ select( coreStore ).getEntityRecord(
+ 'root',
+ '__unstableBase'
+ ) ?? {};
+
+ const _templateInfo = [
+ TEMPLATE_POST_TYPE,
+ TEMPLATE_PART_POST_TYPE,
+ ].includes( postType )
+ ? getTemplateInfo( {
+ template: _record,
+ templateTypes,
+ } )
+ : {};
+
return {
title: _templateInfo?.title || _record?.title,
icon: unlock( select( editorStore ) ).getPostIcon( postType, {
diff --git a/packages/editor/src/components/preferences-modal/block-visibility.js b/packages/editor/src/components/preferences-modal/block-visibility.js
index 49d6888c5dbfe..8726b114d9748 100644
--- a/packages/editor/src/components/preferences-modal/block-visibility.js
+++ b/packages/editor/src/components/preferences-modal/block-visibility.js
@@ -5,13 +5,15 @@ import { useSelect, useDispatch } from '@wordpress/data';
import { store as preferencesStore } from '@wordpress/preferences';
import { hasBlockSupport, store as blocksStore } from '@wordpress/blocks';
import { useMemo } from '@wordpress/element';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
/**
* Internal dependencies
*/
import { store as editorStore } from '../../store';
import { unlock } from '../../lock-unlock';
-import BlockManager from '../block-manager';
+
+const { BlockManager } = unlock( blockEditorPrivateApis );
export default function BlockVisibility() {
const { showBlockTypes, hideBlockTypes } = unlock(
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
index 996e9e6895459..68d7bd1d3f4f5 100644
--- a/packages/editor/src/components/provider/index.js
+++ b/packages/editor/src/components/provider/index.js
@@ -13,6 +13,7 @@ import {
BlockEditorProvider,
BlockContextProvider,
privateApis as blockEditorPrivateApis,
+ store as blockEditorStore,
} from '@wordpress/block-editor';
import { store as noticesStore } from '@wordpress/notices';
import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';
@@ -205,6 +206,15 @@ export const ExperimentalEditorProvider = withRegistryProvider(
},
[ post.type ]
);
+
+ const isZoomOut = useSelect( ( select ) => {
+ const { isZoomOut: _isZoomOut } = unlock(
+ select( blockEditorStore )
+ );
+
+ return _isZoomOut();
+ } );
+
const shouldRenderTemplate = !! template && mode !== 'post-only';
const rootLevelPost = shouldRenderTemplate ? template : post;
const defaultBlockContext = useMemo( () => {
@@ -357,9 +367,13 @@ export const ExperimentalEditorProvider = withRegistryProvider(
{ children }
{ ! settings.isPreviewMode && (
<>
-
-
-
+ { ! isZoomOut && (
+ <>
+
+
+
+
+ ) }
{ mode === 'template-locked' && (
) }
diff --git a/packages/editor/src/dataviews/actions/duplicate-template-part.tsx b/packages/editor/src/dataviews/actions/duplicate-template-part.tsx
index 95e7e6bb672fc..5f576ecdb5863 100644
--- a/packages/editor/src/dataviews/actions/duplicate-template-part.tsx
+++ b/packages/editor/src/dataviews/actions/duplicate-template-part.tsx
@@ -15,7 +15,7 @@ import type { Action } from '@wordpress/dataviews';
import { TEMPLATE_PART_POST_TYPE } from '../../store/constants';
import { CreateTemplatePartModalContents } from '../../components/create-template-part-modal';
import { getItemTitle } from './utils';
-import type { TemplatePart } from '../types';
+import type { Post, TemplatePart } from '../types';
const duplicateTemplatePart: Action< TemplatePart > = {
id: 'duplicate-template-part',
@@ -38,12 +38,12 @@ const duplicateTemplatePart: Action< TemplatePart > = {
);
}, [ item.content, item.blocks ] );
const { createSuccessNotice } = useDispatch( noticesStore );
- function onTemplatePartSuccess() {
+ function onTemplatePartSuccess( templatePart: Post ) {
createSuccessNotice(
sprintf(
// translators: %s: The new template part's title e.g. 'Call to action (copy)'.
_x( '"%s" duplicated.', 'template part' ),
- getItemTitle( item )
+ getItemTitle( templatePart )
),
{ type: 'snackbar', id: 'edit-site-patterns-success' }
);
diff --git a/packages/editor/src/private-apis.js b/packages/editor/src/private-apis.js
index b49b2a69a3bf2..2699858b3164f 100644
--- a/packages/editor/src/private-apis.js
+++ b/packages/editor/src/private-apis.js
@@ -25,6 +25,7 @@ import {
GlobalStylesProvider,
} from './components/global-styles-provider';
import { registerCoreBlockBindingsSources } from './bindings/api';
+import { getTemplateInfo } from './utils/get-template-info';
const { store: interfaceStore, ...remainingInterfaceApis } = interfaceApis;
@@ -46,7 +47,7 @@ lock( privateApis, {
ViewMoreMenuGroup,
ResizableEditor,
registerCoreBlockBindingsSources,
-
+ getTemplateInfo,
// This is a temporary private API while we're updating the site editor to use EditorProvider.
interfaceStore,
...remainingInterfaceApis,
diff --git a/packages/editor/src/store/private-selectors.js b/packages/editor/src/store/private-selectors.js
index 9af0512c19dbd..56fa672837148 100644
--- a/packages/editor/src/store/private-selectors.js
+++ b/packages/editor/src/store/private-selectors.js
@@ -20,11 +20,7 @@ import { store as coreStore } from '@wordpress/core-data';
/**
* Internal dependencies
*/
-import {
- getRenderingMode,
- getCurrentPost,
- __experimentalGetDefaultTemplatePartAreas,
-} from './selectors';
+import { getRenderingMode, getCurrentPost } from './selectors';
import {
getEntityActions as _getEntityActions,
getEntityFields as _getEntityFields,
@@ -102,9 +98,13 @@ export const getPostIcon = createRegistrySelector(
postType === 'wp_template'
) {
return (
- __experimentalGetDefaultTemplatePartAreas( state ).find(
- ( item ) => options.area === item.area
- )?.icon || layout
+ (
+ select( coreStore ).getEntityRecord(
+ 'root',
+ '__unstableBase'
+ )?.default_template_part_areas || []
+ ).find( ( item ) => options.area === item.area )?.icon ||
+ layout
);
}
if ( CARD_ICONS[ postType ] ) {
diff --git a/packages/editor/src/store/selectors.js b/packages/editor/src/store/selectors.js
index db452be5c17ab..a090fee0abd64 100644
--- a/packages/editor/src/store/selectors.js
+++ b/packages/editor/src/store/selectors.js
@@ -12,7 +12,6 @@ import { addQueryArgs, cleanForSlug } from '@wordpress/url';
import { createSelector, createRegistrySelector } from '@wordpress/data';
import deprecated from '@wordpress/deprecated';
import { Platform } from '@wordpress/element';
-import { layout } from '@wordpress/icons';
import { store as blockEditorStore } from '@wordpress/block-editor';
import { store as coreStore } from '@wordpress/core-data';
import { store as preferencesStore } from '@wordpress/preferences';
@@ -29,6 +28,7 @@ import {
import { getPostRawValue } from './reducer';
import { getTemplatePartIcon } from '../utils/get-template-part-icon';
import { unlock } from '../lock-unlock';
+import { getTemplateInfo } from '../utils/get-template-info';
/**
* Shared reference to an empty object for cases where it is important to avoid
@@ -1702,16 +1702,20 @@ export const getBlockListSettings = getBlockEditorSelector(
'getBlockListSettings'
);
-/**
- * Returns the default template types.
- *
- * @param {Object} state Global application state.
- *
- * @return {Object} The template types.
- */
-export function __experimentalGetDefaultTemplateTypes( state ) {
- return getEditorSettings( state )?.defaultTemplateTypes;
-}
+export const __experimentalGetDefaultTemplateTypes = createRegistrySelector(
+ ( select ) => () => {
+ deprecated(
+ "select('core/editor').__experimentalGetDefaultTemplateTypes",
+ {
+ since: '6.8',
+ alternative:
+ "select('core/core-data').getEntityRecord( 'root', '__unstableBase' )?.default_template_types",
+ }
+ );
+ return select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_types;
+ }
+);
/**
* Returns the default template part areas.
@@ -1720,15 +1724,26 @@ export function __experimentalGetDefaultTemplateTypes( state ) {
*
* @return {Array} The template part areas.
*/
-export const __experimentalGetDefaultTemplatePartAreas = createSelector(
- ( state ) => {
- const areas =
- getEditorSettings( state )?.defaultTemplatePartAreas ?? [];
- return areas.map( ( item ) => {
- return { ...item, icon: getTemplatePartIcon( item.icon ) };
- } );
- },
- ( state ) => [ getEditorSettings( state )?.defaultTemplatePartAreas ]
+export const __experimentalGetDefaultTemplatePartAreas = createRegistrySelector(
+ ( select ) =>
+ createSelector( () => {
+ deprecated(
+ "select('core/editor').__experimentalGetDefaultTemplatePartAreas",
+ {
+ since: '6.8',
+ alternative:
+ "select('core/core-data').getEntityRecord( 'root', '__unstableBase' )?.default_template_part_areas",
+ }
+ );
+
+ const areas =
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_part_areas || [];
+
+ return areas.map( ( item ) => {
+ return { ...item, icon: getTemplatePartIcon( item.icon ) };
+ } );
+ } )
);
/**
@@ -1739,20 +1754,30 @@ export const __experimentalGetDefaultTemplatePartAreas = createSelector(
*
* @return {Object} The template type.
*/
-export const __experimentalGetDefaultTemplateType = createSelector(
- ( state, slug ) => {
- const templateTypes = __experimentalGetDefaultTemplateTypes( state );
- if ( ! templateTypes ) {
- return EMPTY_OBJECT;
- }
+export const __experimentalGetDefaultTemplateType = createRegistrySelector(
+ ( select ) =>
+ createSelector( ( state, slug ) => {
+ deprecated(
+ "select('core/editor').__experimentalGetDefaultTemplateType",
+ {
+ since: '6.8',
+ }
+ );
+ const templateTypes = select( coreStore ).getEntityRecord(
+ 'root',
+ '__unstableBase'
+ )?.default_template_types;
+
+ if ( ! templateTypes ) {
+ return EMPTY_OBJECT;
+ }
- return (
- Object.values( templateTypes ).find(
- ( type ) => type.slug === slug
- ) ?? EMPTY_OBJECT
- );
- },
- ( state ) => [ __experimentalGetDefaultTemplateTypes( state ) ]
+ return (
+ Object.values( templateTypes ).find(
+ ( type ) => type.slug === slug
+ ) ?? EMPTY_OBJECT
+ );
+ } )
);
/**
@@ -1763,38 +1788,31 @@ export const __experimentalGetDefaultTemplateType = createSelector(
* @param {Object} template The template for which we need information.
* @return {Object} Information about the template, including title, description, and icon.
*/
-export const __experimentalGetTemplateInfo = createSelector(
- ( state, template ) => {
- if ( ! template ) {
- return EMPTY_OBJECT;
- }
+export const __experimentalGetTemplateInfo = createRegistrySelector(
+ ( select ) =>
+ createSelector( ( state, template ) => {
+ deprecated( "select('core/editor').__experimentalGetTemplateInfo", {
+ since: '6.8',
+ } );
- const { description, slug, title, area } = template;
- const { title: defaultTitle, description: defaultDescription } =
- __experimentalGetDefaultTemplateType( state, slug );
+ if ( ! template ) {
+ return EMPTY_OBJECT;
+ }
- const templateTitle =
- typeof title === 'string' ? title : title?.rendered;
- const templateDescription =
- typeof description === 'string' ? description : description?.raw;
- const templateIcon =
- __experimentalGetDefaultTemplatePartAreas( state ).find(
- ( item ) => area === item.area
- )?.icon || layout;
+ const templateTypes =
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_types || [];
- return {
- title:
- templateTitle && templateTitle !== slug
- ? templateTitle
- : defaultTitle || slug,
- description: templateDescription || defaultDescription,
- icon: templateIcon,
- };
- },
- ( state ) => [
- __experimentalGetDefaultTemplateTypes( state ),
- __experimentalGetDefaultTemplatePartAreas( state ),
- ]
+ const templateAreas =
+ select( coreStore ).getEntityRecord( 'root', '__unstableBase' )
+ ?.default_template_part_areas || [];
+
+ return getTemplateInfo( {
+ template,
+ templateAreas,
+ templateTypes,
+ } );
+ } )
);
/**
diff --git a/packages/editor/src/store/test/selectors.js b/packages/editor/src/store/test/selectors.js
index 1de25604ebd7e..2a36fabcd2ec9 100644
--- a/packages/editor/src/store/test/selectors.js
+++ b/packages/editor/src/store/test/selectors.js
@@ -16,7 +16,6 @@ import {
getBlockTypes,
} from '@wordpress/blocks';
import { RawHTML } from '@wordpress/element';
-import { layout, footer, header } from '@wordpress/icons';
/**
* Internal dependencies
@@ -188,43 +187,11 @@ const {
isPostAutosavingLocked,
canUserUseUnfilteredHTML,
getPostTypeLabel,
- __experimentalGetDefaultTemplateType,
- __experimentalGetDefaultTemplateTypes,
- __experimentalGetTemplateInfo,
- __experimentalGetDefaultTemplatePartAreas,
isEditorPanelRemoved,
isInserterOpened,
isListViewOpened,
} = selectors;
-const defaultTemplateTypes = [
- {
- title: 'Default (Index)',
- description: 'Main template',
- slug: 'index',
- },
- {
- title: '404 (Not Found)',
- description: 'Applied when content cannot be found',
- slug: '404',
- },
-];
-
-const defaultTemplatePartAreas = [
- {
- area: 'header',
- label: 'Header',
- description: 'Some description of a header',
- icon: 'header',
- },
- {
- area: 'footer',
- label: 'Footer',
- description: 'Some description of a footer',
- icon: 'footer',
- },
-];
-
describe( 'selectors', () => {
let cachedSelectors;
@@ -2766,228 +2733,6 @@ describe( 'selectors', () => {
} );
} );
- describe( '__experimentalGetDefaultTemplateTypes', () => {
- const state = { editorSettings: { defaultTemplateTypes } };
-
- it( 'returns undefined if there are no default template types', () => {
- const emptyState = { editorSettings: {} };
- expect(
- __experimentalGetDefaultTemplateTypes( emptyState )
- ).toBeUndefined();
- } );
-
- it( 'returns a list of default template types if present in state', () => {
- expect(
- __experimentalGetDefaultTemplateTypes( state )
- ).toHaveLength( 2 );
- } );
- } );
-
- describe( '__experimentalGetDefaultTemplatePartAreas', () => {
- const state = { editorSettings: { defaultTemplatePartAreas } };
-
- it( 'returns empty array if there are no default template part areas', () => {
- const emptyState = { editorSettings: {} };
- expect(
- __experimentalGetDefaultTemplatePartAreas( emptyState )
- ).toHaveLength( 0 );
- } );
-
- it( 'returns a list of default template part areas if present in state', () => {
- expect(
- __experimentalGetDefaultTemplatePartAreas( state )
- ).toHaveLength( 2 );
- } );
-
- it( 'assigns an icon to each area', () => {
- const templatePartAreas =
- __experimentalGetDefaultTemplatePartAreas( state );
- templatePartAreas.forEach( ( area ) =>
- expect( area.icon ).not.toBeNull()
- );
- } );
- } );
-
- describe( '__experimentalGetDefaultTemplateType', () => {
- const state = { editorSettings: { defaultTemplateTypes } };
-
- it( 'returns an empty object if there are no default template types', () => {
- const emptyState = { editorSettings: {} };
- expect(
- __experimentalGetDefaultTemplateType( emptyState, 'slug' )
- ).toEqual( {} );
- } );
-
- it( 'returns an empty object if the requested slug is not found', () => {
- expect(
- __experimentalGetDefaultTemplateType( state, 'foobar' )
- ).toEqual( {} );
- } );
-
- it( 'returns the requested default template type', () => {
- expect(
- __experimentalGetDefaultTemplateType( state, 'index' )
- ).toEqual( {
- title: 'Default (Index)',
- description: 'Main template',
- slug: 'index',
- } );
- } );
-
- it( 'returns the requested default template type even when the slug is numeric', () => {
- expect(
- __experimentalGetDefaultTemplateType( state, '404' )
- ).toEqual( {
- title: '404 (Not Found)',
- description: 'Applied when content cannot be found',
- slug: '404',
- } );
- } );
- } );
-
- describe( '__experimentalGetTemplateInfo', () => {
- const state = {
- editorSettings: { defaultTemplateTypes, defaultTemplatePartAreas },
- };
-
- it( 'should return an empty object if no template is passed', () => {
- expect( __experimentalGetTemplateInfo( state, null ) ).toEqual(
- {}
- );
- expect( __experimentalGetTemplateInfo( state, undefined ) ).toEqual(
- {}
- );
- expect( __experimentalGetTemplateInfo( state, false ) ).toEqual(
- {}
- );
- } );
-
- it( 'should return the default title if none is defined on the template', () => {
- expect(
- __experimentalGetTemplateInfo( state, { slug: 'index' } ).title
- ).toEqual( 'Default (Index)' );
- } );
-
- it( 'should return the rendered title if defined on the template', () => {
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'index',
- title: { rendered: 'test title' },
- } ).title
- ).toEqual( 'test title' );
- } );
-
- it( 'should return the slug if no title is found', () => {
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'not a real template',
- } ).title
- ).toEqual( 'not a real template' );
- } );
-
- it( 'should return the default description if none is defined on the template', () => {
- expect(
- __experimentalGetTemplateInfo( state, { slug: 'index' } )
- .description
- ).toEqual( 'Main template' );
- } );
-
- it( 'should return the raw excerpt as description if defined on the template', () => {
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'index',
- description: { raw: 'test description' },
- } ).description
- ).toEqual( 'test description' );
- } );
-
- it( 'should return a title, description, and icon', () => {
- expect(
- __experimentalGetTemplateInfo( state, { slug: 'index' } )
- ).toEqual( {
- title: 'Default (Index)',
- description: 'Main template',
- icon: layout,
- } );
-
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'index',
- title: { rendered: 'test title' },
- } )
- ).toEqual( {
- title: 'test title',
- description: 'Main template',
- icon: layout,
- } );
-
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'index',
- description: { raw: 'test description' },
- } )
- ).toEqual( {
- title: 'Default (Index)',
- description: 'test description',
- icon: layout,
- } );
-
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'index',
- title: { rendered: 'test title' },
- description: { raw: 'test description' },
- } )
- ).toEqual( {
- title: 'test title',
- description: 'test description',
- icon: layout,
- } );
- } );
-
- it( 'should return correct icon based on area', () => {
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'template part, area = uncategorized',
- area: 'uncategorized',
- } )
- ).toEqual( {
- title: 'template part, area = uncategorized',
- icon: layout,
- } );
-
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'template part, area = invalid',
- area: 'invalid',
- } )
- ).toEqual( {
- title: 'template part, area = invalid',
- icon: layout,
- } );
-
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'template part, area = header',
- area: 'header',
- } )
- ).toEqual( {
- title: 'template part, area = header',
- icon: header,
- } );
-
- expect(
- __experimentalGetTemplateInfo( state, {
- slug: 'template part, area = footer',
- area: 'footer',
- } )
- ).toEqual( {
- title: 'template part, area = footer',
- icon: footer,
- } );
- } );
- } );
-
describe( 'getPostTypeLabel', () => {
it( 'should return the correct label for the current post type', () => {
const postTypes = [
diff --git a/packages/editor/src/style.scss b/packages/editor/src/style.scss
index b62ccd2c8ac71..88d722867d009 100644
--- a/packages/editor/src/style.scss
+++ b/packages/editor/src/style.scss
@@ -1,7 +1,6 @@
@import "../../interface/src/style.scss";
@import "./components/autocompleters/style.scss";
-@import "./components/block-manager/style.scss";
@import "./components/collab-sidebar/style.scss";
@import "./components/collapsible-block-toolbar/style.scss";
@import "./components/create-template-part-modal/style.scss";
diff --git a/packages/editor/src/utils/get-template-info.js b/packages/editor/src/utils/get-template-info.js
new file mode 100644
index 0000000000000..bc84c06c9399d
--- /dev/null
+++ b/packages/editor/src/utils/get-template-info.js
@@ -0,0 +1,52 @@
+/**
+ * WordPress dependencies
+ */
+import { layout } from '@wordpress/icons';
+/**
+ * Internal dependencies
+ */
+import { getTemplatePartIcon } from './get-template-part-icon';
+const EMPTY_OBJECT = {};
+
+/**
+ * Helper function to retrieve the corresponding template info for a given template.
+ * @param {Object} params
+ * @param {Array} params.templateTypes
+ * @param {Array} [params.templateAreas]
+ * @param {Object} params.template
+ */
+export const getTemplateInfo = ( params ) => {
+ if ( ! params ) {
+ return EMPTY_OBJECT;
+ }
+
+ const { templateTypes, templateAreas, template } = params;
+
+ const { description, slug, title, area } = template;
+
+ const { title: defaultTitle, description: defaultDescription } =
+ Object.values( templateTypes ).find( ( type ) => type.slug === slug ) ??
+ EMPTY_OBJECT;
+
+ const templateTitle = typeof title === 'string' ? title : title?.rendered;
+ const templateDescription =
+ typeof description === 'string' ? description : description?.raw;
+
+ const templateAreasWithIcon = templateAreas?.map( ( item ) => ( {
+ ...item,
+ icon: getTemplatePartIcon( item.icon ),
+ } ) );
+
+ const templateIcon =
+ templateAreasWithIcon?.find( ( item ) => area === item.area )?.icon ||
+ layout;
+
+ return {
+ title:
+ templateTitle && templateTitle !== slug
+ ? templateTitle
+ : defaultTitle || slug,
+ description: templateDescription || defaultDescription,
+ icon: templateIcon,
+ };
+};
diff --git a/packages/editor/src/utils/test/get-template-info.js b/packages/editor/src/utils/test/get-template-info.js
new file mode 100644
index 0000000000000..d0ffe15aa902a
--- /dev/null
+++ b/packages/editor/src/utils/test/get-template-info.js
@@ -0,0 +1,224 @@
+/**
+ * WordPress dependencies
+ */
+import { footer, header, layout } from '@wordpress/icons';
+/**
+ * Internal dependencies
+ */
+import { getTemplateInfo } from '../get-template-info';
+
+describe( '__experimentalGetTemplateInfo', () => {
+ const defaultTemplateTypes = [
+ {
+ title: 'Default (Index)',
+ description: 'Main template',
+ slug: 'index',
+ },
+ {
+ title: '404 (Not Found)',
+ description: 'Applied when content cannot be found',
+ slug: '404',
+ },
+ ];
+
+ const defaultTemplatePartAreas = [
+ {
+ area: 'header',
+ label: 'Header',
+ description: 'Some description of a header',
+ icon: 'header',
+ },
+ {
+ area: 'footer',
+ label: 'Footer',
+ description: 'Some description of a footer',
+ icon: 'footer',
+ },
+ ];
+
+ it( 'should return an empty object if no template is passed', () => {
+ expect( getTemplateInfo( undefined ) ).toEqual( {} );
+ expect( getTemplateInfo( null ) ).toEqual( {} );
+ expect( getTemplateInfo( false ) ).toEqual( {} );
+ } );
+
+ it( 'should return the default title if none is defined on the template', () => {
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'index',
+ },
+ } ).title
+ ).toEqual( 'Default (Index)' );
+ } );
+
+ it( 'should return the rendered title if defined on the template', () => {
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'index',
+ title: { rendered: 'test title' },
+ },
+ } ).title
+ ).toEqual( 'test title' );
+ } );
+
+ it( 'should return the slug if no title is found', () => {
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'not a real template',
+ },
+ } ).title
+ ).toEqual( 'not a real template' );
+ } );
+
+ it( 'should return the default description if none is defined on the template', () => {
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'index',
+ },
+ } ).description
+ ).toEqual( 'Main template' );
+ } );
+
+ it( 'should return the raw excerpt as description if defined on the template', () => {
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'index',
+ description: { raw: 'test description' },
+ },
+ } ).description
+ ).toEqual( 'test description' );
+ } );
+
+ it( 'should return a title, description, and icon', () => {
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: { slug: 'index' },
+ } )
+ ).toEqual( {
+ title: 'Default (Index)',
+ description: 'Main template',
+ icon: layout,
+ } );
+
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'index',
+ title: { rendered: 'test title' },
+ },
+ } )
+ ).toEqual( {
+ title: 'test title',
+ description: 'Main template',
+ icon: layout,
+ } );
+
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'index',
+ description: { raw: 'test description' },
+ },
+ } )
+ ).toEqual( {
+ title: 'Default (Index)',
+ description: 'test description',
+ icon: layout,
+ } );
+
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'index',
+ title: { rendered: 'test title' },
+ description: { raw: 'test description' },
+ },
+ } )
+ ).toEqual( {
+ title: 'test title',
+ description: 'test description',
+ icon: layout,
+ } );
+ } );
+
+ it( 'should return correct icon based on area', () => {
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'template part, area = uncategorized',
+ area: 'uncategorized',
+ },
+ } )
+ ).toEqual( {
+ title: 'template part, area = uncategorized',
+ icon: layout,
+ } );
+
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'template part, area = invalid',
+ area: 'invalid',
+ },
+ } )
+ ).toEqual( {
+ title: 'template part, area = invalid',
+ icon: layout,
+ } );
+
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'template part, area = header',
+ area: 'header',
+ },
+ } )
+ ).toEqual( {
+ title: 'template part, area = header',
+ icon: header,
+ } );
+
+ expect(
+ getTemplateInfo( {
+ templateAreas: defaultTemplatePartAreas,
+ templateTypes: defaultTemplateTypes,
+ template: {
+ slug: 'template part, area = footer',
+ area: 'footer',
+ },
+ } )
+ ).toEqual( {
+ title: 'template part, area = footer',
+ icon: footer,
+ } );
+ } );
+} );
diff --git a/packages/element/CHANGELOG.md b/packages/element/CHANGELOG.md
index 00eccb7e5ec53..50fc6e21756b9 100644
--- a/packages/element/CHANGELOG.md
+++ b/packages/element/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 6.13.0 (2024-11-27)
+
## 6.12.0 (2024-11-16)
## 6.11.0 (2024-10-30)
diff --git a/packages/element/package.json b/packages/element/package.json
index 6a4ede84b1062..770d87ef02174 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/element",
- "version": "6.12.0",
+ "version": "6.13.0",
"description": "Element React module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/env/CHANGELOG.md b/packages/env/CHANGELOG.md
index 181adb034b6b1..651d6b285e1bd 100644
--- a/packages/env/CHANGELOG.md
+++ b/packages/env/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 10.13.0 (2024-11-27)
+
## 10.12.0 (2024-11-16)
## 10.11.0 (2024-10-30)
diff --git a/packages/env/package.json b/packages/env/package.json
index d1c3b192baf89..a0cf44e99fb2f 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/env",
- "version": "10.12.0",
+ "version": "10.13.0",
"description": "A zero-config, self contained local WordPress environment for development and testing.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/escape-html/CHANGELOG.md b/packages/escape-html/CHANGELOG.md
index 40ad50dc4997d..d1eff0c72fed5 100644
--- a/packages/escape-html/CHANGELOG.md
+++ b/packages/escape-html/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 3.13.0 (2024-11-27)
+
## 3.12.0 (2024-11-16)
## 3.11.0 (2024-10-30)
diff --git a/packages/escape-html/package.json b/packages/escape-html/package.json
index 688c10e638a96..12e9ae354defa 100644
--- a/packages/escape-html/package.json
+++ b/packages/escape-html/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/escape-html",
- "version": "3.12.0",
+ "version": "3.13.0",
"description": "Escape HTML utils.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
index 75a8828629b85..91b517249b597 100644
--- a/packages/eslint-plugin/CHANGELOG.md
+++ b/packages/eslint-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 21.6.0 (2024-11-27)
+
## 21.5.0 (2024-11-16)
## 21.4.0 (2024-10-30)
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 0e8880f094123..64c0a422873d6 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/eslint-plugin",
- "version": "21.5.0",
+ "version": "21.6.0",
"description": "ESLint plugin for WordPress development.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/fields/CHANGELOG.md b/packages/fields/CHANGELOG.md
index a2eba51228fbd..c567ae42058bf 100644
--- a/packages/fields/CHANGELOG.md
+++ b/packages/fields/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 0.5.0 (2024-11-27)
+
## 0.4.0 (2024-11-16)
## 0.3.0 (2024-10-30)
diff --git a/packages/fields/package.json b/packages/fields/package.json
index 8c9509b06c588..eb60f448fc13e 100644
--- a/packages/fields/package.json
+++ b/packages/fields/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/fields",
- "version": "0.4.0",
+ "version": "0.5.0",
"description": "DataViews is a component that provides an API to render datasets using different types of layouts (table, grid, list, etc.).",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/fields/src/fields/featured-image/style.scss b/packages/fields/src/fields/featured-image/style.scss
index 46d37960199ea..918f69172f302 100644
--- a/packages/fields/src/fields/featured-image/style.scss
+++ b/packages/fields/src/fields/featured-image/style.scss
@@ -83,13 +83,10 @@ fieldset.fields-controls__featured-image {
}
.dataviews-view-table__cell-content-wrapper {
- .fields-controls__featured-image-image {
- width: 32px;
- height: 32px;
- }
-
+ .fields-controls__featured-image-image,
.fields-controls__featured-image-placeholder {
width: 32px;
height: 32px;
+ display: block;
}
}
diff --git a/packages/format-library/CHANGELOG.md b/packages/format-library/CHANGELOG.md
index 257b13656210b..99c174ca029c6 100644
--- a/packages/format-library/CHANGELOG.md
+++ b/packages/format-library/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
index ee1dd8efd1fe9..94efb550519dd 100644
--- a/packages/format-library/package.json
+++ b/packages/format-library/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/format-library",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "Format library for the WordPress editor.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md
index be3f8c7cf6b41..be18dab3225a2 100644
--- a/packages/hooks/CHANGELOG.md
+++ b/packages/hooks/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 0bfc0700070e2..c9e652d30d83e 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/hooks",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "WordPress hooks library.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/html-entities/CHANGELOG.md b/packages/html-entities/CHANGELOG.md
index bcba1ced9d91c..98b3b3c483325 100644
--- a/packages/html-entities/CHANGELOG.md
+++ b/packages/html-entities/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/html-entities/package.json b/packages/html-entities/package.json
index f8f88b883be14..f99b2ca99e5fb 100644
--- a/packages/html-entities/package.json
+++ b/packages/html-entities/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/html-entities",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "HTML entity utilities for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index fd5f8e1003e32..b1d94cde634c0 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index ed4b25aa0fb8f..71f6ea646a93a 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/i18n",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "WordPress internationalization (i18n) library.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md
index 484b26e96c90d..84263e1135ac4 100644
--- a/packages/icons/CHANGELOG.md
+++ b/packages/icons/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 10.13.0 (2024-11-27)
+
## 10.12.0 (2024-11-16)
## 10.11.0 (2024-10-30)
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 40ddb309066e2..fb00a4b8d27e8 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/icons",
- "version": "10.12.0",
+ "version": "10.13.0",
"description": "WordPress Icons package, based on dashicon.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity-router/CHANGELOG.md b/packages/interactivity-router/CHANGELOG.md
index ed23e6c73dea4..b79850dc7fe54 100644
--- a/packages/interactivity-router/CHANGELOG.md
+++ b/packages/interactivity-router/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 2.13.0 (2024-11-27)
+
## 2.12.0 (2024-11-16)
## 2.11.0 (2024-10-30)
diff --git a/packages/interactivity-router/package.json b/packages/interactivity-router/package.json
index d750edb2cd9c2..30881e554e93f 100644
--- a/packages/interactivity-router/package.json
+++ b/packages/interactivity-router/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/interactivity-router",
- "version": "2.12.0",
+ "version": "2.13.0",
"description": "Package that exposes state and actions from the `core/router` store, part of the Interactivity API.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 8167177b663d4..587d14440d811 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 6.13.0 (2024-11-27)
+
## 6.12.0 (2024-11-16)
### Bug Fixes
diff --git a/packages/interactivity/package.json b/packages/interactivity/package.json
index e82d74c573530..90356de25b646 100644
--- a/packages/interactivity/package.json
+++ b/packages/interactivity/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/interactivity",
- "version": "6.12.0",
+ "version": "6.13.0",
"description": "Package that provides a standard and simple way to handle the frontend interactivity of Gutenberg blocks.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/interface/CHANGELOG.md b/packages/interface/CHANGELOG.md
index aa1f96414d46b..56b0107525733 100644
--- a/packages/interface/CHANGELOG.md
+++ b/packages/interface/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 8.2.0 (2024-11-27)
+
## 8.1.0 (2024-11-16)
## 8.0.0 (2024-10-30)
diff --git a/packages/interface/package.json b/packages/interface/package.json
index 6d286e2e259e9..2f3ada022dabe 100644
--- a/packages/interface/package.json
+++ b/packages/interface/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/interface",
- "version": "8.1.0",
+ "version": "8.2.0",
"description": "Interface module for WordPress. The package contains shared functionality across the modern JavaScript-based WordPress screens.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/is-shallow-equal/CHANGELOG.md b/packages/is-shallow-equal/CHANGELOG.md
index ea56df508bdbd..6308dd484c728 100644
--- a/packages/is-shallow-equal/CHANGELOG.md
+++ b/packages/is-shallow-equal/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/is-shallow-equal/package.json b/packages/is-shallow-equal/package.json
index 5bc028c2f5890..bc987f67aca88 100644
--- a/packages/is-shallow-equal/package.json
+++ b/packages/is-shallow-equal/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/is-shallow-equal",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "Test for shallow equality between two objects or arrays.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/jest-console/CHANGELOG.md b/packages/jest-console/CHANGELOG.md
index 777d4271418b9..67f41af5c7e3f 100644
--- a/packages/jest-console/CHANGELOG.md
+++ b/packages/jest-console/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 8.13.0 (2024-11-27)
+
## 8.12.0 (2024-11-16)
## 8.11.0 (2024-10-30)
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
index f0c6cdea73f46..638ce7fa52323 100644
--- a/packages/jest-console/package.json
+++ b/packages/jest-console/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/jest-console",
- "version": "8.12.0",
+ "version": "8.13.0",
"description": "Custom Jest matchers for the Console object.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/jest-preset-default/CHANGELOG.md b/packages/jest-preset-default/CHANGELOG.md
index a5b7d79336636..d98552ff45f71 100644
--- a/packages/jest-preset-default/CHANGELOG.md
+++ b/packages/jest-preset-default/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 12.13.0 (2024-11-27)
+
## 12.12.0 (2024-11-16)
## 12.11.0 (2024-10-30)
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index 4050f4fce430f..659c0b7822151 100644
--- a/packages/jest-preset-default/package.json
+++ b/packages/jest-preset-default/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/jest-preset-default",
- "version": "12.12.0",
+ "version": "12.13.0",
"description": "Default Jest preset for WordPress development.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/jest-puppeteer-axe/CHANGELOG.md b/packages/jest-puppeteer-axe/CHANGELOG.md
index c0459e401925c..d54c3a57804f0 100644
--- a/packages/jest-puppeteer-axe/CHANGELOG.md
+++ b/packages/jest-puppeteer-axe/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 7.13.0 (2024-11-27)
+
## 7.12.0 (2024-11-16)
## 7.11.0 (2024-10-30)
diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
index 928f427348e69..c94e1ba4defbd 100644
--- a/packages/jest-puppeteer-axe/package.json
+++ b/packages/jest-puppeteer-axe/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/jest-puppeteer-axe",
- "version": "7.12.0",
+ "version": "7.13.0",
"description": "Axe API integration with Jest and Puppeteer.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/keyboard-shortcuts/CHANGELOG.md b/packages/keyboard-shortcuts/CHANGELOG.md
index cbc9dc62deeb5..67daf5426b327 100644
--- a/packages/keyboard-shortcuts/CHANGELOG.md
+++ b/packages/keyboard-shortcuts/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/keyboard-shortcuts/package.json b/packages/keyboard-shortcuts/package.json
index a98a64cb43325..8510d99a6f8d1 100644
--- a/packages/keyboard-shortcuts/package.json
+++ b/packages/keyboard-shortcuts/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/keyboard-shortcuts",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "Handling keyboard shortcuts.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/keycodes/CHANGELOG.md b/packages/keycodes/CHANGELOG.md
index d3b43c523ee8a..46ce387d6d058 100644
--- a/packages/keycodes/CHANGELOG.md
+++ b/packages/keycodes/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/keycodes/package.json b/packages/keycodes/package.json
index c4720262af6bb..cc261f4eecf66 100644
--- a/packages/keycodes/package.json
+++ b/packages/keycodes/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/keycodes",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "Keycodes utilities for WordPress. Used to check for keyboard events across browsers/operating systems.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/lazy-import/CHANGELOG.md b/packages/lazy-import/CHANGELOG.md
index 96e04c125b974..d5cff8b39af07 100644
--- a/packages/lazy-import/CHANGELOG.md
+++ b/packages/lazy-import/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 2.13.0 (2024-11-27)
+
## 2.12.0 (2024-11-16)
## 2.11.0 (2024-10-30)
diff --git a/packages/lazy-import/package.json b/packages/lazy-import/package.json
index e6b989891b351..f7bf8c7b0d3f3 100644
--- a/packages/lazy-import/package.json
+++ b/packages/lazy-import/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/lazy-import",
- "version": "2.12.0",
+ "version": "2.13.0",
"description": "Lazily import a module, installing it automatically if missing.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/list-reusable-blocks/CHANGELOG.md b/packages/list-reusable-blocks/CHANGELOG.md
index cee7a2eb5a867..59b8fa9500fde 100644
--- a/packages/list-reusable-blocks/CHANGELOG.md
+++ b/packages/list-reusable-blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/list-reusable-blocks/package.json b/packages/list-reusable-blocks/package.json
index 6db0f8d1da903..31fd970e2d8da 100644
--- a/packages/list-reusable-blocks/package.json
+++ b/packages/list-reusable-blocks/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/list-reusable-blocks",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "Adding Export/Import support to the reusable blocks listing.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/media-utils/CHANGELOG.md b/packages/media-utils/CHANGELOG.md
index c4dd4f860c469..2cfcbaa4b2e8b 100644
--- a/packages/media-utils/CHANGELOG.md
+++ b/packages/media-utils/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/media-utils/package.json b/packages/media-utils/package.json
index d0b05f580d45c..3a2713eed4dac 100644
--- a/packages/media-utils/package.json
+++ b/packages/media-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/media-utils",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "WordPress Media Upload Utils.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/notices/CHANGELOG.md b/packages/notices/CHANGELOG.md
index f721b22243aa8..68c4ef7f85ab5 100644
--- a/packages/notices/CHANGELOG.md
+++ b/packages/notices/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/notices/package.json b/packages/notices/package.json
index 2f0369dede9bb..7f0e0dc71532c 100644
--- a/packages/notices/package.json
+++ b/packages/notices/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/notices",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "State management for notices.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/npm-package-json-lint-config/CHANGELOG.md b/packages/npm-package-json-lint-config/CHANGELOG.md
index c9addbd4214c6..132f6ffccdd23 100644
--- a/packages/npm-package-json-lint-config/CHANGELOG.md
+++ b/packages/npm-package-json-lint-config/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
### Enhancement
diff --git a/packages/npm-package-json-lint-config/package.json b/packages/npm-package-json-lint-config/package.json
index 680a30bb096c9..4dda73b91d2ed 100644
--- a/packages/npm-package-json-lint-config/package.json
+++ b/packages/npm-package-json-lint-config/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/npm-package-json-lint-config",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "WordPress npm-package-json-lint shareable configuration.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/nux/CHANGELOG.md b/packages/nux/CHANGELOG.md
index 91a372a1efd20..ddf1f9091471d 100644
--- a/packages/nux/CHANGELOG.md
+++ b/packages/nux/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 9.13.0 (2024-11-27)
+
## 9.12.0 (2024-11-16)
## 9.11.0 (2024-10-30)
diff --git a/packages/nux/package.json b/packages/nux/package.json
index 836f1de781413..13a803af1ad44 100644
--- a/packages/nux/package.json
+++ b/packages/nux/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/nux",
- "version": "9.12.0",
+ "version": "9.13.0",
"description": "NUX (New User eXperience) module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/patterns/CHANGELOG.md b/packages/patterns/CHANGELOG.md
index c953ffc1b4d4c..975065d0f2b42 100644
--- a/packages/patterns/CHANGELOG.md
+++ b/packages/patterns/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 2.13.0 (2024-11-27)
+
## 2.12.0 (2024-11-16)
## 2.11.0 (2024-10-30)
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index a556a4641f6bc..b0c6e81f1e249 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/patterns",
- "version": "2.12.0",
+ "version": "2.13.0",
"description": "Management of user pattern editing.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md
index 34004f6295a36..fc9199892ade1 100644
--- a/packages/plugins/CHANGELOG.md
+++ b/packages/plugins/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 7.13.0 (2024-11-27)
+
## 7.12.0 (2024-11-16)
## 7.11.0 (2024-10-30)
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index 9bb45aea98108..97c0ac6425990 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/plugins",
- "version": "7.12.0",
+ "version": "7.13.0",
"description": "Plugins module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-plugins-preset/CHANGELOG.md b/packages/postcss-plugins-preset/CHANGELOG.md
index 459193675cced..e271d53cdc73f 100644
--- a/packages/postcss-plugins-preset/CHANGELOG.md
+++ b/packages/postcss-plugins-preset/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/postcss-plugins-preset/package.json b/packages/postcss-plugins-preset/package.json
index 0627cb489fca7..98c2de79108d6 100644
--- a/packages/postcss-plugins-preset/package.json
+++ b/packages/postcss-plugins-preset/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/postcss-plugins-preset",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "PostCSS sharable plugins preset for WordPress development.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-themes/CHANGELOG.md b/packages/postcss-themes/CHANGELOG.md
index 098507b753ea8..efdb8fb1aa808 100644
--- a/packages/postcss-themes/CHANGELOG.md
+++ b/packages/postcss-themes/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 6.13.0 (2024-11-27)
+
## 6.12.0 (2024-11-16)
## 6.11.0 (2024-10-30)
diff --git a/packages/postcss-themes/package.json b/packages/postcss-themes/package.json
index e1b632925094f..c03da4d1f06a7 100644
--- a/packages/postcss-themes/package.json
+++ b/packages/postcss-themes/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/postcss-themes",
- "version": "6.12.0",
+ "version": "6.13.0",
"description": "PostCSS plugin to generate theme colors.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/preferences-persistence/CHANGELOG.md b/packages/preferences-persistence/CHANGELOG.md
index a2b8376a82735..3f75a6bbf49c7 100644
--- a/packages/preferences-persistence/CHANGELOG.md
+++ b/packages/preferences-persistence/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 2.13.0 (2024-11-27)
+
## 2.12.0 (2024-11-16)
## 2.11.0 (2024-10-30)
diff --git a/packages/preferences-persistence/package.json b/packages/preferences-persistence/package.json
index 645e62c9307cb..c9343b28b3e43 100644
--- a/packages/preferences-persistence/package.json
+++ b/packages/preferences-persistence/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/preferences-persistence",
- "version": "2.12.0",
+ "version": "2.13.0",
"description": "Persistence utilities for `wordpress/preferences`.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/preferences/CHANGELOG.md b/packages/preferences/CHANGELOG.md
index 76e227f2d7004..8453a061cfdfa 100644
--- a/packages/preferences/CHANGELOG.md
+++ b/packages/preferences/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index e9f83170fe56b..9c262dff51fbf 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/preferences",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "Utilities for managing WordPress preferences.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/prettier-config/CHANGELOG.md b/packages/prettier-config/CHANGELOG.md
index da352c8d8ddaf..e15c0e2aad79f 100644
--- a/packages/prettier-config/CHANGELOG.md
+++ b/packages/prettier-config/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index 5991d84b9ee7e..45f7374e06fbf 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/prettier-config",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "WordPress Prettier shared configuration.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/primitives/CHANGELOG.md b/packages/primitives/CHANGELOG.md
index 25bc2d4e3abcb..29211c9586ede 100644
--- a/packages/primitives/CHANGELOG.md
+++ b/packages/primitives/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/primitives/package.json b/packages/primitives/package.json
index 67bc8e84bd24e..1f024a64bce46 100644
--- a/packages/primitives/package.json
+++ b/packages/primitives/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/primitives",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "WordPress cross-platform primitives.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/priority-queue/CHANGELOG.md b/packages/priority-queue/CHANGELOG.md
index dce047693d295..5427d3d5ff761 100644
--- a/packages/priority-queue/CHANGELOG.md
+++ b/packages/priority-queue/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 3.13.0 (2024-11-27)
+
## 3.12.0 (2024-11-16)
## 3.11.0 (2024-10-30)
diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json
index e5487204dd237..eb213ffe2d031 100644
--- a/packages/priority-queue/package.json
+++ b/packages/priority-queue/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/priority-queue",
- "version": "3.12.0",
+ "version": "3.13.0",
"description": "Generic browser priority queue.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/private-apis/CHANGELOG.md b/packages/private-apis/CHANGELOG.md
index 9e7c78b3d0fd1..8792e587a83f1 100644
--- a/packages/private-apis/CHANGELOG.md
+++ b/packages/private-apis/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 1.13.0 (2024-11-27)
+
## 1.12.0 (2024-11-16)
## 1.11.0 (2024-10-30)
diff --git a/packages/private-apis/package.json b/packages/private-apis/package.json
index 928eef9465d9c..1436270e2c7f4 100644
--- a/packages/private-apis/package.json
+++ b/packages/private-apis/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/private-apis",
- "version": "1.12.0",
+ "version": "1.13.0",
"description": "Internal experimental APIs for WordPress core.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/project-management-automation/CHANGELOG.md b/packages/project-management-automation/CHANGELOG.md
index d2028220f7128..b6376be2fd6e0 100644
--- a/packages/project-management-automation/CHANGELOG.md
+++ b/packages/project-management-automation/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 2.13.0 (2024-11-27)
+
## 2.12.0 (2024-11-16)
## 2.11.0 (2024-10-30)
diff --git a/packages/project-management-automation/package.json b/packages/project-management-automation/package.json
index 22638756014c6..95c475c5689c2 100644
--- a/packages/project-management-automation/package.json
+++ b/packages/project-management-automation/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/project-management-automation",
- "version": "2.12.0",
+ "version": "2.13.0",
"description": "GitHub Action that implements various automation to assist with managing the Gutenberg GitHub repository.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/react-i18n/CHANGELOG.md b/packages/react-i18n/CHANGELOG.md
index d0991cdf756b3..ed872fe9cd145 100644
--- a/packages/react-i18n/CHANGELOG.md
+++ b/packages/react-i18n/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.13.0 (2024-11-27)
+
## 4.12.0 (2024-11-16)
## 4.11.0 (2024-10-30)
diff --git a/packages/react-i18n/package.json b/packages/react-i18n/package.json
index 236cd7d63be1b..439596ec2b5d5 100644
--- a/packages/react-i18n/package.json
+++ b/packages/react-i18n/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/react-i18n",
- "version": "4.12.0",
+ "version": "4.13.0",
"description": "React bindings for @wordpress/i18n.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
index 42b12846436e2..08912695e5a8a 100644
--- a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
+++ b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 3.13.0 (2024-11-27)
+
## 3.12.0 (2024-11-16)
## 3.11.0 (2024-10-30)
diff --git a/packages/readable-js-assets-webpack-plugin/package.json b/packages/readable-js-assets-webpack-plugin/package.json
index dda4f7e0a51ff..5fa231d98088d 100644
--- a/packages/readable-js-assets-webpack-plugin/package.json
+++ b/packages/readable-js-assets-webpack-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/readable-js-assets-webpack-plugin",
- "version": "3.12.0",
+ "version": "3.13.0",
"description": "Generate a readable JS file for each JS asset.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/redux-routine/CHANGELOG.md b/packages/redux-routine/CHANGELOG.md
index e32593e39a828..afc65f590b5b6 100644
--- a/packages/redux-routine/CHANGELOG.md
+++ b/packages/redux-routine/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/redux-routine/package.json b/packages/redux-routine/package.json
index e4d3600c5db2e..4946cdf6dcaad 100644
--- a/packages/redux-routine/package.json
+++ b/packages/redux-routine/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/redux-routine",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "Redux middleware for generator coroutines.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/reusable-blocks/CHANGELOG.md b/packages/reusable-blocks/CHANGELOG.md
index e451948e16d36..83ee4e4c1add3 100644
--- a/packages/reusable-blocks/CHANGELOG.md
+++ b/packages/reusable-blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.13.0 (2024-11-27)
+
## 5.12.0 (2024-11-16)
## 5.11.0 (2024-10-30)
diff --git a/packages/reusable-blocks/package.json b/packages/reusable-blocks/package.json
index 29309d1d99c9d..b56837df1d34c 100644
--- a/packages/reusable-blocks/package.json
+++ b/packages/reusable-blocks/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/reusable-blocks",
- "version": "5.12.0",
+ "version": "5.13.0",
"description": "Reusable blocks utilities.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/rich-text/CHANGELOG.md b/packages/rich-text/CHANGELOG.md
index 904894e9553c2..2239fbd11ceed 100644
--- a/packages/rich-text/CHANGELOG.md
+++ b/packages/rich-text/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 7.13.0 (2024-11-27)
+
## 7.12.0 (2024-11-16)
## 7.11.0 (2024-10-30)
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
index 1f3fbfa26e513..99637e6023799 100644
--- a/packages/rich-text/package.json
+++ b/packages/rich-text/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/rich-text",
- "version": "7.12.0",
+ "version": "7.13.0",
"description": "Rich text value and manipulation API.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/rich-text/src/create.js b/packages/rich-text/src/create.js
index 898bdfa73b330..d683836d9e2fa 100644
--- a/packages/rich-text/src/create.js
+++ b/packages/rich-text/src/create.js
@@ -469,6 +469,34 @@ function createFromElement( { element, range, isEditableTree } ) {
continue;
}
+ if (
+ node.nodeType === node.COMMENT_NODE ||
+ ( node.nodeType === node.ELEMENT_NODE &&
+ node.tagName === 'SPAN' &&
+ node.hasAttribute( 'data-rich-text-comment' ) )
+ ) {
+ const value = {
+ formats: [ , ],
+ replacements: [
+ {
+ type: '#comment',
+ attributes: {
+ 'data-rich-text-comment':
+ node.nodeType === node.COMMENT_NODE
+ ? node.nodeValue
+ : node.getAttribute(
+ 'data-rich-text-comment'
+ ),
+ },
+ },
+ ],
+ text: OBJECT_REPLACEMENT_CHARACTER,
+ };
+ accumulateSelection( accumulator, node, range, value );
+ mergePair( accumulator, value );
+ continue;
+ }
+
if ( node.nodeType !== node.ELEMENT_NODE ) {
continue;
}
diff --git a/packages/rich-text/src/test/__snapshots__/to-dom.js.snap b/packages/rich-text/src/test/__snapshots__/to-dom.js.snap
index 0daf48aa9a1c3..0e2ac57bea370 100644
--- a/packages/rich-text/src/test/__snapshots__/to-dom.js.snap
+++ b/packages/rich-text/src/test/__snapshots__/to-dom.js.snap
@@ -272,6 +272,21 @@ exports[`recordToDom should not error with overlapping formats (2) 1`] = `