ddd-react 1.10.6 → 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)
@@ -135,7 +135,7 @@ function D(e, t) {
 }
 let P = !1;
 const O = [];
-function d(e) {
+function h(e) {
   O.push(e), Y();
 }
 function Y() {
@@ -161,11 +161,11 @@ function H() {
   }
   P = !1;
 }
-function A(e) {
+function C(e) {
   const { on: t = {}, ...r } = e.props;
   return delete r.key, { props: r, events: t };
 }
-function h(e, t, r = null, n = null) {
+function d(e, t, r = null, n = null) {
   switch (e.type) {
     case c.TEXT: {
       z(e, t, r);
@@ -182,7 +182,7 @@ function h(e, t, r = null, n = null) {
     case c.COMPONENT: {
       tt(e, t, r, n);
       const o = e.component;
-      o && d(() => o.didMount());
+      o && h(() => o.didMount());
       break;
     }
     case c.PORTAL: {
@@ -200,21 +200,21 @@ function z(e, t, r) {
 function Q(e, t, r, n) {
   const { children: o } = e;
   e.el = t, o?.forEach((i, s) => {
-    h(i, t, r != null ? r + s : null, n);
+    d(i, t, r != null ? r + s : null, n);
   });
 }
 function Z(e, t, r, n) {
-  const { tag: o, children: i } = e, u = o === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", o) : document.createElement(o);
-  V(u, e, n), e.el = u, i?.forEach((a) => {
-    h(a, u, null, n);
-  }), L(u, t, r);
+  const { tag: o, children: i } = e, l = o === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", o) : document.createElement(o);
+  V(l, e, n), e.el = l, i?.forEach((a) => {
+    d(a, l, null, 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);
+  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 {
@@ -234,7 +234,7 @@ function L(e, t, r) {
 function et(e, t) {
   const { children: r, container: n } = e;
   r?.forEach((o) => {
-    h(o, n, null, t);
+    d(o, n, null, t);
   });
 }
 function j(e, t) {
@@ -246,9 +246,9 @@ function j(e, t) {
       props: { key: i }
     } = r, {
       tag: s,
-      props: { key: u }
+      props: { key: l }
     } = n;
-    return o === s && i === u;
+    return o === s && i === l;
   }
   if (e.type === c.COMPONENT) {
     const r = e, n = t, { tag: o } = r, { tag: i } = n;
@@ -260,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);
@@ -276,10 +276,10 @@ function rt(e) {
 function S(e) {
   return rt(e.trim());
 }
-function y(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), h(t, r, o, n), t;
+    return p(e), d(t, r, o, n), t;
   }
   switch (t.el = e.el, t.type) {
     case c.TEXT:
@@ -313,17 +313,17 @@ function st(e, t, r) {
     class: o,
     style: i,
     on: s,
-    ...u
+    ...l
   } = e.props ?? {}, {
     class: a,
-    style: l,
+    style: u,
     on: f,
-    ...E
+    ...y
   } = t.props ?? {}, { listeners: v } = e;
-  it(n, u, E), ct(n, o, a), ut(
+  it(n, l, y), ct(n, o, a), ut(
     n,
     i,
-    l
+    u
   ), t.listeners = lt(
     n,
     v,
@@ -337,10 +337,10 @@ 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: u, removed: a, updated: l } = 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 u.concat(l))
+  for (const f of l.concat(u))
     w(e, f, s[f]);
 }
 function ct(e, t, r) {
@@ -351,66 +351,66 @@ 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: u } = C(r, n);
-  for (const l of i.concat(u)) {
-    const f = t?.[l];
-    f && e.removeEventListener(l, f);
+  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);
   }
   const a = {};
-  for (const l of s.concat(u))
-    a[l] = N(
-      l,
-      n[l],
+  for (const u of s.concat(l))
+    a[u] = N(
+      u,
+      n[u],
       e,
       o
     );
   return a;
 }
 function F(e, t, r) {
-  const n = m(e), o = m(t), i = e.el, s = R(n, o, j), u = r?.offset ?? 0;
+  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) {
-      const { originalIndex: l, index: f } = a;
-      y(n[l], o[f], i, r);
+    if (a.op === E.NOOP) {
+      const { originalIndex: u, index: f } = a;
+      g(n[u], o[f], i, r);
     }
   for (const a of s)
     switch (a.op) {
-      case g.MOVE: {
-        const { from: l, index: f } = a, E = n[l].el, v = i.childNodes[f + u];
-        E && (i.insertBefore(E, v), y(n[l], o[f], i, r));
+      case E.MOVE: {
+        const { from: u, index: f } = a, y = n[u].el, v = i.childNodes[f + l];
+        y && (i.insertBefore(y, v), g(n[u], o[f], i, r));
         break;
       }
-      case g.REMOVE: {
-        const { item: l } = a;
-        p(l);
+      case E.REMOVE: {
+        const { item: u } = a;
+        p(u);
         break;
       }
-      case g.ADD: {
-        const { index: l, item: f } = a;
-        h(f, i, l + u, r);
+      case E.ADD: {
+        const { index: u, item: f } = a;
+        d(f, i, u + l, r);
         break;
       }
     }
 }
 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) {
   if (e.container !== t.container) {
-    p(e), h(t, document.body, null, r);
+    p(e), d(t, document.body, null, r);
     return;
   }
   F(e, t, r);
 }
-const ht = (e) => e.isProvider, dt = (e) => e.isConsumer;
+const dt = (e) => e.isProvider, ht = (e) => e.isConsumer;
 class T {
   isMounted = !1;
   vdom = null;
@@ -437,7 +437,7 @@ class T {
     r !== -1 && (this.dependencies.splice(r, 1), t.subscribedProvider = null);
   }
   notify() {
-    d(() => {
+    h(() => {
       this.dependencies.forEach(({ consumer: t }) => {
         t.isMounted && t.updateContext() && t.patch(t.props, t.state);
       });
@@ -475,7 +475,7 @@ class T {
   }
   updateProps(t) {
     const n = { ...this.getDefaultProps(), ...this.props, ...t }, o = this.props;
-    this.props = n, !this.shouldComponentUpdate(o, n) && (ht(this) && this.notify(), this.patch(o, this.state));
+    this.props = n, !this.shouldComponentUpdate(o, n) && (dt(this) && this.notify(), this.patch(o, this.state));
   }
   setState(t) {
     const r = this.state;
@@ -487,24 +487,24 @@ class T {
   mount(t, r = null) {
     if (this.isMounted)
       throw new Error("Component is already mounted");
-    dt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext();
+    ht(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext();
     try {
-      this.vdom = this.render(), this.hostEl = t, h(this.vdom, t, r, this), this.isMounted = !0;
+      this.vdom = this.render(), this.hostEl = t, d(this.vdom, t, r, this), this.isMounted = !0;
     } catch (n) {
       this.handleError(n, "mount");
     }
   }
   unmount() {
-    this.isMounted && (d(() => this.willUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: t }) => {
+    this.isMounted && (h(() => this.willUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: t }) => {
       t.subscribedProvider = null;
-    }), this.dependencies = [], this.vdom && p(this.vdom), d(() => this.didUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1, this.error = null);
+    }), this.dependencies = [], this.vdom && p(this.vdom), h(() => this.didUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1, this.error = null);
   }
   patch(t, r) {
     if (!(!this.isMounted || !this.hostEl || !this.vdom) && !this.error) {
-      d(() => this.willUpdate(this.props, this.state));
+      h(() => this.willUpdate(this.props, this.state));
       try {
         const n = this.render();
-        this.vdom = y(this.vdom, n, this.hostEl, this), d(() => this.didUpdate(t, r));
+        this.vdom = g(this.vdom, n, this.hostEl, this), h(() => this.didUpdate(t, r));
       } catch (n) {
         this.handleError(n, "patch");
       }
@@ -550,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"), y(n.vdom, s, n.hostEl, n);
-            else {
-              console.log("Mounting ErrorBoundary fallback");
-              const u = n.parent?.offset || 0;
-              n.hostEl && n.hostEl.children.length > 0 && Array.from(n.hostEl.children).forEach((a) => {
-                a.remove();
-              }), h(s, n.hostEl, u, 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);
         }
@@ -580,14 +580,14 @@ class T {
       const i = o.getDerivedStateFromError(t);
       this.state = { ...this.state, ...i };
     }
-    d(() => {
+    h(() => {
       if (this.didCatch(t, {
         phase: r,
         componentStack: this.getComponentStack()
       }), this.hostEl && this.isMounted)
         try {
           const i = this.render();
-          i && y(this.vdom, i, this.hostEl, this);
+          i && g(this.vdom, i, this.hostEl, this);
         } catch (i) {
           console.error("Error during error recovery render:", i);
         }
@@ -618,7 +618,7 @@ function yt(e) {
     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 {
@@ -650,7 +650,7 @@ function yt(e) {
 function Et(e, t) {
   if (!t)
     throw new Error("Container element is not provided for rendering.");
-  h(e, t);
+  d(e, t);
 }
 function gt(e = null) {
   return {
@@ -659,7 +659,7 @@ 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,
@@ -667,7 +667,7 @@ export {
   vt as createPortal,
   gt as createRef,
   Pt as h,
-  B as hFragment,
+  U as hFragment,
   Ot as hString,
   Et as render
 };

package/package.json

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