Rename ref callback suffixes

WordPress · Dec 3, 2024 · 4f8c5be · 4f8c5be
1 parent 2fff145
commit 4f8c5be
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/packages/block-editor/src/components/iframe/index.js b/packages/block-editor/src/components/iframe/index.js
@@ -217,8 +217,8 @@ function Iframe( {
 	}, [] );
 
 	const {
-		contentRefCallback,
-		containerRefCallback,
+		contentRef: scaleContentRef,
+		containerRef,
 		isZoomedOut,
 		scaleContainerWidth,
 	} = useScaleCanvas( {
@@ -234,7 +234,7 @@ function Iframe( {
 		clearerRef,
 		writingFlowRef,
 		disabledRef,
-		contentRefCallback,
+		scaleContentRef,
 	] );
 
 	// Correct doctype is required to enable rendering in standards
@@ -354,10 +354,7 @@ function Iframe( {
 	);
 
 	return (
-		<div
-			className="block-editor-iframe__container"
-			ref={ containerRefCallback }
-		>
+		<div className="block-editor-iframe__container" ref={ containerRef }>
 			<div
 				className={ clsx(
 					'block-editor-iframe__scale-container',

diff --git a/packages/block-editor/src/components/iframe/use-scale-canvas.js b/packages/block-editor/src/components/iframe/use-scale-canvas.js
@@ -156,10 +156,10 @@ function extractSize( entries ) {
 
 /**
  * @typedef {Object} ScaleCanvasResult
- * @property {boolean} isZoomedOut             A boolean indicating if the canvas is zoomed out.
- * @property {number}  scaleContainerWidth     The width of the container used to calculate the scale.
- * @property {Object}  contentResizeListener   A resize observer for the content.
- * @property {Object}  containerResizeListener A resize observer for the container.
+ * @property {boolean}                      isZoomedOut         A boolean indicating if the canvas is zoomed out.
+ * @property {number}                       scaleContainerWidth The width of the container used to calculate the scale.
+ * @property {import('react').Ref<Element>} contentRef          A callback ref to the content element.
+ * @property {import('react').Ref<Element>} containerRef        A callback ref to the container element.
  */
 
 /**
@@ -180,14 +180,14 @@ export function useScaleCanvas( {
 	scale,
 } ) {
 	const [ { height: contentHeight }, setContentRect ] = useState( NULL_SIZE );
-	const contentRefCallback = useResizeObserver( ( entries ) => {
+	const contentRef = useResizeObserver( ( entries ) => {
 		setContentRect( extractSize( entries ) );
 	} );
 	const [
 		{ width: containerWidth, height: containerHeight },
 		setContainerRect,
 	] = useState( NULL_SIZE );
-	const containerRefCallback = useResizeObserver( ( entries ) => {
+	const containerRef = useResizeObserver( ( entries ) => {
 		setContainerRect( extractSize( entries ) );
 	} );
 
@@ -511,7 +511,7 @@ export function useScaleCanvas( {
 	return {
 		isZoomedOut,
 		scaleContainerWidth,
-		contentRefCallback,
-		containerRefCallback,
+		contentRef,
+		containerRef,
 	};
 }