Avoid wrapping non-React registrations

cursoragent · cursoragent · commit 57f91ed27a05 · 2026-04-25T06:39:25.000Z
diff --git a/react_on_rails_pro/spec/dummy/client/app/strictModeSupport.tsx b/react_on_rails_pro/spec/dummy/client/app/strictModeSupport.tsx
@@ -17,7 +17,13 @@ type RenderFunction = ((props?: unknown, railsContext?: unknown) => unknown) & {
   prototype?: ReactClassPrototype;
 };
 
-type RegisteredComponent = string | ComponentWithMetadata | RenderFunction;
+type ReactElementTypeObject = {
+  $$typeof?: unknown;
+  displayName?: string;
+  name?: string;
+};
+type StrictModeWrappableComponent = string | ComponentWithMetadata | RenderFunction | ReactElementTypeObject;
+type RegisteredComponent = StrictModeWrappableComponent | object;
 type ComponentRegistry = Record<string, RegisteredComponent>;
 type ReactOnRailsWithRegister = {
   register: (components: ComponentRegistry) => void;
@@ -26,9 +32,12 @@ type ReactOnRailsWithRegister = {
 
 const STRICT_MODE_PATCHED = '__reactOnRailsProDummyStrictModePatched';
 
-const wrappedFunctionComponents = new WeakMap<ComponentWithMetadata | RenderFunction, RegisteredComponent>();
+const wrappedFunctionComponents = new WeakMap<
+  ComponentWithMetadata | RenderFunction,
+  StrictModeWrappableComponent
+>();
 const wrappedRenderFunctions = new WeakMap<RenderFunction, RenderFunction>();
-const wrappedOtherComponents = new Map<RegisteredComponent, RegisteredComponent>();
+const wrappedOtherComponents = new Map<StrictModeWrappableComponent, StrictModeWrappableComponent>();
 
 const isPromiseLike = (value: unknown): value is Promise<unknown> =>
   typeof value === 'object' &&
@@ -41,11 +50,11 @@ const isRenderFunction = (component: RegisteredComponent): component is RenderFu
     return false;
   }
 
-  if (component.prototype?.isReactComponent) {
+  if ((component.prototype as ReactClassPrototype | undefined)?.isReactComponent) {
     return false;
   }
 
-  if (component.renderFunction) {
+  if ('renderFunction' in component && component.renderFunction) {
     return true;
   }
 
@@ -55,7 +64,12 @@ const isRenderFunction = (component: RegisteredComponent): component is RenderFu
 const isRendererFunction = (component: RegisteredComponent): component is RenderFunction =>
   isRenderFunction(component) && component.length === 3;
 
-const createStrictModeWrapper = (Component: RegisteredComponent): React.FC<Record<string, unknown>> => {
+const isReactElementTypeObject = (component: RegisteredComponent): component is ReactElementTypeObject =>
+  typeof component === 'object' && '$$typeof' in component && typeof component.$$typeof === 'symbol';
+
+const createStrictModeWrapper = (
+  Component: StrictModeWrappableComponent,
+): React.FC<Record<string, unknown>> => {
   function StrictModeWrapper(props: Record<string, unknown>) {
     const childElement =
       typeof Component === 'string'
@@ -74,7 +88,7 @@ const createStrictModeWrapper = (Component: RegisteredComponent): React.FC<Recor
   return StrictModeWrapper;
 };
 
-const wrapComponentInStrictMode = (component: RegisteredComponent): RegisteredComponent => {
+const wrapComponentInStrictMode = (component: StrictModeWrappableComponent): StrictModeWrappableComponent => {
   if (typeof component === 'function') {
     const cachedComponent = wrappedFunctionComponents.get(component);
     if (cachedComponent) {
@@ -110,7 +124,7 @@ const wrapRenderFunctionResult = (result: unknown): unknown => {
   }
 
   if (typeof result === 'function') {
-    return wrapComponentInStrictMode(result as RegisteredComponent);
+    return wrapComponentInStrictMode(result as StrictModeWrappableComponent);
   }
 
   return result;
@@ -145,9 +159,17 @@ export const wrapRegisteredComponentsWithStrictMode = (components: ComponentRegi
         return [name, wrapRenderFunctionInStrictMode(component)];
       }
 
+      if (
+        typeof component !== 'function' &&
+        typeof component !== 'string' &&
+        !isReactElementTypeObject(component)
+      ) {
+        return [name, component];
+      }
+
       return [name, wrapComponentInStrictMode(component)];
     }),
-  );
+  ) as ComponentRegistry;
 
 export const enableStrictModeForReactOnRails = <T extends ReactOnRailsWithRegister>(reactOnRails: T): T => {
   if (reactOnRails[STRICT_MODE_PATCHED]) {
