Fix cloneElement using string ref w no owner

packages/react/src/__tests__/ReactElementClone-test.js

@@ -274,8 +274,55 @@ describe('ReactElementClone', () => {
 
     const root = ReactDOMClient.createRoot(document.createElement('div'));
     await act(() => root.render(<Grandparent />));
-    expect(component.childRef).toEqual({current: null});
-    expect(component.parentRef.current.xyzRef.current.tagName).toBe('SPAN');
+    if (gate(flags => flags.enableRefAsProp && flags.disableStringRefs)) {
+      expect(component.childRef).toEqual({current: null});
+      expect(component.parentRef.current.xyzRef.current.tagName).toBe('SPAN');
+    } else if (
+      gate(flags => !flags.enableRefAsProp && !flags.disableStringRefs)
+    ) {
+      expect(component.childRef).toEqual({current: null});
+      expect(component.parentRef.current.xyzRef.current.tagName).toBe('SPAN');
+    } else if (
+      gate(flags => flags.enableRefAsProp && !flags.disableStringRefs)
+    ) {
+      expect(component.childRef).toEqual({current: null});
+      expect(component.parentRef.current.xyzRef.current.tagName).toBe('SPAN');
+    } else {
+      // Not going to bother testing every possible combination.
+    }
+  });
+
+  it('should steal the ref if a new string ref is specified', async () => {
+    if (gate(flags => !flags.enableRefAsProp && !flags.disableStringRefs)) {
+      await expect(async () => {
+        // create an element without an owner
+        const element = React.createElement('div', {id: 'some-id'});
+        class Parent extends React.Component {
+          render() {
+            return <Child>{element}</Child>;
+          }
+        }
+        let child;
+        class Child extends React.Component {
+          render() {
+            child = this;
+            const clone = React.cloneElement(this.props.children, {
+              ref: 'xyz',
+            });
+            return <div>{clone}</div>;
+          }
+        }
+
+        const root = ReactDOMClient.createRoot(document.createElement('div'));
+        await act(() => root.render(<Parent />));
+        expect(child.refs.xyz.tagName).toBe('DIV');
+      }).toErrorDev([
+        'Warning: Component "Child" contains the string ref "xyz". Support for ' +
+          'string refs will be removed in a future major release. We recommend ' +
+          'using useRef() or createRef() instead. Learn more about using refs ' +
+          'safely here: https://react.dev/link/strict-mode-string-ref',
+      ]);
+    }
   });
 
   it('should overwrite props', async () => {
@@ -371,6 +418,15 @@ describe('ReactElementClone', () => {
     ) {
       expect(clone.ref).toBe(element.ref);
       expect(clone.props).toEqual({foo: 'ef'});
+    } else if (
+      gate(flags => flags.enableRefAsProp && !flags.disableStringRefs)
+    ) {
+      expect(() => {
+        expect(clone.ref).toBe(element.ref);
+      }).toErrorDev('Accessing element.ref was removed in React 19', {
+        withoutStack: true,
+      });
+      expect(clone.props).toEqual({foo: 'ef', ref: element.ref});
     } else {
       // Not going to bother testing every possible combination.
     }

packages/react/src/jsx/ReactJSXElement.js

@@ -866,14 +866,14 @@ export function cloneElement(element, config, children) {
 
   if (config != null) {
     if (hasValidRef(config)) {
+      owner = ReactSharedInternals.owner;
       if (!enableRefAsProp) {
         // Silently steal the ref from the parent.
         ref = config.ref;
         if (!disableStringRefs) {
           ref = coerceStringRef(ref, owner, element.type);
         }
       }
-      owner = ReactSharedInternals.owner;
     }
     if (hasValidKey(config)) {
       if (__DEV__) {