);\n- }),\n- \/\/ TODO: This throws an AggregateError. Need to update test infra to\n- \/\/ support matching against AggregateError.\n- ).rejects.toThrow();\n- });\n-\n it('should throw (in dev) when children are mutated during render', async () => {\n function Wrapper(props) {\n props.children[1] =

; \/\/ Mutation is illegal\n@@ -132,105 +119,6 @@ describe('ReactComponent', () => {\n }\n });\n \n- \/\/ @gate !disableStringRefs\n- it('string refs do not detach and reattach on every render', async () => {\n- let refVal;\n- class Child extends React.Component {\n- componentDidUpdate() {\n- \/\/ The parent ref should still be attached because it hasn't changed\n- \/\/ since the last render. If the ref had changed, then this would be\n- \/\/ undefined because refs are attached during the same phase (layout)\n- \/\/ as componentDidUpdate, in child -> parent order. So the new parent\n- \/\/ ref wouldn't have attached yet.\n- refVal = this.props.contextRef();\n- }\n-\n- render() {\n- if (this.props.show) {\n- return

child<\/div>;\n- }\n- }\n- }\n-\n- class Parent extends React.Component {\n- render() {\n- return (\n-

\n- this.refs.root}\n- show={this.props.showChild}\n- \/>\n- <\/div>\n- );\n- }\n- }\n-\n- const container = document.createElement('div');\n- const root = ReactDOMClient.createRoot(container);\n-\n- await act(() => {\n- root.render();\n- });\n-\n- assertConsoleErrorDev(['contains the string ref']);\n-\n- expect(refVal).toBe(undefined);\n- await act(() => {\n- root.render();\n- });\n- expect(refVal).toBe(container.querySelector('#test-root'));\n- });\n-\n- \/\/ @gate !disableStringRefs\n- it('should support string refs on owned components', async () => {\n- const innerObj = {};\n- const outerObj = {};\n-\n- class Wrapper extends React.Component {\n- getObject = () => {\n- return this.props.object;\n- };\n-\n- render() {\n- return

{this.props.children}<\/div>;\n- }\n- }\n-\n- class Component extends React.Component {\n- render() {\n- const inner = ;\n- const outer = (\n- \n- {inner}\n- <\/Wrapper>\n- );\n- return outer;\n- }\n-\n- componentDidMount() {\n- expect(this.refs.inner.getObject()).toEqual(innerObj);\n- expect(this.refs.outer.getObject()).toEqual(outerObj);\n- }\n- }\n-\n- const container = document.createElement('div');\n- const root = ReactDOMClient.createRoot(container);\n- await expect(async () => {\n- await act(() => {\n- root.render();\n- });\n- }).toErrorDev([\n- 'Component \"Component\" contains the string ref \"inner\". ' +\n- 'Support for string refs will be removed in a future major release. ' +\n- 'We recommend using useRef() or createRef() instead. ' +\n- 'Learn more about using refs safely here: https:\/\/react.dev\/link\/strict-mode-string-ref\\n' +\n- ' in Wrapper (at **)\\n' +\n- ' in div (at **)\\n' +\n- ' in Wrapper (at **)\\n' +\n- ' in Component (at **)',\n- ]);\n- });\n-\n it('should not have string refs on unmounted components', async () => {\n class Parent extends React.Component {\n render() {\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\nindex 89d0b83abc..4444076681 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\n@@ -537,11 +537,8 @@ describe('ReactCompositeComponent', () => {\n });\n \n it('should cleanup even if render() fatals', async () => {\n- const dispatcherEnabled =\n- __DEV__ ||\n- !gate(flags => flags.disableStringRefs) ||\n- gate(flags => flags.enableCache);\n- const ownerEnabled = __DEV__ || !gate(flags => flags.disableStringRefs);\n+ const dispatcherEnabled = __DEV__ || gate(flags => flags.enableCache);\n+ const ownerEnabled = __DEV__;\n \n let stashedDispatcher;\n class BadComponent extends React.Component {\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationRefs-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationRefs-test.js\nindex b8d1a0716a..9094af3484 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationRefs-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationRefs-test.js\n@@ -29,12 +29,8 @@ function initModules() {\n };\n }\n \n-const {\n- resetModules,\n- asyncReactDOMRender,\n- clientRenderOnServerString,\n- expectMarkupMatch,\n-} = ReactDOMServerIntegrationUtils(initModules);\n+const {resetModules, clientRenderOnServerString, expectMarkupMatch} =\n+ ReactDOMServerIntegrationUtils(initModules);\n \n describe('ReactDOMServerIntegration', () => {\n beforeEach(() => {\n@@ -75,36 +71,6 @@ describe('ReactDOMServerIntegration', () => {\n expect(refElement).not.toBe(null);\n expect(refElement).toBe(e);\n });\n-\n- \/\/ @gate !disableStringRefs\n- it('should have string refs on client when rendered over server markup', async () => {\n- class RefsComponent extends React.Component {\n- render() {\n- return

;\n- }\n- }\n-\n- const markup = ReactDOMServer.renderToString();\n- const root = document.createElement('div');\n- root.innerHTML = markup;\n- let component = null;\n- resetModules();\n- await expect(async () => {\n- await asyncReactDOMRender(\n- (component = e)} \/>,\n- root,\n- true,\n- );\n- }).toErrorDev([\n- 'Component \"RefsComponent\" contains the string ref \"myDiv\". ' +\n- 'Support for string refs will be removed in a future major release. ' +\n- 'We recommend using useRef() or createRef() instead. ' +\n- 'Learn more about using refs safely here: https:\/\/react.dev\/link\/strict-mode-string-ref\\n' +\n- ' in div (at **)\\n' +\n- ' in RefsComponent (at **)',\n- ]);\n- expect(component.refs.myDiv).toBe(root.firstChild);\n- });\n });\n \n it('should forward refs', async () => {\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDeprecationWarnings-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDeprecationWarnings-test.js\nindex 77c9e1886e..e0022dd990 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDeprecationWarnings-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDeprecationWarnings-test.js\n@@ -11,7 +11,6 @@\n \n let React;\n let ReactNoop;\n-let JSXDEVRuntime;\n let waitForAll;\n \n describe('ReactDeprecationWarnings', () => {\n@@ -21,9 +20,6 @@ describe('ReactDeprecationWarnings', () => {\n ReactNoop = require('react-noop-renderer');\n const InternalTestUtils = require('internal-test-utils');\n waitForAll = InternalTestUtils.waitForAll;\n- if (__DEV__) {\n- JSXDEVRuntime = require('react\/jsx-dev-runtime');\n- }\n });\n \n \/\/ @gate !disableDefaultPropsExceptForClasses || !__DEV__\n@@ -65,117 +61,4 @@ describe('ReactDeprecationWarnings', () => {\n 'release. Use JavaScript default parameters instead.',\n );\n });\n-\n- \/\/ @gate !disableStringRefs\n- it('should warn when given string refs', async () => {\n- class RefComponent extends React.Component {\n- render() {\n- return null;\n- }\n- }\n- class Component extends React.Component {\n- render() {\n- return ;\n- }\n- }\n-\n- ReactNoop.render();\n- await expect(async () => await waitForAll([])).toErrorDev(\n- 'Component \"Component\" contains the string ref \"refComponent\". ' +\n- 'Support for string refs will be removed in a future major release. ' +\n- 'We recommend using useRef() or createRef() instead. ' +\n- 'Learn more about using refs safely here: ' +\n- 'https:\/\/react.dev\/link\/strict-mode-string-ref' +\n- '\\n in RefComponent (at **)' +\n- '\\n in Component (at **)',\n- );\n- });\n-\n- \/\/ Disabling this until #28732 lands so we can assert on the warning message.\n- \/\/ (It's already disabled in all but the Meta builds, anyway. Nbd.)\n- \/\/ @gate TODO || !__DEV__\n- \/\/ @gate !disableStringRefs\n- it('should warn when owner and self are the same for string refs', async () => {\n- class RefComponent extends React.Component {\n- render() {\n- return null;\n- }\n- }\n- class Component extends React.Component {\n- render() {\n- return React.createElement(RefComponent, {\n- ref: 'refComponent',\n- __self: this,\n- });\n- }\n- }\n-\n- ReactNoop.render();\n- await expect(async () => await waitForAll([])).toErrorDev([\n- 'Component \"Component\" contains the string ref \"refComponent\". Support for string refs will be removed in a future major release.',\n- ]);\n- await waitForAll([]);\n- });\n-\n- \/\/ Disabling this until #28732 lands so we can assert on the warning message.\n- \/\/ (It's already disabled in all but the Meta builds, anyway. Nbd.)\n- \/\/ @gate TODO || !__DEV__\n- \/\/ @gate !disableStringRefs\n- it('should warn when owner and self are different for string refs (createElement)', async () => {\n- class RefComponent extends React.Component {\n- render() {\n- return null;\n- }\n- }\n- class Component extends React.Component {\n- render() {\n- return React.createElement(RefComponent, {\n- ref: 'refComponent',\n- __self: {},\n- });\n- }\n- }\n-\n- ReactNoop.render();\n- await expect(async () => await waitForAll([])).toErrorDev([\n- 'Component \"Component\" contains the string ref \"refComponent\". ' +\n- 'Support for string refs will be removed in a future major release. ' +\n- 'This case cannot be automatically converted to an arrow function. ' +\n- 'We ask you to manually fix this case by using useRef() or createRef() instead. ' +\n- 'Learn more about using refs safely here: ' +\n- 'https:\/\/react.dev\/link\/strict-mode-string-ref',\n- ]);\n- });\n-\n- \/\/ @gate __DEV__\n- \/\/ @gate !disableStringRefs\n- it('should warn when owner and self are different for string refs (jsx)', async () => {\n- class RefComponent extends React.Component {\n- render() {\n- return null;\n- }\n- }\n- class Component extends React.Component {\n- render() {\n- return JSXDEVRuntime.jsxDEV(\n- RefComponent,\n- {ref: 'refComponent'},\n- null,\n- false,\n- {},\n- {},\n- );\n- }\n- }\n-\n- ReactNoop.render();\n- await expect(async () => await waitForAll([])).toErrorDev([\n- 'Component \"Component\" contains the string ref \"refComponent\". ' +\n- 'Support for string refs will be removed in a future major release. ' +\n- 'This case cannot be automatically converted to an arrow function. ' +\n- 'We ask you to manually fix this case by using useRef() or createRef() instead. ' +\n- 'Learn more about using refs safely here: ' +\n- 'https:\/\/react.dev\/link\/strict-mode-string-ref',\n- ]);\n- });\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactFunctionComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactFunctionComponent-test.js\nindex 24f97520ec..f1250ce26d 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactFunctionComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactFunctionComponent-test.js\n@@ -179,24 +179,6 @@ describe('ReactFunctionComponent', () => {\n ).resolves.not.toThrowError();\n });\n \n- \/\/ @gate !disableStringRefs\n- it('should throw on string refs in pure functions', async () => {\n- function Child() {\n- return

;\n- }\n-\n- const container = document.createElement('div');\n- const root = ReactDOMClient.createRoot(container);\n- await expect(\n- act(() => {\n- root.render();\n- }),\n- )\n- \/\/ TODO: This throws an AggregateError. Need to update test infra to\n- \/\/ support matching against AggregateError.\n- .rejects.toThrowError();\n- });\n-\n it('should use correct name in key warning', async () => {\n function Child() {\n return

{[]}<\/div>;\ndiff --git a\/packages\/react-dom\/src\/__tests__\/multiple-copies-of-react-test.js b\/packages\/react-dom\/src\/__tests__\/multiple-copies-of-react-test.js\ndeleted file mode 100644\nindex 2d107cbb19..0000000000\n--- a\/packages\/react-dom\/src\/__tests__\/multiple-copies-of-react-test.js\n+++ \/dev\/null\n@@ -1,38 +0,0 @@\n-\/**\n- * Copyright (c) Meta Platforms, Inc. and affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @emails react-core\n- *\/\n-\n-'use strict';\n-\n-let React = require('react');\n-const ReactDOMClient = require('react-dom\/client');\n-const act = require('internal-test-utils').act;\n-\n-class TextWithStringRef extends React.Component {\n- render() {\n- jest.resetModules();\n- React = require('react');\n- return Hello world!<\/span>;\n- }\n-}\n-\n-describe('when different React version is used with string ref', () => {\n- \/\/ @gate !disableStringRefs\n- it('throws the \"Refs must have owner\" warning', async () => {\n- const container = document.createElement('div');\n- const root = ReactDOMClient.createRoot(container);\n- await expect(\n- act(() => {\n- root.render();\n- }),\n- )\n- \/\/ TODO: This throws an AggregateError. Need to update test infra to\n- \/\/ support matching against AggregateError.\n- .rejects.toThrow();\n- });\n-});\ndiff --git a\/packages\/react-dom\/src\/__tests__\/refs-test.js b\/packages\/react-dom\/src\/__tests__\/refs-test.js\nindex 80ea8d1e26..b80f8b2775 100644\n--- a\/packages\/react-dom\/src\/__tests__\/refs-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/refs-test.js\n@@ -13,179 +13,6 @@ const React = require('react');\n const ReactDOMClient = require('react-dom\/client');\n const act = require('internal-test-utils').act;\n \n-\/\/ This is testing if string refs are deleted from `instance.refs`\n-\/\/ Once support for string refs is removed, this test can be removed.\n-\/\/ Detaching is already tested in refs-detruction-test.js\n-describe('reactiverefs', () => {\n- let container;\n-\n- afterEach(() => {\n- if (container) {\n- document.body.removeChild(container);\n- container = null;\n- }\n- });\n-\n- \/**\n- * Counts clicks and has a renders an item for each click. Each item rendered\n- * has a ref of the form \"clickLogN\".\n- *\/\n- class ClickCounter extends React.Component {\n- state = {count: this.props.initialCount};\n-\n- triggerReset = () => {\n- this.setState({count: this.props.initialCount});\n- };\n-\n- handleClick = () => {\n- this.setState({count: this.state.count + 1});\n- };\n-\n- render() {\n- const children = [];\n- let i;\n- for (i = 0; i < this.state.count; i++) {\n- children.push(\n- ,\n- );\n- }\n- return (\n- \n- {children}\n- <\/span>\n- );\n- }\n- }\n-\n- const expectClickLogsLengthToBe = function (instance, length) {\n- const clickLogs = instance.container.querySelectorAll('.clickLogDiv');\n- expect(clickLogs.length).toBe(length);\n- expect(Object.keys(instance.refs.myCounter.refs).length).toBe(length);\n- };\n-\n- \/**\n- * Render a TestRefsComponent and ensure that the main refs are wired up.\n- *\/\n- const renderTestRefsComponent = async function () {\n- \/**\n- * Only purpose is to test that refs are tracked even when applied to a\n- * component that is injected down several layers. Ref systems are difficult to\n- * build in such a way that ownership is maintained in an airtight manner.\n- *\/\n- class GeneralContainerComponent extends React.Component {\n- render() {\n- return

{this.props.children}<\/div>;\n- }\n- }\n-\n- \/**\n- * Notice how refs ownership is maintained even when injecting a component\n- * into a different parent.\n- *\/\n- class TestRefsComponent extends React.Component {\n- container = null;\n- doReset = () => {\n- this.refs.myCounter.triggerReset();\n- };\n-\n- render() {\n- return (\n-

(this.container = current)}>\n-

\n- Reset Me By Clicking This.\n- <\/div>\n- \n- \n- <\/GeneralContainerComponent>\n- <\/div>\n- );\n- }\n- }\n-\n- container = document.createElement('div');\n- document.body.appendChild(container);\n-\n- let testRefsComponent;\n- await expect(async () => {\n- const root = ReactDOMClient.createRoot(container);\n- await act(() => {\n- root.render(\n- {\n- testRefsComponent = current;\n- }}\n- \/>,\n- );\n- });\n- }).toErrorDev([\n- 'Component \"TestRefsComponent\" contains the string ' +\n- 'ref \"resetDiv\". Support for string refs will be removed in a ' +\n- 'future major release. We recommend using useRef() or createRef() ' +\n- 'instead. Learn more about using refs safely ' +\n- 'here: https:\/\/react.dev\/link\/strict-mode-string-ref\\n' +\n- ' in div (at **)\\n' +\n- ' in div (at **)\\n' +\n- ' in TestRefsComponent (at **)',\n- 'Component \"ClickCounter\" contains the string ' +\n- 'ref \"clickLog0\". Support for string refs will be removed in a ' +\n- 'future major release. We recommend using useRef() or createRef() ' +\n- 'instead. Learn more about using refs safely ' +\n- 'here: https:\/\/react.dev\/link\/strict-mode-string-ref\\n' +\n- ' in div (at **)\\n' +\n- ' in span (at **)\\n' +\n- ' in ClickCounter (at **)',\n- ]);\n-\n- expect(testRefsComponent instanceof TestRefsComponent).toBe(true);\n-\n- const generalContainer = testRefsComponent.refs.myContainer;\n- expect(generalContainer instanceof GeneralContainerComponent).toBe(true);\n-\n- const counter = testRefsComponent.refs.myCounter;\n- expect(counter instanceof ClickCounter).toBe(true);\n-\n- return testRefsComponent;\n- };\n-\n- \/**\n- * Ensure that for every click log there is a corresponding ref (from the\n- * perspective of the injected ClickCounter component.\n- *\/\n- \/\/ @gate !disableStringRefs\n- it('Should increase refs with an increase in divs', async () => {\n- const testRefsComponent = await renderTestRefsComponent();\n- const clickIncrementer =\n- testRefsComponent.container.querySelector('.clickIncrementer');\n-\n- expectClickLogsLengthToBe(testRefsComponent, 1);\n-\n- \/\/ After clicking the reset, there should still only be one click log ref.\n- testRefsComponent.refs.resetDiv.click();\n- expectClickLogsLengthToBe(testRefsComponent, 1);\n-\n- \/\/ Begin incrementing clicks (and therefore refs).\n- await act(() => {\n- clickIncrementer.click();\n- });\n- expectClickLogsLengthToBe(testRefsComponent, 2);\n-\n- await act(() => {\n- clickIncrementer.click();\n- });\n- expectClickLogsLengthToBe(testRefsComponent, 3);\n-\n- \/\/ Now reset again\n- await act(() => {\n- testRefsComponent.refs.resetDiv.click();\n- });\n- expectClickLogsLengthToBe(testRefsComponent, 1);\n- });\n-});\n-\n \/**\n * Tests that when a ref hops around children, we can track that correctly.\n *\/\n@@ -320,32 +147,6 @@ describe('ref swapping', () => {\n expect(refCalled).toBe(1);\n });\n \n- \/\/ @gate !disableStringRefs\n- it('coerces numbers to strings', async () => {\n- class A extends React.Component {\n- render() {\n- return

;\n- }\n- }\n- let a;\n- await expect(async () => {\n- const container = document.createElement('div');\n- const root = ReactDOMClient.createRoot(container);\n-\n- await act(() => {\n- root.render( (a = current)} \/>);\n- });\n- }).toErrorDev([\n- 'Component \"A\" contains the string ref \"1\". ' +\n- 'Support for string refs will be removed in a future major release. ' +\n- 'We recommend using useRef() or createRef() instead. ' +\n- 'Learn more about using refs safely here: https:\/\/react.dev\/link\/strict-mode-string-ref\\n' +\n- ' in div (at **)\\n' +\n- ' in A (at **)',\n- ]);\n- expect(a.refs[1].nodeName).toBe('DIV');\n- });\n-\n it('provides an error for invalid refs', async () => {\n const container = document.createElement('div');\n const root = ReactDOMClient.createRoot(container);\n@@ -469,108 +270,6 @@ describe('root level refs', () => {\n });\n });\n \n-describe('creating element with string ref in constructor', () => {\n- class RefTest extends React.Component {\n- constructor(props) {\n- super(props);\n- this.p =

Hello!<\/p>;\n- }\n-\n- render() {\n- return

{this.p}<\/div>;\n- }\n- }\n-\n- \/\/ @gate !disableStringRefs && !__DEV__\n- it('throws an error in prod', async () => {\n- await expect(async function () {\n- const container = document.createElement('div');\n- const root = ReactDOMClient.createRoot(container);\n-\n- await act(() => {\n- root.render();\n- });\n- })\n- \/\/ TODO: This throws an AggregateError. Need to update test infra to\n- \/\/ support matching against AggregateError.\n- .rejects.toThrowError();\n- });\n-});\n-\n-describe('strings refs across renderers', () => {\n- \/\/ @gate !disableStringRefs\n- it('does not break', async () => {\n- class Parent extends React.Component {\n- render() {\n- \/\/ This component owns both refs.\n- return (\n- }\n- child2={

;\n- }\n-\n- let owner;\n- class Owner extends React.Component {\n- render() {\n- owner = this;\n- return ;\n- }\n- }\n-\n- const root = ReactNoop.createRoot();\n- await act(() => root.render());\n-\n- \/\/ When string refs aren't disabled, string refs\n- \/\/ the receiving component receives a callback ref, not the original string.\n- \/\/ This behavior should never be shipped to open source; it's only here to\n- \/\/ allow Meta to keep using string refs temporarily while they finish\n- \/\/ migrating their codebase.\n- expect(typeof refProp === 'function').toBe(true);\n- expect(owner.refs.child.type).toBe('div');\n- });\n-\n- \/\/ @gate disableStringRefs\n it('throw if a string ref is passed to a ref-receiving component', async () => {\n let refProp;\n function Child({ref}) {\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalSideEffects-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalSideEffects-test.js\nindex 81f892b48e..c4473c1774 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalSideEffects-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalSideEffects-test.js\n@@ -1334,38 +1334,4 @@ describe('ReactIncrementalSideEffects', () => {\n \n \/\/ TODO: Test that mounts, updates, refs, unmounts and deletions happen in the\n \/\/ expected way for aborted and resumed render life-cycles.\n-\n- \/\/ @gate !disableStringRefs\n- it('supports string refs', async () => {\n- let fooInstance = null;\n-\n- class Bar extends React.Component {\n- componentDidMount() {\n- this.test = 'test';\n- }\n- render() {\n- return

dillon1000/react

Files changed