ddd-react 1.10.9 → 1.10.11

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { D as c, e as m, a as R, A as E, b as x, h as B, c as U } from "./h-BbaMkkC7.mjs";
+import { D as u, e as m, a as R, A as g, 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)
@@ -39,19 +39,19 @@ function b(e, t) {
   }
   return !1;
 }
-function N(e, t, r, n = null) {
-  function o(i) {
-    const s = i;
-    n ? t.call(n, s) : t(s);
+function M(e, t, r, n = null) {
+  function o(s) {
+    const i = s;
+    n ? t.call(n, i) : t(i);
   }
   return r.addEventListener(e, o), o;
 }
 function I(e = {}, t, r = null) {
   const n = {};
-  return Object.entries(e).forEach(([o, i]) => {
-    n[o] = N(
+  return Object.entries(e).forEach(([o, s]) => {
+    n[o] = M(
       o,
-      i,
+      s,
       t,
       r
     );
@@ -65,23 +65,23 @@ function $(e = {}, t) {
 function p(e) {
   const { type: t } = e;
   switch (t) {
-    case c.TEXT: {
+    case u.TEXT: {
       q(e);
       break;
     }
-    case c.ELEMENT: {
+    case u.ELEMENT: {
       G(e);
       break;
     }
-    case c.FRAGMENT: {
+    case u.FRAGMENT: {
       _(e);
       break;
     }
-    case c.COMPONENT: {
+    case u.COMPONENT: {
       e.component?.unmount();
       break;
     }
-    case c.PORTAL: {
+    case u.PORTAL: {
       X(e);
       break;
     }
@@ -106,7 +106,7 @@ function X(e) {
   const { children: t } = e;
   t && t.forEach(p);
 }
-function M(e, t, r) {
+function N(e, t, r) {
   e.style[t] = r.toString();
 }
 function J(e, t) {
@@ -114,11 +114,11 @@ function J(e, t) {
 }
 function K(e, t) {
   const { class: r, style: n, ...o } = t;
-  r && W(e, r), n && Object.entries(n).forEach(([i, s]) => {
-    M(e, i, s);
+  r && W(e, r), n && Object.entries(n).forEach(([s, i]) => {
+    N(e, s, i);
   });
-  for (const [i, s] of Object.entries(o))
-    w(e, i, s);
+  for (const [s, i] of Object.entries(o))
+    w(e, s, i);
 }
 function W(e, t) {
   if (e instanceof SVGElement) {
@@ -135,7 +135,7 @@ function D(e, t) {
 }
 let P = !1;
 const O = [];
-function h(e) {
+function d(e) {
   O.push(e), Y();
 }
 function Y() {
@@ -165,27 +165,27 @@ function C(e) {
   const { on: t = {}, ...r } = e.props;
   return delete r.key, { props: r, events: t };
 }
-function d(e, t, r = null, n = null) {
+function h(e, t, r = null, n = null) {
   switch (e.type) {
-    case c.TEXT: {
+    case u.TEXT: {
       z(e, t, r);
       break;
     }
-    case c.ELEMENT: {
+    case u.ELEMENT: {
       Z(e, t, r, n);
       break;
     }
-    case c.FRAGMENT: {
+    case u.FRAGMENT: {
       Q(e, t, r, n);
       break;
     }
-    case c.COMPONENT: {
+    case u.COMPONENT: {
       tt(e, t, r, n);
       const o = e.component;
-      o && h(() => o.didMount());
+      o && d(() => o.didMount());
       break;
     }
-    case c.PORTAL: {
+    case u.PORTAL: {
       et(e, n);
       break;
     }
@@ -199,23 +199,23 @@ function z(e, t, r) {
 }
 function Q(e, t, r, n) {
   const { children: o } = e;
-  e.el = t, o?.forEach((i, s) => {
-    d(i, t, r != null ? r + s : null, n);
+  e.el = t, o?.forEach((s, i) => {
+    h(s, t, r != null ? r + i : null, n);
   });
 }
 function Z(e, t, r, n) {
-  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);
+  const { tag: o, children: s } = e, c = o === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", o) : document.createElement(o);
+  V(c, e, n), e.el = c, s?.forEach((a) => {
+    h(a, c, null, n);
+  }), L(c, t, r);
 }
 function V(e, t, r) {
   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 } = C(e), s = new o(i, n);
-  s.mount(t, r), e.component = s, e.el = s.firstElement || null;
+  const o = e.tag, { props: s } = C(e), i = new o(s, n);
+  i.mount(t, r), e.component = i, e.el = i.firstElement || null;
 }
 function L(e, t, r) {
   if (r == null) {
@@ -230,65 +230,65 @@ function L(e, t, r) {
 function et(e, t) {
   const { children: r, container: n } = e;
   r?.forEach((o) => {
-    d(o, n, null, t);
+    h(o, n, null, t);
   });
 }
 function j(e, t) {
   if (e.type !== t.type)
     return !1;
-  if (e.type === c.ELEMENT) {
+  if (e.type === u.ELEMENT) {
     const r = e, n = t, {
       tag: o,
-      props: { key: i }
+      props: { key: s }
     } = r, {
-      tag: s,
-      props: { key: l }
+      tag: i,
+      props: { key: c }
     } = n;
-    return o === s && i === l;
+    return o === i && s === c;
   }
-  if (e.type === c.COMPONENT) {
-    const r = e, n = t, { tag: o } = r, { tag: i } = n;
-    return o === i;
+  if (e.type === u.COMPONENT) {
+    const r = e, n = t, { tag: o } = r, { tag: s } = n;
+    return o === s;
   }
-  if (e.type === c.PORTAL) {
+  if (e.type === u.PORTAL) {
     const r = e, n = t;
     return r.container === n.container;
   }
   return !0;
 }
-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);
+function S(e, t) {
+  const r = Object.keys(e), n = Object.keys(t), o = [], s = [];
+  for (const i of n)
+    i in e ? e[i] !== t[i] && s.push(i) : o.push(i);
   return {
     added: o,
-    removed: r.filter((s) => !(s in t)),
-    updated: i
+    removed: r.filter((i) => !(i in t)),
+    updated: s
   };
 }
 function rt(e) {
   return e !== "";
 }
-function S(e) {
+function A(e) {
   return rt(e.trim());
 }
-function g(e, t, r, n = null) {
+function y(e, t, r, n = null) {
   if (!j(e, t)) {
     const o = nt(r, e.el);
-    return p(e), d(t, r, o, n), t;
+    return p(e), h(t, r, o, n), t;
   }
   switch (t.el = e.el, t.type) {
-    case c.TEXT:
+    case u.TEXT:
       return ot(e, t), t;
-    case c.ELEMENT: {
+    case u.ELEMENT: {
       st(e, t, n);
       break;
     }
-    case c.COMPONENT: {
+    case u.COMPONENT: {
       at(e, t);
       break;
     }
-    case c.PORTAL: {
+    case u.PORTAL: {
       ft(e, t, n);
       break;
     }
@@ -307,23 +307,23 @@ function ot(e, t) {
 function st(e, t, r) {
   const n = e.el, {
     class: o,
-    style: i,
-    on: s,
-    ...l
+    style: s,
+    on: i,
+    ...c
   } = e.props ?? {}, {
     class: a,
-    style: u,
+    style: l,
     on: f,
-    ...y
+    ...E
   } = t.props ?? {}, { listeners: v } = e;
-  it(n, l, y), ct(n, o, a), ut(
+  it(n, c, E), ct(n, o, a), ut(
     n,
-    i,
-    u
+    s,
+    l
   ), t.listeners = lt(
     n,
     v,
-    s ?? {},
+    i ?? {},
     f ?? {},
     r
   );
@@ -331,66 +331,66 @@ function st(e, t, r) {
 function it(e, t = {}, r = {}) {
   const n = t.ref, o = r.ref;
   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 } = A(i, s);
+  const s = { ...t }, i = { ...r };
+  delete s.ref, delete i.ref;
+  const { added: c, removed: a, updated: l } = S(s, i);
   for (const f of a)
     D(e, f);
-  for (const f of l.concat(u))
-    w(e, f, s[f]);
+  for (const f of c.concat(l))
+    w(e, f, i[f]);
 }
 function ct(e, t, r) {
-  const n = k(t), o = k(r), { added: i, removed: s } = x(n, o);
-  s.length > 0 && e.classList.remove(...s), i.length > 0 && e.classList.add(...i);
+  const n = k(t), o = k(r), { added: s, removed: i } = x(n, o);
+  i.length > 0 && e.classList.remove(...i), s.length > 0 && e.classList.add(...s);
 }
 function k(e = "") {
-  return Array.isArray(e) ? e.filter(S) : String(e).split(/(\s+)/).filter(S);
+  return Array.isArray(e) ? e.filter(A) : String(e).split(/(\s+)/).filter(A);
 }
 function ut(e, 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]);
+  const { added: n, removed: o, updated: s } = S(t, r);
+  for (const i of o)
+    J(e, i);
+  for (const i of n.concat(s))
+    N(e, i, r[i]);
 }
 function lt(e, t = {}, r = {}, n = {}, o = null) {
-  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 { removed: s, added: i, updated: c } = S(r, n);
+  for (const l of s.concat(c)) {
+    const f = t?.[l];
+    f && e.removeEventListener(l, f);
   }
   const a = {};
-  for (const u of s.concat(l))
-    a[u] = N(
-      u,
-      n[u],
+  for (const l of i.concat(c))
+    a[l] = M(
+      l,
+      n[l],
       e,
       o
     );
   return a;
 }
 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 === E.NOOP) {
-      const { originalIndex: u, index: f } = a;
-      g(n[u], o[f], i, r);
+  const n = m(e), o = m(t), s = e.el, i = R(n, o, j), c = r?.offset ?? 0;
+  for (const a of i)
+    if (a.op === g.NOOP) {
+      const { originalIndex: l, index: f } = a;
+      y(n[l], o[f], s, r);
     }
-  for (const a of s)
+  for (const a of i)
     switch (a.op) {
-      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));
+      case g.MOVE: {
+        const { from: l, index: f } = a, E = n[l].el, v = s.childNodes[f + c];
+        E && (s.insertBefore(E, v), y(n[l], o[f], s, r));
         break;
       }
-      case E.REMOVE: {
-        const { item: u } = a;
-        p(u);
+      case g.REMOVE: {
+        const { item: l } = a;
+        p(l);
         break;
       }
-      case E.ADD: {
-        const { index: u, item: f } = a;
-        d(f, i, u + l, r);
+      case g.ADD: {
+        const { index: l, item: f } = a;
+        h(f, s, l + c, r);
         break;
       }
     }
@@ -401,7 +401,7 @@ function at(e, t) {
 }
 function ft(e, t, r) {
   if (e.container !== t.container) {
-    p(e), d(t, document.body, null, r);
+    p(e), h(t, document.body, null, r);
     return;
   }
   F(e, t, r);
@@ -433,7 +433,7 @@ class T {
     r !== -1 && (this.dependencies.splice(r, 1), t.subscribedProvider = null);
   }
   notify() {
-    h(() => {
+    d(() => {
       this.dependencies.forEach(({ consumer: t }) => {
         t.isMounted && t.updateContext() && t.patch(t.props, t.state);
       });
@@ -461,13 +461,13 @@ class T {
     return b(t, r);
   }
   get elements() {
-    return this.vdom == null ? [] : this.vdom.type === c.FRAGMENT ? m(this.vdom).flatMap((t) => t.type === c.COMPONENT && t.component ? t.component.elements : t.el ? [t.el] : []) : this.vdom.el ? [this.vdom.el] : [];
+    return this.vdom == null ? [] : this.vdom.type === u.FRAGMENT ? m(this.vdom).flatMap((t) => t.type === u.COMPONENT && t.component ? t.component.elements : t.el ? [t.el] : []) : this.vdom.el ? [this.vdom.el] : [];
   }
   get firstElement() {
     return this.elements[0];
   }
   get offset() {
-    return this.vdom?.type === c.FRAGMENT && this.hostEl && this.firstElement ? Array.from(this.hostEl.children).indexOf(this.firstElement) : 0;
+    return this.vdom?.type === u.FRAGMENT && this.hostEl && this.firstElement ? Array.from(this.hostEl.children).indexOf(this.firstElement) : 0;
   }
   updateProps(t) {
     const n = { ...this.getDefaultProps(), ...this.props, ...t }, o = this.props;
@@ -485,22 +485,22 @@ class T {
       throw new Error("Component is already mounted");
     ht(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext();
     try {
-      this.vdom = this.render(), this.hostEl = t, this.isMounted = !0, d(this.vdom, t, r, this);
+      this.vdom = this.render(), this.hostEl = t, this.isMounted = !0, h(this.vdom, t, r, this);
     } catch (n) {
       this.handleError(n, "mount");
     }
   }
   unmount() {
-    this.isMounted && (h(() => this.willUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: t }) => {
+    this.isMounted && (d(() => this.willUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: t }) => {
       t.subscribedProvider = null;
-    }), this.dependencies = [], this.vdom && p(this.vdom), h(() => this.didUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1, this.error = null);
+    }), this.dependencies = [], this.vdom && p(this.vdom), d(() => 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) {
-      h(() => this.willUpdate(this.props, this.state));
+      d(() => this.willUpdate(this.props, this.state));
       try {
         const n = this.render();
-        this.vdom = g(this.vdom, n, this.hostEl, this), h(() => this.didUpdate(t, r));
+        this.vdom = y(this.vdom, n, this.hostEl, this), d(() => this.didUpdate(t, r));
       } catch (n) {
         this.handleError(n, "patch");
       }
@@ -540,21 +540,31 @@ class T {
     const n = this.findClosestErrorBoundary();
     if (console.log("errorBoundary", n), n) {
       console.log("Found error boundary");
-      const i = n.constructor;
-      if (i.getDerivedStateFromError) {
+      const s = n.constructor, i = { ...n.state };
+      if (s.getDerivedStateFromError) {
         console.log("Calling getDerivedStateFromError");
-        const s = i.getDerivedStateFromError(t);
-        n.state = { ...n.state, ...s };
+        const c = s.getDerivedStateFromError(t);
+        n.state = { ...n.state, ...c };
       }
       if (n.hostEl) {
         console.log("Rendering fallback UI");
         try {
-          const s = n.render();
-          if (s) {
-            if (!n.vdom) {
+          const c = n.render();
+          if (c)
+            if (n.vdom) {
+              console.log("ErrorBoundary already mounted, patching");
+              const a = n.vdom;
+              n.vdom = y(a, c, n.hostEl, n), d(() => {
+                n.didCatch(t, {
+                  phase: r,
+                  failedComponent: this.constructor.name,
+                  componentStack: this.getComponentStack()
+                }), n.didUpdate(n.props, i);
+              });
+            } else {
               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, n.isMounted = !0, h(() => {
+              h(c, n.hostEl, null, n.parent), n.vdom = c, n.isMounted = !0, d(() => {
                 n.didCatch(t, {
                   phase: r,
                   failedComponent: this.constructor.name,
@@ -562,10 +572,8 @@ class T {
                 }), n.didMount();
               });
             }
-          } else
-            console.error("ErrorBoundary.render() returned null or undefined!");
-        } catch (s) {
-          console.error("Error during ErrorBoundary recovery:", s), n.parent && n.parent.handleError(s, r);
+        } catch (c) {
+          console.error("Error during ErrorBoundary recovery:", c), n.parent && n.parent.handleError(c, r);
         }
       }
       return;
@@ -573,19 +581,19 @@ class T {
     console.log("No error boundary found, handling locally");
     const o = this.constructor;
     if (o.getDerivedStateFromError) {
-      const i = o.getDerivedStateFromError(t);
-      this.state = { ...this.state, ...i };
+      const s = o.getDerivedStateFromError(t);
+      this.state = { ...this.state, ...s };
     }
-    h(() => {
+    d(() => {
       if (this.didCatch(t, {
         phase: r,
         componentStack: this.getComponentStack()
       }), this.hostEl && this.isMounted)
         try {
-          const i = this.render();
-          i && g(this.vdom, i, this.hostEl, this);
-        } catch (i) {
-          console.error("Error during error recovery render:", i);
+          const s = this.render();
+          s && y(this.vdom, s, this.hostEl, this);
+        } catch (s) {
+          console.error("Error during error recovery render:", s);
         }
     });
   }
@@ -614,7 +622,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 {
@@ -646,7 +654,7 @@ function yt(e) {
 function Et(e, t) {
   if (!t)
     throw new Error("Container element is not provided for rendering.");
-  d(e, t);
+  h(e, t);
 }
 function gt(e = null) {
   return {
@@ -655,7 +663,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,
@@ -663,7 +671,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.9",
+  "version": "1.10.11",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "type-check": "tsc --noEmit",