@wordpress/editor 14.43.1-next.v.202604091042.0 → 14.44.0

package/build-types/components/style-book/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/components/style-book/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAE,MAAM,EAAE,OAAO,CAAE,CAAC;IACtC,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAC1B,aAAa,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,UAAU,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AACrC,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AACxC,MAAM,MAAM,OAAO,GAAG;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7B,IAAI,EAAE,mBAAmB,CAAE,MAAM,CAAE,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IACjC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,sBAAsB,EAAE,OAAO,CAAC;IAChC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,IAAI,CAAE,WAAW,EAAE,WAAW,GAAG,UAAU,CAAE,CAAC;IACtD,QAAQ,EAAE,IAAI,CAAE,WAAW,EAAE,QAAQ,GAAG,WAAW,CAAE,CAAC;IACtD,SAAS,EAAE,IAAI,CAAE,WAAW,EAAE,QAAQ,GAAG,UAAU,CAAE,CAAC;CACtD,CAAC;AAMF,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,SAAS,CAAC;IACnB,UAAU,EAAE,MAAM,CAAE,MAAM,EAAE,OAAO,CAAE,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAE,MAAM,EAAE,OAAO,CAAE,CAAC;CACpC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/components/style-book/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAC1B,aAAa,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,UAAU,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AACrC,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AACxC,MAAM,MAAM,OAAO,GAAG;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7B,IAAI,EAAE,mBAAmB,CAAE,MAAM,CAAE,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IACjC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,sBAAsB,EAAE,OAAO,CAAC;IAChC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,IAAI,CAAE,WAAW,EAAE,WAAW,GAAG,UAAU,CAAE,CAAC;IACtD,QAAQ,EAAE,IAAI,CAAE,WAAW,EAAE,QAAQ,GAAG,WAAW,CAAE,CAAC;IACtD,SAAS,EAAE,IAAI,CAAE,WAAW,EAAE,QAAQ,GAAG,UAAU,CAAE,CAAC;CACtD,CAAC"}

package/build-types/components/sync-connection-error-modal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/sync-connection-error-modal/index.tsx"],"names":[],"mappings":"AAsCA;;;;;GAKG;AACH,wBAAgB,wBAAwB,uCAiMvC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/sync-connection-error-modal/index.tsx"],"names":[],"mappings":"AAsCA;;;;;GAKG;AACH,wBAAgB,wBAAwB,uCAgNvC"}

package/build-types/hooks/custom-sources-backwards-compatibility.d.ts

@@ -1,5 +1,5 @@
 export type WPHigherOrderComponent = import("@wordpress/compose").WPHigherOrderComponent;
-export type WPBlockSettings = any;
+export type WPBlockSettings = import("@wordpress/blocks").WPBlockSettings;
 /**
  * Object whose keys are the names of block attributes, where each value
  * represents the meta key to which the block attribute is intended to save.

package/build-types/hooks/custom-sources-backwards-compatibility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom-sources-backwards-compatibility.d.ts","sourceRoot":"","sources":["../../src/hooks/custom-sources-backwards-compatibility.js"],"names":[],"mappings":"qCAcc,OAAO,oBAAoB,EAAE,sBAAsB"}
+{"version":3,"file":"custom-sources-backwards-compatibility.d.ts","sourceRoot":"","sources":["../../src/hooks/custom-sources-backwards-compatibility.js"],"names":[],"mappings":"qCAcc,OAAO,oBAAoB,EAAE,sBAAsB;8BACnD,OAAO,mBAAmB,EAAE,eAAe"}

package/build-types/hooks/pattern-overrides.d.ts

@@ -1,2 +1,2 @@
-export type WPBlockSettings = any;
+export type WPBlockSettings = import("@wordpress/blocks").WPBlockSettings;
 //# sourceMappingURL=pattern-overrides.d.ts.map

package/build-types/hooks/pattern-overrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pattern-overrides.d.ts","sourceRoot":"","sources":["../../src/hooks/pattern-overrides.js"],"names":[],"mappings":""}
+{"version":3,"file":"pattern-overrides.d.ts","sourceRoot":"","sources":["../../src/hooks/pattern-overrides.js"],"names":[],"mappings":"8BAmBc,OAAO,mBAAmB,EAAE,eAAe"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "14.43.1-next.v.202604091042.0+668146787",
+	"version": "14.44.0",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -61,49 +61,49 @@
 	],
 	"dependencies": {
 		"@floating-ui/react-dom": "2.0.8",
-		"@wordpress/a11y": "^4.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/api-fetch": "^7.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/base-styles": "^6.19.1-next.v.202604091042.0+668146787",
-		"@wordpress/blob": "^4.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/block-editor": "^15.16.1-next.v.202604091042.0+668146787",
-		"@wordpress/block-serialization-default-parser": "^5.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/blocks": "^15.16.1-next.v.202604091042.0+668146787",
-		"@wordpress/commands": "^1.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/components": "^32.5.2-next.v.202604091042.0+668146787",
-		"@wordpress/compose": "^7.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/core-data": "^7.43.2-next.v.202604091042.0+668146787",
-		"@wordpress/data": "^10.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/dataviews": "^14.1.1-next.v.202604091042.0+668146787",
-		"@wordpress/date": "^5.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/deprecated": "^4.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/dom": "^4.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/element": "^6.44.1-next.v.202604091042.0+668146787",
-		"@wordpress/fields": "^0.35.1-next.v.202604091042.0+668146787",
-		"@wordpress/global-styles-engine": "^1.10.1-next.v.202604091042.0+668146787",
-		"@wordpress/global-styles-ui": "^1.10.1-next.v.202604091042.0+668146787",
-		"@wordpress/hooks": "^4.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/html-entities": "^4.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/i18n": "^6.17.1-next.v.202604091042.0+668146787",
-		"@wordpress/icons": "^12.1.1-next.v.202604091042.0+668146787",
-		"@wordpress/interface": "^9.28.1-next.v.202604091042.0+668146787",
-		"@wordpress/keyboard-shortcuts": "^5.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/keycodes": "^4.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/media-editor": "^0.6.1-next.v.202604091042.0+668146787",
-		"@wordpress/media-fields": "^0.8.1-next.v.202604091042.0+668146787",
-		"@wordpress/media-utils": "^5.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/notices": "^5.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/patterns": "^2.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/plugins": "^7.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/preferences": "^4.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/private-apis": "^1.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/reusable-blocks": "^5.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/rich-text": "^7.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/server-side-render": "^6.19.1-next.v.202604091042.0+668146787",
-		"@wordpress/upload-media": "^0.28.1-next.v.202604091042.0+668146787",
-		"@wordpress/url": "^4.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/views": "^1.10.1-next.v.202604091042.0+668146787",
-		"@wordpress/warning": "^3.43.1-next.v.202604091042.0+668146787",
-		"@wordpress/wordcount": "^4.43.1-next.v.202604091042.0+668146787",
+		"@wordpress/a11y": "^4.44.0",
+		"@wordpress/api-fetch": "^7.44.0",
+		"@wordpress/base-styles": "^6.20.0",
+		"@wordpress/blob": "^4.44.0",
+		"@wordpress/block-editor": "^15.17.0",
+		"@wordpress/block-serialization-default-parser": "^5.44.0",
+		"@wordpress/blocks": "^15.17.0",
+		"@wordpress/commands": "^1.44.0",
+		"@wordpress/components": "^32.6.0",
+		"@wordpress/compose": "^7.44.0",
+		"@wordpress/core-data": "^7.44.0",
+		"@wordpress/data": "^10.44.0",
+		"@wordpress/dataviews": "^14.1.0",
+		"@wordpress/date": "^5.44.0",
+		"@wordpress/deprecated": "^4.44.0",
+		"@wordpress/dom": "^4.44.0",
+		"@wordpress/element": "^6.44.0",
+		"@wordpress/fields": "^0.36.0",
+		"@wordpress/global-styles-engine": "^1.11.0",
+		"@wordpress/global-styles-ui": "^1.11.0",
+		"@wordpress/hooks": "^4.44.0",
+		"@wordpress/html-entities": "^4.44.0",
+		"@wordpress/i18n": "^6.17.0",
+		"@wordpress/icons": "^12.2.0",
+		"@wordpress/interface": "^9.29.0",
+		"@wordpress/keyboard-shortcuts": "^5.44.0",
+		"@wordpress/keycodes": "^4.44.0",
+		"@wordpress/media-editor": "^0.7.0",
+		"@wordpress/media-fields": "^0.9.0",
+		"@wordpress/media-utils": "^5.44.0",
+		"@wordpress/notices": "^5.44.0",
+		"@wordpress/patterns": "^2.44.0",
+		"@wordpress/plugins": "^7.44.0",
+		"@wordpress/preferences": "^4.44.0",
+		"@wordpress/private-apis": "^1.44.0",
+		"@wordpress/reusable-blocks": "^5.44.0",
+		"@wordpress/rich-text": "^7.44.0",
+		"@wordpress/server-side-render": "^6.20.0",
+		"@wordpress/upload-media": "^0.29.0",
+		"@wordpress/url": "^4.44.0",
+		"@wordpress/views": "^1.11.0",
+		"@wordpress/warning": "^3.44.0",
+		"@wordpress/wordcount": "^4.44.0",
 		"change-case": "^4.1.2",
 		"client-zip": "^2.4.5",
 		"clsx": "^2.1.1",
@@ -126,5 +126,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "73606df74f1c38a084bfa5db97205259ef817593"
+	"gitHead": "b862d8c84121a47bbeff882f6c87e61681ce2e0d"
 }

package/src/components/collab-sidebar/index.js

@@ -56,6 +56,7 @@ function NotesSidebarContent( {
 				// Sometimes previous sidebar unmounts after the new one mounts.
 				// This ensures we always have the latest reference.
 				if ( node ) {
+					// eslint-disable-next-line react-compiler/react-compiler
 					commentSidebarRef.current = node;
 				}
 			} }

package/src/components/post-revisions-panel/index.js

@@ -25,30 +25,23 @@ import { unlock } from '../../lock-unlock';
 const { Badge } = unlock( componentsPrivateApis );
 const DAY_IN_MILLISECONDS = 86400000;
 const EMPTY_ARRAY = [];
-
-const REVISIONS_QUERY = {
-	per_page: 3,
-	orderby: 'date',
-	order: 'desc',
-	context: 'embed',
-	_fields: 'id,date,author',
-};
-const defaultLayouts = { activity: {} };
+const defaultLayouts = { activity: true };
+const noop = () => {};
+const paginationInfo = {};
 const view = {
 	type: 'activity',
 	titleField: 'date',
 	fields: [ 'author' ],
-	layout: {
-		density: 'compact',
-	},
+	layout: { density: 'compact' },
 };
 const fields = [
 	{
 		id: 'date',
 		label: __( 'Date' ),
-		render: ( { item } ) => {
+		render: ( { item, field } ) => {
 			const dateNowInMs = getDate( null ).getTime();
-			const date = getDate( item.date ?? null );
+			const _value = field.getValue( { item } );
+			const date = getDate( _value ?? null );
 			const displayDate =
 				dateNowInMs - date.getTime() > DAY_IN_MILLISECONDS
 					? dateI18n(
@@ -59,7 +52,7 @@ const fields = [
 			return (
 				<time
 					className="editor-post-revisions-panel__revision-date"
-					dateTime={ item.date }
+					dateTime={ _value }
 				>
 					{ displayDate }
 				</time>
@@ -70,36 +63,45 @@ const fields = [
 	},
 	authorField,
 ];
-const noop = () => {};
-const paginationInfo = {};
 
 function PostRevisionsPanelContent() {
 	const { setCurrentRevisionId } = unlock( useDispatch( editorStore ) );
-	const { revisionsCount, revisions, isLoading, lastRevisionId } = useSelect(
-		( select ) => {
-			const { getCurrentPostId, getCurrentPostType } =
-				select( editorStore );
-			const {
-				getCurrentPostRevisionsCount,
-				getCurrentPostLastRevisionId,
-			} = select( editorStore );
-			const { getRevisions, isResolving } = select( coreStore );
-			const query = [
-				'postType',
-				getCurrentPostType(),
-				getCurrentPostId(),
-				REVISIONS_QUERY,
-			];
-			const _revisions = getRevisions( ...query );
-			return {
-				revisionsCount: getCurrentPostRevisionsCount(),
-				lastRevisionId: getCurrentPostLastRevisionId(),
-				revisions: _revisions,
-				isLoading: isResolving( 'getRevisions', query ),
-			};
-		},
-		[]
-	);
+	const {
+		revisionsCount,
+		revisions,
+		revisionKey,
+		isLoading,
+		lastRevisionId,
+	} = useSelect( ( select ) => {
+		const { getCurrentPostId, getCurrentPostType } = select( editorStore );
+		const { getCurrentPostRevisionsCount, getCurrentPostLastRevisionId } =
+			select( editorStore );
+		const { getRevisions, getEntityConfig, isResolving } =
+			select( coreStore );
+		const _postType = getCurrentPostType();
+		const entityConfig = getEntityConfig( 'postType', _postType );
+		const _revisionKey = entityConfig?.revisionKey || 'id';
+		const revisionsQuery = {
+			per_page: 3,
+			orderby: 'date',
+			order: 'desc',
+			_fields: `${ _revisionKey },date,author`,
+		};
+		const query = [
+			'postType',
+			_postType,
+			getCurrentPostId(),
+			revisionsQuery,
+		];
+		const _revisions = getRevisions( ...query );
+		return {
+			revisionsCount: getCurrentPostRevisionsCount(),
+			lastRevisionId: getCurrentPostLastRevisionId(),
+			revisions: _revisions,
+			revisionKey: _revisionKey,
+			isLoading: isResolving( 'getRevisions', query ),
+		};
+	}, [] );
 	return (
 		<PanelBody
 			title={
@@ -121,10 +123,10 @@ function PostRevisionsPanelContent() {
 					isLoading={ isLoading }
 					paginationInfo={ paginationInfo }
 					defaultLayouts={ defaultLayouts }
-					getItemId={ ( item ) => item.id }
+					getItemId={ ( item ) => item[ revisionKey ] }
 					isItemClickable={ () => true }
 					onClickItem={ ( item ) => {
-						setCurrentRevisionId( item.id );
+						setCurrentRevisionId( item[ revisionKey ] );
 					} }
 				>
 					<DataViews.Layout />

package/src/components/sidebar/index.js

@@ -112,7 +112,13 @@ const SidebarContent = ( {
 				<PluginDocumentSettingPanel.Slot />
 				<TemplateContentPanel />
 				{ window?.__experimentalDataFormInspector &&
-					[ 'post', 'page' ].includes( postType ) && (
+					[
+						'post',
+						'page',
+						'wp_template',
+						'wp_template_part',
+						'wp_block',
+					].includes( postType ) && (
 						<>
 							<TemplateActionsPanel />
 							<PostRevisionsPanel />

package/src/components/sidebar/post-revision-summary.js

@@ -2,7 +2,12 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { __experimentalVStack as VStack } from '@wordpress/components';
+import {
+	ExternalLink,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { addQueryArgs } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -15,7 +20,6 @@ import { PostContentInformationUI } from '../post-content-information';
 import RevisionFieldsDiffPanel from '../revision-fields-diff';
 import PostPanelSection from '../post-panel-section';
 import PostCardPanel from '../post-card-panel';
-import { OpenRevisionsClassicScreen } from './post-summary';
 
 export default function PostRevisionSummary() {
 	const { revisionId, postId, postContent } = useSelect( ( select ) => {
@@ -40,7 +44,13 @@ export default function PostRevisionSummary() {
 						<PostContentInformationUI postContent={ postContent } />
 						<RevisionCreatedPanel />
 					</VStack>
-					<OpenRevisionsClassicScreen revisionId={ revisionId } />
+					<ExternalLink
+						href={ addQueryArgs( 'revision.php', {
+							revision: revisionId,
+						} ) }
+					>
+						{ __( 'Open classic revisions screen' ) }
+					</ExternalLink>
 					<RevisionAuthorPanel />
 				</VStack>
 			</PostPanelSection>

package/src/components/sidebar/post-summary.js

@@ -1,13 +1,8 @@
 /**
  * WordPress dependencies
  */
-import {
-	__experimentalVStack as VStack,
-	ExternalLink,
-} from '@wordpress/components';
+import { __experimentalVStack as VStack } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
-import { __ } from '@wordpress/i18n';
-import { addQueryArgs } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -41,18 +36,6 @@ import PostTrash from '../post-trash';
  */
 const PANEL_NAME = 'post-status';
 
-export function OpenRevisionsClassicScreen( { revisionId } ) {
-	return (
-		<ExternalLink
-			href={ addQueryArgs( 'revision.php', {
-				revision: revisionId,
-			} ) }
-		>
-			{ __( 'Open classic revisions screen' ) }
-		</ExternalLink>
-	);
-}
-
 export default function PostSummary( { onActionPerformed } ) {
 	const postType = useSelect(
 		( select ) => select( editorStore ).getCurrentPostType(),

package/src/components/style-book/categories.ts

@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 // @wordpress/blocks imports are not typed.
-// @ts-expect-error
 import { getCategories } from '@wordpress/blocks';
 
 /**

package/src/components/style-book/examples.tsx

@@ -2,24 +2,18 @@
  * WordPress dependencies
  */
 import { __, sprintf } from '@wordpress/i18n';
+import type { Block } from '@wordpress/blocks';
 import {
 	getBlockType,
 	getBlockTypes,
 	getBlockFromExample,
 	createBlock,
-	// @wordpress/blocks imports are not typed.
-	// @ts-expect-error
 } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
-import type {
-	BlockExample,
-	ColorOrigin,
-	MultiOriginPalettes,
-	BlockType,
-} from './types';
+import type { BlockExample, ColorOrigin, MultiOriginPalettes } from './types';
 import ColorExamples from './color-examples';
 import DuotoneExamples from './duotone-examples';
 import { STYLE_BOOK_COLOR_GROUPS } from './constants';
@@ -111,7 +105,7 @@ function getOverviewBlockExamples(
 	}
 
 	// Get examples for typography blocks.
-	const typographyBlockExamples: BlockType[] = [];
+	const typographyBlockExamples: Block[] = [];
 
 	if ( getBlockType( 'core/heading' ) ) {
 		const headingBlock = createBlock( 'core/heading', {
@@ -212,7 +206,7 @@ function getOverviewBlockExamples(
  */
 export function getExamples( colors: MultiOriginPalettes ): BlockExample[] {
 	const nonHeadingBlockExamples = getBlockTypes()
-		.filter( ( blockType: BlockType ) => {
+		.filter( ( blockType ) => {
 			const { name, example, supports } = blockType;
 			return (
 				name !== 'core/heading' &&
@@ -220,7 +214,7 @@ export function getExamples( colors: MultiOriginPalettes ): BlockExample[] {
 				supports?.inserter !== false
 			);
 		} )
-		.map( ( blockType: BlockType ) => ( {
+		.map( ( blockType ) => ( {
 			name: blockType.name,
 			title: blockType.title,
 			category: blockType.category,
@@ -232,7 +226,7 @@ export function getExamples( colors: MultiOriginPalettes ): BlockExample[] {
 			blocks: getBlockFromExample( blockType.name, {
 				...blockType.example,
 				attributes: {
-					...blockType.example.attributes,
+					...blockType.example?.attributes,
 					style: undefined,
 				},
 			} ),

package/src/components/style-book/types.ts

@@ -1,8 +1,4 @@
-export type Block = {
-	name: string;
-	attributes: Record< string, unknown >;
-	innerBlocks?: Block[];
-};
+import type { Block } from '@wordpress/blocks';
 
 export type StyleBookCategory = {
 	title: string;
@@ -65,16 +61,3 @@ export type MultiOriginPalettes = {
 	duotones: Omit< ColorOrigin, 'colors' | 'gradients' >;
 	gradients: Omit< ColorOrigin, 'colors' | 'duotones' >;
 };
-
-/*
- * Typing the items from getBlockTypes from '@wordpress/blocks'
- * to appease the TS linter.
- */
-export type BlockType = {
-	name: string;
-	title: string;
-	category: string;
-	example: BlockType;
-	attributes: Record< string, unknown >;
-	supports: Record< string, unknown >;
-};

package/src/components/sync-connection-error-modal/index.tsx

@@ -45,6 +45,8 @@ const INITIAL_DISCONNECTED_DEBOUNCE_MS = 20000;
 export function SyncConnectionErrorModal() {
 	const [ hasInitialized, setHasInitialized ] = useState( false );
 	const [ showModal, setShowModal ] = useState( false );
+	const [ isManualRetryAvailable, setIsManualRetryAvailable ] =
+		useState( false );
 
 	const { connectionStatus, isCollaborationEnabled, postType } = useSelect(
 		( selectFn ) => {
@@ -82,6 +84,22 @@ export function SyncConnectionErrorModal() {
 		return () => clearTimeout( timeout );
 	}, [] );
 
+	// Track retry availability separately from the raw connection status.
+	// The polling manager briefly emits `{ status: 'connecting' }` without
+	// `canManuallyRetry` when a retry is kicked off, which would otherwise
+	//  unmount the Retry button briefly.
+	useEffect( () => {
+		if ( 'connecting' === connectionStatus?.status ) {
+			return;
+		}
+
+		setIsManualRetryAvailable(
+			connectionStatus !== null &&
+				'canManuallyRetry' in connectionStatus &&
+				connectionStatus.canManuallyRetry === true
+		);
+	}, [ connectionStatus ] );
+
 	// Show the modal when disconnected and either retries are exhausted or
 	// no retry is available (unrecoverable error). Hide on reconnect.
 	// The 'connecting' state is ignored so the modal preserves its current
@@ -145,15 +163,12 @@ export function SyncConnectionErrorModal() {
 		return null;
 	}
 
-	const manualRetry =
-		connectionStatus &&
-		'canManuallyRetry' in connectionStatus &&
-		connectionStatus.canManuallyRetry
-			? () => {
-					onManualRetry();
-					retrySyncConnection();
-			  }
-			: undefined;
+	const manualRetry = isManualRetryAvailable
+		? () => {
+				onManualRetry();
+				retrySyncConnection();
+		  }
+		: undefined;
 
 	const messages = getSyncErrorMessages( error );