diff --git a/packages/block-editor/src/components/block-pattern-setup/index.js b/packages/block-editor/src/components/block-pattern-setup/index.js
index ea20723dea3b0c..88b346f5134d3b 100644
--- a/packages/block-editor/src/components/block-pattern-setup/index.js
+++ b/packages/block-editor/src/components/block-pattern-setup/index.js
@@ -153,10 +153,7 @@ const BlockPatternSetup = ( {
const [ showBlank, setShowBlank ] = useState( false );
const { replaceBlock } = useDispatch( blockEditorStore );
const patterns = usePatternsSetup( clientId, blockName, filterPatternsFn );
- const [
- contentResizeListener,
- { height: contentHeight },
- ] = useResizeObserver();
+ const { height: contentHeight, ref } = useResizeObserver( {} );
if ( ! patterns?.length || showBlank ) {
return startBlankComponent;
@@ -174,38 +171,34 @@ const BlockPatternSetup = ( {
}
: undefined;
return (
- <>
- { contentResizeListener }
-
-
- {
- setActiveSlide( ( active ) => active + 1 );
- } }
- handlePrevious={ () => {
- setActiveSlide( ( active ) => active - 1 );
- } }
- onBlockPatternSelect={ () => {
- onPatternSelectCallback(
- patterns[ activeSlide ].blocks
- );
- } }
- onStartBlank={ onStartBlank }
- />
-
- >
+
+
+ {
+ setActiveSlide( ( active ) => active + 1 );
+ } }
+ handlePrevious={ () => {
+ setActiveSlide( ( active ) => active - 1 );
+ } }
+ onBlockPatternSelect={ () => {
+ onPatternSelectCallback( patterns[ activeSlide ].blocks );
+ } }
+ onStartBlank={ onStartBlank }
+ />
+
);
};
diff --git a/packages/block-editor/src/components/block-preview/auto.js b/packages/block-editor/src/components/block-preview/auto.js
index d2eca43010a7c0..f359d430e2e9d5 100644
--- a/packages/block-editor/src/components/block-preview/auto.js
+++ b/packages/block-editor/src/components/block-preview/auto.js
@@ -24,10 +24,9 @@ function AutoBlockPreview( {
__experimentalPadding,
__experimentalMinHeight,
} ) {
- const [
- containerResizeListener,
- { width: containerWidth },
- ] = useResizeObserver();
+ const { width: containerWidth, ref: containerRef } = useResizeObserver(
+ {}
+ );
const [
contentResizeListener,
{ height: contentHeight },
@@ -61,8 +60,10 @@ function AutoBlockPreview( {
const scale = containerWidth / viewportWidth;
return (
-
- { containerResizeListener }
+
- { resizeListener }
+
{ notices }
{ preview && (
diff --git a/packages/components/src/resizable-box/resize-tooltip/index.tsx b/packages/components/src/resizable-box/resize-tooltip/index.tsx
index 38c4206c20e628..e06e382d5dc7da 100644
--- a/packages/components/src/resizable-box/resize-tooltip/index.tsx
+++ b/packages/components/src/resizable-box/resize-tooltip/index.tsx
@@ -9,6 +9,7 @@ import type { Ref, ForwardedRef } from 'react';
* WordPress dependencies
*/
import { forwardRef } from '@wordpress/element';
+import { useMergeRefs } from '@wordpress/compose';
/**
* Internal dependencies
@@ -45,21 +46,26 @@ function ResizeTooltip(
}: ResizeTooltipProps,
ref: ForwardedRef< HTMLDivElement >
): JSX.Element | null {
- const { label, resizeListener } = useResizeLabel( {
+ const { label, resizableRef } = useResizeLabel( {
axis,
fadeTimeout,
onResize,
showPx,
position,
} );
+ const mergedRef = useMergeRefs( [ ref, resizableRef ] );
if ( ! isVisible ) return null;
const classes = classnames( 'components-resize-tooltip', className );
return (
-
- { resizeListener }
+