diff --git a/package-lock.json b/package-lock.json index 2ac5ed04fb7fc..22c96db849cbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11827,7 +11827,6 @@ "lodash": "^4.17.19", "memize": "^1.1.0", "react-autosize-textarea": "^7.1.0", - "react-merge-refs": "^1.0.0", "react-spring": "^8.0.19", "redux-multi": "^0.1.12", "rememo": "^3.0.0", @@ -11956,7 +11955,6 @@ "moment": "^2.22.1", "re-resizable": "^6.4.0", "react-dates": "^17.1.1", - "react-merge-refs": "^1.0.0", "react-resize-aware": "^3.1.0", "react-spring": "^8.0.20", "react-use-gesture": "^9.0.0", @@ -11980,7 +11978,6 @@ "lodash": "^4.17.19", "memize": "^1.1.0", "mousetrap": "^1.6.5", - "react-merge-refs": "^1.0.0", "react-resize-aware": "^3.1.0", "use-memo-one": "^1.1.1" } @@ -12199,7 +12196,6 @@ "classnames": "^2.2.5", "lodash": "^4.17.19", "memize": "^1.1.0", - "react-merge-refs": "^1.0.0", "rememo": "^3.0.0" } }, @@ -12421,6 +12417,7 @@ "requires": { "@babel/runtime": "^7.12.5", "@wordpress/components": "file:packages/components", + "@wordpress/compose": "file:packages/compose", "@wordpress/data": "file:packages/data", "@wordpress/deprecated": "file:packages/deprecated", "@wordpress/element": "file:packages/element", @@ -12429,8 +12426,7 @@ "@wordpress/plugins": "file:packages/plugins", "@wordpress/viewport": "file:packages/viewport", "classnames": "^2.2.5", - "lodash": "^4.17.19", - "react-merge-refs": "^1.0.0" + "lodash": "^4.17.19" } }, "@wordpress/is-shallow-equal": { @@ -47167,11 +47163,6 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==", "dev": true }, - "react-merge-refs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/react-merge-refs/-/react-merge-refs-1.0.0.tgz", - "integrity": "sha512-VkvWuCR5VoTjb+VYUcOjkFo66HDv1Hw8VjKcwQtWr2lJnT8g7epRRyfz8+Zkl2WhwqNeqR0gIe0XYrBa9ePeXg==" - }, "react-moment-proptypes": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/react-moment-proptypes/-/react-moment-proptypes-1.7.0.tgz", diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json index 0e755c2b46b4a..d8c47dcf9426b 100644 --- a/packages/block-editor/package.json +++ b/packages/block-editor/package.json @@ -60,7 +60,6 @@ "lodash": "^4.17.19", "memize": "^1.1.0", "react-autosize-textarea": "^7.1.0", - "react-merge-refs": "^1.0.0", "react-spring": "^8.0.19", "redux-multi": "^0.1.12", "rememo": "^3.0.0", diff --git a/packages/block-editor/src/components/iframe/index.js b/packages/block-editor/src/components/iframe/index.js index 32366d1e3863e..cc0b350cc0f7b 100644 --- a/packages/block-editor/src/components/iframe/index.js +++ b/packages/block-editor/src/components/iframe/index.js @@ -1,7 +1,6 @@ /** * External dependencies */ -import mergeRefs from 'react-merge-refs'; import { compact, map } from 'lodash'; import tinycolor from 'tinycolor2'; @@ -16,6 +15,7 @@ import { forwardRef, } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; +import { useMergeRefs } from '@wordpress/compose'; /** * Internal dependencies @@ -211,7 +211,7 @@ function Iframe( { contentRef, editorStyles, children, head, ...props }, ref ) { return (