Fix focus loss

WordPress · Nov 20, 2023 · 6befb37 · 6befb37
1 parent fb43ec2
commit 6befb37
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 37 deletions.
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import classnames from 'classnames';
-import fastDeepEqual from 'fast-deep-equal';
 
 /**
  * WordPress dependencies
@@ -226,8 +225,7 @@ export default function ReusableBlockEdit( {
 	// but won't create an undo level.
 	// This can be abstracted into a `useSyncDerivedAttributes` hook if needed.
 	useEffect( () => {
-		const { getBlocks, getBlockAttributes } =
-			registry.select( blockEditorStore );
+		const { getBlocks } = registry.select( blockEditorStore );
 		const { syncDerivedBlockAttributes } = unlock(
 			registry.dispatch( blockEditorStore )
 		);
@@ -236,21 +234,12 @@ export default function ReusableBlockEdit( {
 			const blocks = getBlocks( patternClientId );
 			if ( blocks !== prevBlocks ) {
 				prevBlocks = blocks;
-				// TODO: We should probably cache this somehow to improve performance.
-				const nextDynamicContent = getDynamicContentFromBlocks(
-					blocks,
-					defaultValuesRef.current
-				);
-				if (
-					! fastDeepEqual(
-						getBlockAttributes( patternClientId ).dynamicContent,
-						nextDynamicContent
-					)
-				) {
-					syncDerivedBlockAttributes( patternClientId, {
-						dynamicContent: nextDynamicContent,
-					} );
-				}
+				syncDerivedBlockAttributes( patternClientId, {
+					dynamicContent: getDynamicContentFromBlocks(
+						blocks,
+						defaultValuesRef.current
+					),
+				} );
 			}
 		}, blockEditorStore );
 	}, [ patternClientId, registry ] );

diff --git a/packages/block-library/src/block/v1/edit.js b/packages/block-library/src/block/v1/edit.js
@@ -114,33 +114,29 @@ export default function ReusableBlockEdit( {
 			: InnerBlocks.ButtonBlockAppender,
 	} );
 
+	let children = null;
+
 	if ( hasAlreadyRendered ) {
-		return (
-			<div { ...blockProps }>
-				<Warning>
-					{ __( 'Block cannot be rendered inside itself.' ) }
-				</Warning>
-			</div>
+		children = (
+			<Warning>
+				{ __( 'Block cannot be rendered inside itself.' ) }
+			</Warning>
 		);
 	}
 
 	if ( isMissing ) {
-		return (
-			<div { ...blockProps }>
-				<Warning>
-					{ __( 'Block has been deleted or is unavailable.' ) }
-				</Warning>
-			</div>
+		children = (
+			<Warning>
+				{ __( 'Block has been deleted or is unavailable.' ) }
+			</Warning>
 		);
 	}
 
 	if ( ! hasResolved ) {
-		return (
-			<div { ...blockProps }>
-				<Placeholder>
-					<Spinner />
-				</Placeholder>
-			</div>
+		children = (
+			<Placeholder>
+				<Spinner />
+			</Placeholder>
 		);
 	}
 
@@ -157,7 +153,11 @@ export default function ReusableBlockEdit( {
 					/>
 				</PanelBody>
 			</InspectorControls>
-			<div { ...innerBlocksProps } />
+			{ children === null ? (
+				<div { ...innerBlocksProps } />
+			) : (
+				<div { ...blockProps }>{ children }</div>
+			) }
 		</RecursionProvider>
 	);
 }