@reckona/mreact-compat 0.0.174 → 0.0.176

package/dist/reactive-prop-cell.d.ts

@@ -3,11 +3,19 @@ import type { ReactiveDomBlockResult } from "./element.js";
 export interface ReactivePropCell {
     value: Record<string, unknown>;
     source: Source;
+    propertySources?: Map<PropertyKey, Source> | undefined;
+    propertySnapshots?: Map<PropertyKey, ShallowObjectSnapshot> | undefined;
 }
 export interface ReactiveDomBlockState extends ReactiveDomBlockResult {
     propCell?: ReactivePropCell | undefined;
 }
 export declare function createReactivePropCell(props: Record<string, unknown>): ReactivePropCell;
+export declare function batchReactivePropCellUpdates<T>(run: () => T): T;
 export declare function createReactivePropProxy<P extends object>(cell: ReactivePropCell): P;
+interface ShallowObjectSnapshot {
+    value: object;
+    entries: Map<PropertyKey, unknown>;
+}
 export declare function setReactivePropCell(cell: ReactivePropCell, next: Record<string, unknown>): void;
+export {};
 //# sourceMappingURL=reactive-prop-cell.d.ts.map

package/dist/reactive-prop-cell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reactive-prop-cell.d.ts","sourceRoot":"","sources":["../src/reactive-prop-cell.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAQ3D,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;CAChB;AAID,MAAM,WAAW,qBAAsB,SAAQ,sBAAsB;IACnE,QAAQ,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACzC;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,gBAAgB,CAEvF;AAqBD,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,CAAC,CAEnF;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,IAAI,CAWN"}
+{"version":3,"file":"reactive-prop-cell.d.ts","sourceRoot":"","sources":["../src/reactive-prop-cell.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAQ3D,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IACvD,iBAAiB,CAAC,EAAE,GAAG,CAAC,WAAW,EAAE,qBAAqB,CAAC,GAAG,SAAS,CAAC;CACzE;AAID,MAAM,WAAW,qBAAsB,SAAQ,sBAAsB;IACnE,QAAQ,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACzC;AAKD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,gBAAgB,CAEvF;AAED,wBAAgB,4BAA4B,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAW/D;AAuBD,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,CAAC,CAEnF;AAoBD,UAAU,qBAAqB;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;CACpC;AAgFD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,IAAI,CAuCN"}

package/dist/reactive-prop-cell.js

@@ -1,14 +1,32 @@
+import { batch } from "@reckona/mreact-reactive-core";
 import { flushQueuedComputations, notifySubscribers, trackSource, } from "@reckona/mreact-reactive-core/internal";
+let propCellBatchDepth = 0;
+let propCellBatchNeedsFlush = false;
 export function createReactivePropCell(props) {
     return { value: props, source: { subscribers: null } };
 }
+export function batchReactivePropCellUpdates(run) {
+    propCellBatchDepth += 1;
+    try {
+        return batch(run);
+    }
+    finally {
+        propCellBatchDepth -= 1;
+        if (propCellBatchDepth === 0 && propCellBatchNeedsFlush) {
+            propCellBatchNeedsFlush = false;
+            flushQueuedComputations();
+        }
+    }
+}
 const PROP_PROXY_HANDLER = {
     get(cell, property) {
-        trackSource(cell.source);
-        return cell.value[property];
+        trackSource(getReactivePropPropertySource(cell, property));
+        const value = Reflect.get(cell.value, property);
+        rememberReactivePropObjectSnapshot(cell, property, value);
+        return value;
     },
     has(cell, property) {
-        trackSource(cell.source);
+        trackSource(getReactivePropPropertySource(cell, property));
         return property in cell.value;
     },
     ownKeys(cell) {
@@ -23,14 +41,100 @@ const PROP_PROXY_HANDLER = {
 export function createReactivePropProxy(cell) {
     return new Proxy(cell, PROP_PROXY_HANDLER);
 }
+function getReactivePropPropertySource(cell, property) {
+    let propertySources = cell.propertySources;
+    if (propertySources === undefined) {
+        propertySources = new Map();
+        cell.propertySources = propertySources;
+    }
+    let source = propertySources.get(property);
+    if (source === undefined) {
+        source = { subscribers: null };
+        propertySources.set(property, source);
+    }
+    return source;
+}
+function rememberReactivePropObjectSnapshot(cell, property, value) {
+    if (!isObjectLike(value)) {
+        cell.propertySnapshots?.delete(property);
+        return;
+    }
+    let snapshots = cell.propertySnapshots;
+    if (snapshots === undefined) {
+        snapshots = new Map();
+        cell.propertySnapshots = snapshots;
+    }
+    snapshots.set(property, createShallowObjectSnapshot(value));
+}
+function createShallowObjectSnapshot(value) {
+    const entries = new Map();
+    for (const key of Reflect.ownKeys(value)) {
+        const descriptor = Reflect.getOwnPropertyDescriptor(value, key);
+        if (descriptor !== undefined && "value" in descriptor) {
+            entries.set(key, descriptor.value);
+        }
+    }
+    return { value, entries };
+}
+function isObjectLike(value) {
+    return (typeof value === "object" && value !== null) || typeof value === "function";
+}
+function hasShallowObjectSnapshotChanged(snapshot, nextValue) {
+    if (snapshot === undefined || snapshot.value !== nextValue || !isObjectLike(nextValue)) {
+        return false;
+    }
+    for (const key of Reflect.ownKeys(nextValue)) {
+        const descriptor = Reflect.getOwnPropertyDescriptor(nextValue, key);
+        if (descriptor !== undefined && "value" in descriptor) {
+            if (!snapshot.entries.has(key) || !Object.is(snapshot.entries.get(key), descriptor.value)) {
+                return true;
+            }
+        }
+    }
+    for (const key of snapshot.entries.keys()) {
+        const descriptor = Reflect.getOwnPropertyDescriptor(nextValue, key);
+        if (descriptor === undefined || !("value" in descriptor)) {
+            return true;
+        }
+    }
+    return false;
+}
+function shouldNotifyReactivePropProperty(previous, next, property, snapshot) {
+    if ((property in previous) !== (property in next)) {
+        return true;
+    }
+    const previousValue = Reflect.get(previous, property);
+    const nextValue = Reflect.get(next, property);
+    return !Object.is(previousValue, nextValue) ||
+        hasShallowObjectSnapshotChanged(snapshot, nextValue);
+}
 export function setReactivePropCell(cell, next) {
     if (Object.is(cell.value, next)) {
         return;
     }
+    const previous = cell.value;
+    const propertySources = cell.propertySources;
+    let notified = false;
     cell.value = next;
+    if (propertySources !== undefined) {
+        for (const [property, source] of propertySources) {
+            if (shouldNotifyReactivePropProperty(previous, next, property, cell.propertySnapshots?.get(property))) {
+                notifySubscribers(source);
+                notified = true;
+            }
+        }
+    }
     if (cell.source.subscribers !== null) {
         notifySubscribers(cell.source);
-        flushQueuedComputations();
+        notified = true;
+    }
+    if (notified) {
+        if (propCellBatchDepth === 0) {
+            flushQueuedComputations();
+        }
+        else {
+            propCellBatchNeedsFlush = true;
+        }
     }
 }
 //# sourceMappingURL=reactive-prop-cell.js.map

package/dist/reactive-prop-cell.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactive-prop-cell.js","sourceRoot":"","sources":["../src/reactive-prop-cell.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,WAAW,GAEZ,MAAM,wCAAwC,CAAC;AAoBhD,MAAM,UAAU,sBAAsB,CAAC,KAA8B;IACnE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC;AACzD,CAAC;AAED,MAAM,kBAAkB,GAAmC;IACzD,GAAG,CAAC,IAAI,EAAE,QAAQ;QAChB,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAkB,CAAC,CAAC;IACxC,CAAC;IACD,GAAG,CAAC,IAAI,EAAE,QAAQ;QAChB,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC;IAChC,CAAC;IACD,OAAO,CAAC,IAAI;QACV,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IACD,wBAAwB,CAAC,IAAI,EAAE,QAAQ;QACrC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAChE,CAAC;CACF,CAAC;AAEF,MAAM,UAAU,uBAAuB,CAAmB,IAAsB;IAC9E,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAiB,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,IAAsB,EACtB,IAA6B;IAE7B,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IAElB,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;QACrC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,uBAAuB,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC","sourcesContent":["import {\n  flushQueuedComputations,\n  notifySubscribers,\n  trackSource,\n  type Source,\n} from \"@reckona/mreact-reactive-core/internal\";\nimport type { ReactiveDomBlockResult } from \"./element.js\";\n\n// A stable reactive box over a component's incoming props, analogous to the\n// native keyed list's KeyedItemCell (packages/reactive-dom/src/bind-list.ts).\n// A reactive-dom-block reads its props through a proxy backed by this cell;\n// when the component re-renders with new props the reconciler swaps the cell's\n// value and notifies, so bound text/attributes update without re-running the\n// block's render closure or reconciling its subtree.\nexport interface ReactivePropCell {\n  value: Record<string, unknown>;\n  source: Source;\n}\n\n// What a reactive-dom-block fiber stores in stateNode: the committed node and\n// its dispose, plus the prop cell when the block bridges component props.\nexport interface ReactiveDomBlockState extends ReactiveDomBlockResult {\n  propCell?: ReactivePropCell | undefined;\n}\n\nexport function createReactivePropCell(props: Record<string, unknown>): ReactivePropCell {\n  return { value: props, source: { subscribers: null } };\n}\n\nconst PROP_PROXY_HANDLER: ProxyHandler<ReactivePropCell> = {\n  get(cell, property) {\n    trackSource(cell.source);\n    return cell.value[property as string];\n  },\n  has(cell, property) {\n    trackSource(cell.source);\n    return property in cell.value;\n  },\n  ownKeys(cell) {\n    trackSource(cell.source);\n    return Reflect.ownKeys(cell.value);\n  },\n  getOwnPropertyDescriptor(cell, property) {\n    trackSource(cell.source);\n    return Reflect.getOwnPropertyDescriptor(cell.value, property);\n  },\n};\n\nexport function createReactivePropProxy<P extends object>(cell: ReactivePropCell): P {\n  return new Proxy(cell, PROP_PROXY_HANDLER) as unknown as P;\n}\n\nexport function setReactivePropCell(\n  cell: ReactivePropCell,\n  next: Record<string, unknown>,\n): void {\n  if (Object.is(cell.value, next)) {\n    return;\n  }\n\n  cell.value = next;\n\n  if (cell.source.subscribers !== null) {\n    notifySubscribers(cell.source);\n    flushQueuedComputations();\n  }\n}\n"]}
+{"version":3,"file":"reactive-prop-cell.js","sourceRoot":"","sources":["../src/reactive-prop-cell.ts"],"names":[],"mappings":"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","sourcesContent":["import { batch } from \"@reckona/mreact-reactive-core\";\nimport {\n  flushQueuedComputations,\n  notifySubscribers,\n  trackSource,\n  type Source,\n} from \"@reckona/mreact-reactive-core/internal\";\nimport type { ReactiveDomBlockResult } from \"./element.js\";\n\n// A stable reactive box over a component's incoming props, analogous to the\n// native keyed list's KeyedItemCell (packages/reactive-dom/src/bind-list.ts).\n// A reactive-dom-block reads its props through a proxy backed by this cell;\n// when the component re-renders with new props the reconciler swaps the cell's\n// value and notifies, so bound text/attributes update without re-running the\n// block's render closure or reconciling its subtree.\nexport interface ReactivePropCell {\n  value: Record<string, unknown>;\n  source: Source;\n  propertySources?: Map<PropertyKey, Source> | undefined;\n  propertySnapshots?: Map<PropertyKey, ShallowObjectSnapshot> | undefined;\n}\n\n// What a reactive-dom-block fiber stores in stateNode: the committed node and\n// its dispose, plus the prop cell when the block bridges component props.\nexport interface ReactiveDomBlockState extends ReactiveDomBlockResult {\n  propCell?: ReactivePropCell | undefined;\n}\n\nlet propCellBatchDepth = 0;\nlet propCellBatchNeedsFlush = false;\n\nexport function createReactivePropCell(props: Record<string, unknown>): ReactivePropCell {\n  return { value: props, source: { subscribers: null } };\n}\n\nexport function batchReactivePropCellUpdates<T>(run: () => T): T {\n  propCellBatchDepth += 1;\n  try {\n    return batch(run);\n  } finally {\n    propCellBatchDepth -= 1;\n    if (propCellBatchDepth === 0 && propCellBatchNeedsFlush) {\n      propCellBatchNeedsFlush = false;\n      flushQueuedComputations();\n    }\n  }\n}\n\nconst PROP_PROXY_HANDLER: ProxyHandler<ReactivePropCell> = {\n  get(cell, property) {\n    trackSource(getReactivePropPropertySource(cell, property));\n    const value = Reflect.get(cell.value, property);\n    rememberReactivePropObjectSnapshot(cell, property, value);\n    return value;\n  },\n  has(cell, property) {\n    trackSource(getReactivePropPropertySource(cell, property));\n    return property in cell.value;\n  },\n  ownKeys(cell) {\n    trackSource(cell.source);\n    return Reflect.ownKeys(cell.value);\n  },\n  getOwnPropertyDescriptor(cell, property) {\n    trackSource(cell.source);\n    return Reflect.getOwnPropertyDescriptor(cell.value, property);\n  },\n};\n\nexport function createReactivePropProxy<P extends object>(cell: ReactivePropCell): P {\n  return new Proxy(cell, PROP_PROXY_HANDLER) as unknown as P;\n}\n\nfunction getReactivePropPropertySource(cell: ReactivePropCell, property: PropertyKey): Source {\n  let propertySources = cell.propertySources;\n\n  if (propertySources === undefined) {\n    propertySources = new Map();\n    cell.propertySources = propertySources;\n  }\n\n  let source = propertySources.get(property);\n\n  if (source === undefined) {\n    source = { subscribers: null };\n    propertySources.set(property, source);\n  }\n\n  return source;\n}\n\ninterface ShallowObjectSnapshot {\n  value: object;\n  entries: Map<PropertyKey, unknown>;\n}\n\nfunction rememberReactivePropObjectSnapshot(\n  cell: ReactivePropCell,\n  property: PropertyKey,\n  value: unknown,\n): void {\n  if (!isObjectLike(value)) {\n    cell.propertySnapshots?.delete(property);\n    return;\n  }\n\n  let snapshots = cell.propertySnapshots;\n  if (snapshots === undefined) {\n    snapshots = new Map();\n    cell.propertySnapshots = snapshots;\n  }\n\n  snapshots.set(property, createShallowObjectSnapshot(value));\n}\n\nfunction createShallowObjectSnapshot(value: object): ShallowObjectSnapshot {\n  const entries = new Map<PropertyKey, unknown>();\n  for (const key of Reflect.ownKeys(value)) {\n    const descriptor = Reflect.getOwnPropertyDescriptor(value, key);\n    if (descriptor !== undefined && \"value\" in descriptor) {\n      entries.set(key, descriptor.value);\n    }\n  }\n\n  return { value, entries };\n}\n\nfunction isObjectLike(value: unknown): value is object {\n  return (typeof value === \"object\" && value !== null) || typeof value === \"function\";\n}\n\nfunction hasShallowObjectSnapshotChanged(\n  snapshot: ShallowObjectSnapshot | undefined,\n  nextValue: unknown,\n): boolean {\n  if (snapshot === undefined || snapshot.value !== nextValue || !isObjectLike(nextValue)) {\n    return false;\n  }\n\n  for (const key of Reflect.ownKeys(nextValue)) {\n    const descriptor = Reflect.getOwnPropertyDescriptor(nextValue, key);\n    if (descriptor !== undefined && \"value\" in descriptor) {\n      if (!snapshot.entries.has(key) || !Object.is(snapshot.entries.get(key), descriptor.value)) {\n        return true;\n      }\n    }\n  }\n\n  for (const key of snapshot.entries.keys()) {\n    const descriptor = Reflect.getOwnPropertyDescriptor(nextValue, key);\n    if (descriptor === undefined || !(\"value\" in descriptor)) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nfunction shouldNotifyReactivePropProperty(\n  previous: Record<string, unknown>,\n  next: Record<string, unknown>,\n  property: PropertyKey,\n  snapshot: ShallowObjectSnapshot | undefined,\n): boolean {\n  if ((property in previous) !== (property in next)) {\n    return true;\n  }\n\n  const previousValue = Reflect.get(previous, property);\n  const nextValue = Reflect.get(next, property);\n  return !Object.is(previousValue, nextValue) ||\n    hasShallowObjectSnapshotChanged(snapshot, nextValue);\n}\n\nexport function setReactivePropCell(\n  cell: ReactivePropCell,\n  next: Record<string, unknown>,\n): void {\n  if (Object.is(cell.value, next)) {\n    return;\n  }\n\n  const previous = cell.value;\n  const propertySources = cell.propertySources;\n  let notified = false;\n\n  cell.value = next;\n\n  if (propertySources !== undefined) {\n    for (const [property, source] of propertySources) {\n      if (\n        shouldNotifyReactivePropProperty(\n          previous,\n          next,\n          property,\n          cell.propertySnapshots?.get(property),\n        )\n      ) {\n        notifySubscribers(source);\n        notified = true;\n      }\n    }\n  }\n\n  if (cell.source.subscribers !== null) {\n    notifySubscribers(cell.source);\n    notified = true;\n  }\n\n  if (notified) {\n    if (propCellBatchDepth === 0) {\n      flushQueuedComputations();\n    } else {\n      propCellBatchNeedsFlush = true;\n    }\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reckona/mreact-compat",
-  "version": "0.0.174",
+  "version": "0.0.176",
   "description": "React-compatible runtime implementation for mreact.",
   "keywords": [
     "compatibility",
@@ -69,7 +69,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@reckona/mreact-reactive-core": "0.0.174",
-    "@reckona/mreact-shared": "0.0.174"
+    "@reckona/mreact-shared": "0.0.176",
+    "@reckona/mreact-reactive-core": "0.0.176"
   }
 }

package/src/element.ts

@@ -211,6 +211,16 @@ export function createElementFromJsxConfig<P extends object>(
     ? String(keyArgument)
     : config?.key === undefined ? null : String(config.key);
   const ref = config?.ref ?? null;
+  if (canReuseJsxConfigAsComponentProps(normalizedType, config)) {
+    return {
+      $$typeof: REACT_COMPAT_ELEMENT_TYPE,
+      type: normalizedType as ElementType<P>,
+      key,
+      ref,
+      props: config as P & { children?: ReactCompatNode },
+    };
+  }
+
   const hasChildren = config !== null && config !== undefined && hasOwnProperty.call(config, "children");
   const children = config?.children;
   const copiedProps = copyElementProps(config, undefined, true);
@@ -237,6 +247,34 @@ export function createElementFromJsxConfig<P extends object>(
   };
 }
 
+function canReuseJsxConfigAsComponentProps(
+  type: unknown,
+  config: object | null | undefined,
+): boolean {
+  if (
+    config === null ||
+    config === undefined ||
+    typeof type === "string" ||
+    hasDefaultProps(type)
+  ) {
+    return false;
+  }
+
+  for (const name in config) {
+    if (
+      hasOwnProperty.call(config, name) &&
+      (name === "key" ||
+        name === "ref" ||
+        name === "__self" ||
+        name === "__source")
+    ) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
 /** Returns true when a value is a React-compatible element record. */
 export function isReactCompatElement(
   value: unknown,
@@ -287,6 +325,7 @@ export interface MemoType<P = Record<string, unknown>> {
   $$typeof: typeof MEMO_TYPE;
   type: ElementType<P>;
   compare?: (previous: P, next: P) => boolean;
+  __mreactMemoCompareProps?: readonly string[];
 }
 
 /** Element type record produced by lazy. */
@@ -497,7 +536,7 @@ function applyDefaultProps(
   type: unknown,
   props: Record<string, unknown>,
 ): Record<string, unknown> {
-  if (typeof type !== "function" && (typeof type !== "object" || type === null)) {
+  if (!canHaveDefaultProps(type)) {
     return props;
   }
 
@@ -517,6 +556,15 @@ function applyDefaultProps(
   return props;
 }
 
+function hasDefaultProps(type: unknown): boolean {
+  return canHaveDefaultProps(type) &&
+    (type as { defaultProps?: Record<string, unknown> }).defaultProps !== undefined;
+}
+
+function canHaveDefaultProps(type: unknown): boolean {
+  return typeof type === "function" || (typeof type === "object" && type !== null);
+}
+
 interface ReactReservedProps {
   key?: unknown;
   ref?: unknown;