@rc-component/util 1.0.1 → 1.2.0

package/es/Dom/findDOMNode.d.ts

@@ -9,4 +9,6 @@ export declare function getDOM(node: any): HTMLElement | SVGElement | null;
  */
 export default function findDOMNode<T = Element | Text>(node: React.ReactInstance | HTMLElement | SVGElement | {
     nativeElement: T;
-}): T;
+} | {
+    current: T;
+}): T | null;

package/es/Dom/findDOMNode.js

@@ -1,5 +1,3 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
 export function isDOM(node) {
   // https://developer.mozilla.org/en-US/docs/Web/API/Element
   // Since XULElement is also subclass of Element, we only need HTMLElement and SVGElement
@@ -27,8 +25,11 @@ export default function findDOMNode(node) {
   if (domNode) {
     return domNode;
   }
-  if (node instanceof React.Component) {
-    return ReactDOM.findDOMNode?.(node);
+  if (node && typeof node === 'object' && 'current' in node) {
+    const refDomNode = getDOM(node.current);
+    if (refDomNode) {
+      return refDomNode;
+    }
   }
   return null;
 }

package/es/React/render.d.ts

@@ -4,10 +4,6 @@ declare const MARK = "__rc_react_root__";
 type ContainerType = (Element | DocumentFragment) & {
     [MARK]?: Root;
 };
-/** @private Test usage. Not work in prod */
-export declare function _r(node: React.ReactElement, container: ContainerType): void;
 export declare function render(node: React.ReactElement, container: ContainerType): void;
-/** @private Test usage. Not work in prod */
-export declare function _u(container: ContainerType): void;
 export declare function unmount(container: ContainerType): Promise<void>;
 export {};

package/es/React/render.js

@@ -1,83 +1,19 @@
-import * as ReactDOM from 'react-dom';
-// Let compiler not to search module usage
-const fullClone = {
-  ...ReactDOM
-};
-const {
-  version,
-  render: reactRender,
-  unmountComponentAtNode
-} = fullClone;
-let createRoot;
-try {
-  const mainVersion = Number((version || '').split('.')[0]);
-  if (mainVersion >= 18) {
-    ({
-      createRoot
-    } = fullClone);
-  }
-} catch (e) {
-  // Do nothing;
-}
-function toggleWarning(skip) {
-  const {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
-  } = fullClone;
-  if (__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED && typeof __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED === 'object') {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = skip;
-  }
-}
+import { createRoot } from 'react-dom/client';
 const MARK = '__rc_react_root__';
 
 // ========================== Render ==========================
 
-function modernRender(node, container) {
-  toggleWarning(true);
+export function render(node, container) {
   const root = container[MARK] || createRoot(container);
-  toggleWarning(false);
   root.render(node);
   container[MARK] = root;
 }
-function legacyRender(node, container) {
-  reactRender?.(node, container);
-}
-
-/** @private Test usage. Not work in prod */
-export function _r(node, container) {
-  if (process.env.NODE_ENV !== 'production') {
-    return legacyRender(node, container);
-  }
-}
-export function render(node, container) {
-  if (createRoot) {
-    modernRender(node, container);
-    return;
-  }
-  legacyRender(node, container);
-}
 
 // ========================= Unmount ==========================
-async function modernUnmount(container) {
+export async function unmount(container) {
   // Delay to unmount to avoid React 18 sync warning
   return Promise.resolve().then(() => {
     container[MARK]?.unmount();
     delete container[MARK];
   });
-}
-function legacyUnmount(container) {
-  unmountComponentAtNode(container);
-}
-
-/** @private Test usage. Not work in prod */
-export function _u(container) {
-  if (process.env.NODE_ENV !== 'production') {
-    return legacyUnmount(container);
-  }
-}
-export async function unmount(container) {
-  if (createRoot !== undefined) {
-    // Delay to unmount to avoid React 18 sync warning
-    return modernUnmount(container);
-  }
-  legacyUnmount(container);
 }

package/lib/Dom/findDOMNode.d.ts

@@ -9,4 +9,6 @@ export declare function getDOM(node: any): HTMLElement | SVGElement | null;
  */
 export default function findDOMNode<T = Element | Text>(node: React.ReactInstance | HTMLElement | SVGElement | {
     nativeElement: T;
-}): T;
+} | {
+    current: T;
+}): T | null;

package/lib/Dom/findDOMNode.js

@@ -6,9 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = findDOMNode;
 exports.getDOM = getDOM;
 exports.isDOM = isDOM;
-var _react = _interopRequireDefault(require("react"));
-var _reactDom = _interopRequireDefault(require("react-dom"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function isDOM(node) {
   // https://developer.mozilla.org/en-US/docs/Web/API/Element
   // Since XULElement is also subclass of Element, we only need HTMLElement and SVGElement
@@ -36,8 +33,11 @@ function findDOMNode(node) {
   if (domNode) {
     return domNode;
   }
-  if (node instanceof _react.default.Component) {
-    return _reactDom.default.findDOMNode?.(node);
+  if (node && typeof node === 'object' && 'current' in node) {
+    const refDomNode = getDOM(node.current);
+    if (refDomNode) {
+      return refDomNode;
+    }
   }
   return null;
 }

package/lib/React/render.d.ts

@@ -4,10 +4,6 @@ declare const MARK = "__rc_react_root__";
 type ContainerType = (Element | DocumentFragment) & {
     [MARK]?: Root;
 };
-/** @private Test usage. Not work in prod */
-export declare function _r(node: React.ReactElement, container: ContainerType): void;
 export declare function render(node: React.ReactElement, container: ContainerType): void;
-/** @private Test usage. Not work in prod */
-export declare function _u(container: ContainerType): void;
 export declare function unmount(container: ContainerType): Promise<void>;
 export {};

package/lib/React/render.js

@@ -3,92 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._r = _r;
-exports._u = _u;
 exports.render = render;
 exports.unmount = unmount;
-var ReactDOM = _interopRequireWildcard(require("react-dom"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-// Let compiler not to search module usage
-const fullClone = {
-  ...ReactDOM
-};
-const {
-  version,
-  render: reactRender,
-  unmountComponentAtNode
-} = fullClone;
-let createRoot;
-try {
-  const mainVersion = Number((version || '').split('.')[0]);
-  if (mainVersion >= 18) {
-    ({
-      createRoot
-    } = fullClone);
-  }
-} catch (e) {
-  // Do nothing;
-}
-function toggleWarning(skip) {
-  const {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
-  } = fullClone;
-  if (__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED && typeof __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED === 'object') {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = skip;
-  }
-}
+var _client = require("react-dom/client");
 const MARK = '__rc_react_root__';
 
 // ========================== Render ==========================
 
-function modernRender(node, container) {
-  toggleWarning(true);
-  const root = container[MARK] || createRoot(container);
-  toggleWarning(false);
+function render(node, container) {
+  const root = container[MARK] || (0, _client.createRoot)(container);
   root.render(node);
   container[MARK] = root;
 }
-function legacyRender(node, container) {
-  reactRender?.(node, container);
-}
-
-/** @private Test usage. Not work in prod */
-function _r(node, container) {
-  if (process.env.NODE_ENV !== 'production') {
-    return legacyRender(node, container);
-  }
-}
-function render(node, container) {
-  if (createRoot) {
-    modernRender(node, container);
-    return;
-  }
-  legacyRender(node, container);
-}
 
 // ========================= Unmount ==========================
-async function modernUnmount(container) {
+async function unmount(container) {
   // Delay to unmount to avoid React 18 sync warning
   return Promise.resolve().then(() => {
     container[MARK]?.unmount();
     delete container[MARK];
   });
-}
-function legacyUnmount(container) {
-  unmountComponentAtNode(container);
-}
-
-/** @private Test usage. Not work in prod */
-function _u(container) {
-  if (process.env.NODE_ENV !== 'production') {
-    return legacyUnmount(container);
-  }
-}
-async function unmount(container) {
-  if (createRoot !== undefined) {
-    // Delay to unmount to avoid React 18 sync warning
-    return modernUnmount(container);
-  }
-  legacyUnmount(container);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/util",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "Common Utils For React Component",
   "keywords": [
     "react",