ddd-react 1.10.5 → 1.10.7

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { D as c, e as m, a as R, A as g, b as x, h as B, c as U } from "./h-BbaMkkC7.mjs";
+import { D as c, e as m, a as R, A as E, b as x, h as U, c as B } from "./h-BbaMkkC7.mjs";
 import { d as Pt, f as Ot } from "./h-BbaMkkC7.mjs";
 function b(e, t) {
   if (e === null || t === null || e === void 0 || t === void 0)
@@ -161,7 +161,7 @@ function H() {
   }
   P = !1;
 }
-function A(e) {
+function C(e) {
   const { on: t = {}, ...r } = e.props;
   return delete r.key, { props: r, events: t };
 }
@@ -210,12 +210,16 @@ function Z(e, t, r, n) {
   }), L(l, t, r);
 }
 function V(e, t, r) {
-  const { props: n, events: o } = A(t);
+  const { props: n, events: o } = C(t);
   n.ref && typeof n.ref == "object" && "current" in n.ref && (n.ref.current = e, delete n.ref), t.listeners = I(o, e, r), K(e, n);
 }
 function tt(e, t, r, n) {
-  const o = e.tag, { props: i } = A(e), s = new o(i, n);
-  s.mount(t, r), e.component = s, e.el = s.firstElement || null;
+  const o = e.tag, { props: i } = C(e), s = new o(i, n);
+  try {
+    s.mount(t, r), e.component = s, e.el = s.firstElement || null;
+  } catch {
+    s.vdom && (e.component = s);
+  }
 }
 function L(e, t, r) {
   if (r == null) {
@@ -256,7 +260,7 @@ function j(e, t) {
   }
   return !0;
 }
-function C(e, t) {
+function A(e, t) {
   const r = Object.keys(e), n = Object.keys(t), o = [], i = [];
   for (const s of n)
     s in e ? e[s] !== t[s] && i.push(s) : o.push(s);
@@ -272,7 +276,7 @@ function rt(e) {
 function S(e) {
   return rt(e.trim());
 }
-function E(e, t, r, n = null) {
+function g(e, t, r, n = null) {
   if (!j(e, t)) {
     const o = nt(r, e.el);
     return p(e), d(t, r, o, n), t;
@@ -333,7 +337,7 @@ function it(e, t = {}, r = {}) {
   n !== o && (n && typeof n == "object" && "current" in n && (n.current = null), o && typeof o == "object" && "current" in o && (o.current = e));
   const i = { ...t }, s = { ...r };
   delete i.ref, delete s.ref;
-  const { added: l, removed: a, updated: u } = C(i, s);
+  const { added: l, removed: a, updated: u } = A(i, s);
   for (const f of a)
     D(e, f);
   for (const f of l.concat(u))
@@ -347,14 +351,14 @@ function k(e = "") {
   return Array.isArray(e) ? e.filter(S) : String(e).split(/(\s+)/).filter(S);
 }
 function ut(e, t = {}, r = {}) {
-  const { added: n, removed: o, updated: i } = C(t, r);
+  const { added: n, removed: o, updated: i } = A(t, r);
   for (const s of o)
     J(e, s);
   for (const s of n.concat(i))
     M(e, s, r[s]);
 }
 function lt(e, t = {}, r = {}, n = {}, o = null) {
-  const { removed: i, added: s, updated: l } = C(r, n);
+  const { removed: i, added: s, updated: l } = A(r, n);
   for (const u of i.concat(l)) {
     const f = t?.[u];
     f && e.removeEventListener(u, f);
@@ -372,23 +376,23 @@ function lt(e, t = {}, r = {}, n = {}, o = null) {
 function F(e, t, r) {
   const n = m(e), o = m(t), i = e.el, s = R(n, o, j), l = r?.offset ?? 0;
   for (const a of s)
-    if (a.op === g.NOOP) {
+    if (a.op === E.NOOP) {
       const { originalIndex: u, index: f } = a;
-      E(n[u], o[f], i, r);
+      g(n[u], o[f], i, r);
     }
   for (const a of s)
     switch (a.op) {
-      case g.MOVE: {
+      case E.MOVE: {
         const { from: u, index: f } = a, y = n[u].el, v = i.childNodes[f + l];
-        y && (i.insertBefore(y, v), E(n[u], o[f], i, r));
+        y && (i.insertBefore(y, v), g(n[u], o[f], i, r));
         break;
       }
-      case g.REMOVE: {
+      case E.REMOVE: {
         const { item: u } = a;
         p(u);
         break;
       }
-      case g.ADD: {
+      case E.ADD: {
         const { index: u, item: f } = a;
         d(f, i, u + l, r);
         break;
@@ -396,7 +400,7 @@ function F(e, t, r) {
     }
 }
 function at(e, t) {
-  const { component: r } = e, { props: n } = A(t);
+  const { component: r } = e, { props: n } = C(t);
   r.updateProps(n), t.component = r, t.el = r.firstElement;
 }
 function ft(e, t, r) {
@@ -500,7 +504,7 @@ class T {
       h(() => this.willUpdate(this.props, this.state));
       try {
         const n = this.render();
-        this.vdom = E(this.vdom, n, this.hostEl, this), h(() => this.didUpdate(t, r));
+        this.vdom = g(this.vdom, n, this.hostEl, this), h(() => this.didUpdate(t, r));
       } catch (n) {
         this.handleError(n, "patch");
       }
@@ -546,24 +550,24 @@ class T {
         const s = i.getDerivedStateFromError(t);
         n.state = { ...n.state, ...s };
       }
-      if ((r === "patch" || n.isMounted) && (console.log("Calling componentDidCatch"), n.didCatch(t, {
-        phase: r,
-        failedComponent: this.constructor.name,
-        componentStack: this.getComponentStack()
-      })), n.hostEl) {
+      if (n.hostEl) {
         console.log("Rendering fallback UI");
         try {
           const s = n.render();
-          if (s)
-            if (n.vdom)
-              console.log("Patching ErrorBoundary"), E(n.vdom, s, n.hostEl, n);
-            else {
-              console.log("Mounting ErrorBoundary fallback");
-              const l = n.parent?.offset || 0;
-              n.hostEl && n.hostEl.children.length > 0 && Array.from(n.hostEl.children).forEach((a) => {
-                a.remove();
-              }), d(s, n.hostEl, l, n.parent), n.vdom = s, n.isMounted = !0;
+          if (s && !n.vdom) {
+            if (n.isMounted = !0, !n.vdom) {
+              for (console.log("Mounting ErrorBoundary fallback (first time)"); n.hostEl.firstChild; )
+                n.hostEl.removeChild(n.hostEl.firstChild);
+              d(s, n.hostEl, null, n.parent), n.vdom = s;
             }
+            h(() => {
+              n.didCatch(t, {
+                phase: r,
+                failedComponent: this.constructor.name,
+                componentStack: this.getComponentStack()
+              }), n.didMount();
+            });
+          }
         } catch (s) {
           console.error("Error during ErrorBoundary recovery:", s), n.parent && n.parent.handleError(s, r);
         }
@@ -583,7 +587,7 @@ class T {
       }), this.hostEl && this.isMounted)
         try {
           const i = this.render();
-          i && E(this.vdom, i, this.hostEl, this);
+          i && g(this.vdom, i, this.hostEl, this);
         } catch (i) {
           console.error("Error during error recovery render:", i);
         }
@@ -609,12 +613,12 @@ class T {
     return console.log("isErrorBoundary"), console.log("this.constructor as typeof Component", this.constructor), console.log("(this.constructor as typeof Component).getDerivedStateFromError", this.constructor.getDerivedStateFromError), this.constructor.getDerivedStateFromError !== void 0;
   }
 }
-function Et(e) {
+function yt(e) {
   class t extends T {
     isProvider = !0;
     render() {
       let o = [];
-      return Array.isArray(this.props.children) ? o = this.props.children : this.props.children ? o = [this.props.children] : o = [], B(o);
+      return Array.isArray(this.props.children) ? o = this.props.children : this.props.children ? o = [this.props.children] : o = [], U(o);
     }
   }
   class r extends T {
@@ -643,7 +647,7 @@ function Et(e) {
     defaultValue: e
   };
 }
-function yt(e, t) {
+function Et(e, t) {
   if (!t)
     throw new Error("Container element is not provided for rendering.");
   d(e, t);
@@ -655,15 +659,15 @@ function gt(e = null) {
 }
 function vt(e, t) {
   const r = Array.isArray(e) ? e : [e];
-  return U(r, t);
+  return B(r, t);
 }
 export {
   T as Component,
-  Et as createContext,
+  yt as createContext,
   vt as createPortal,
   gt as createRef,
   Pt as h,
-  B as hFragment,
+  U as hFragment,
   Ot as hString,
-  yt as render
+  Et as render
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddd-react",
-  "version": "1.10.5",
+  "version": "1.10.7",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "type-check": "tsc --noEmit",