ddd-react 1.10.4 → 1.10.5

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { D as c, e as m, a as F, A as g, b as x, h as U, c as B } from "./h-BbaMkkC7.mjs";
+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 Pt, f as Ot } from "./h-BbaMkkC7.mjs";
 function b(e, t) {
   if (e === null || t === null || e === void 0 || t === void 0)
@@ -31,8 +31,8 @@ function b(e, t) {
       if (!Object.prototype.hasOwnProperty.call(t, r[n]))
         return !1;
     for (let n = 0; n < r.length; ++n) {
-      const s = r[n];
-      if (!(s === "_owner" && e.$$typeof) && !b(e[s], t[s]))
+      const o = r[n];
+      if (!(o === "_owner" && e.$$typeof) && !b(e[o], t[o]))
         return !1;
     }
     return !0;
@@ -40,17 +40,17 @@ function b(e, t) {
   return !1;
 }
 function N(e, t, r, n = null) {
-  function s(i) {
-    const o = i;
-    n ? t.call(n, o) : t(o);
+  function o(i) {
+    const s = i;
+    n ? t.call(n, s) : t(s);
   }
-  return r.addEventListener(e, s), s;
+  return r.addEventListener(e, o), o;
 }
 function I(e = {}, t, r = null) {
   const n = {};
-  return Object.entries(e).forEach(([s, i]) => {
-    n[s] = N(
-      s,
+  return Object.entries(e).forEach(([o, i]) => {
+    n[o] = N(
+      o,
       i,
       t,
       r
@@ -95,8 +95,8 @@ function q(e) {
   t && t.remove();
 }
 function G(e) {
-  const { el: t, children: r, listeners: n, props: s } = e;
-  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), t && t.remove(), r && r.forEach(p), n && t && ($(n, t), delete e.listeners);
+  const { el: t, children: r, listeners: n, props: o } = e;
+  o?.ref && typeof o.ref == "object" && "current" in o.ref && (o.ref.current = null), t && t.remove(), r && r.forEach(p), n && t && ($(n, t), delete e.listeners);
 }
 function _(e) {
   const { children: t } = e;
@@ -113,12 +113,12 @@ function J(e, t) {
   e.style[t] = null;
 }
 function K(e, t) {
-  const { class: r, style: n, ...s } = t;
-  r && W(e, r), n && Object.entries(n).forEach(([i, o]) => {
-    M(e, i, o);
+  const { class: r, style: n, ...o } = t;
+  r && W(e, r), n && Object.entries(n).forEach(([i, s]) => {
+    M(e, i, s);
   });
-  for (const [i, o] of Object.entries(s))
-    w(e, i, o);
+  for (const [i, s] of Object.entries(o))
+    w(e, i, s);
 }
 function W(e, t) {
   if (e instanceof SVGElement) {
@@ -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() {
@@ -165,7 +165,7 @@ function A(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);
@@ -181,8 +181,8 @@ function h(e, t, r = null, n = null) {
     }
     case c.COMPONENT: {
       tt(e, t, r, n);
-      const s = e.component;
-      s && d(() => s.didMount());
+      const o = e.component;
+      o && h(() => o.didMount());
       break;
     }
     case c.PORTAL: {
@@ -194,28 +194,28 @@ function h(e, t, r = null, n = null) {
   }
 }
 function z(e, t, r) {
-  const { value: n } = e, s = document.createTextNode(n);
-  e.el = s, L(s, t, r);
+  const { value: n } = e, o = document.createTextNode(n);
+  e.el = o, L(o, t, r);
 }
 function Q(e, t, r, n) {
-  const { children: s } = e;
-  e.el = t, s?.forEach((i, o) => {
-    h(i, t, r != null ? r + o : null, n);
+  const { children: o } = e;
+  e.el = t, o?.forEach((i, s) => {
+    d(i, t, r != null ? r + s : null, n);
   });
 }
 function Z(e, t, r, n) {
-  const { tag: s, children: i } = e, l = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
+  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) => {
-    h(a, l, null, n);
+    d(a, l, null, n);
   }), L(l, t, r);
 }
 function V(e, t, r) {
-  const { props: n, events: s } = A(t);
-  n.ref && typeof n.ref == "object" && "current" in n.ref && (n.ref.current = e, delete n.ref), t.listeners = I(s, e, r), K(e, n);
+  const { props: n, events: o } = A(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 s = e.tag, { props: i } = A(e), o = new s(i, n);
-  o.mount(t, r), e.component = o, e.el = o.firstElement || null;
+  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;
 }
 function L(e, t, r) {
   if (r == null) {
@@ -229,8 +229,8 @@ function L(e, t, r) {
 }
 function et(e, t) {
   const { children: r, container: n } = e;
-  r?.forEach((s) => {
-    h(s, n, null, t);
+  r?.forEach((o) => {
+    d(o, n, null, t);
   });
 }
 function j(e, t) {
@@ -238,17 +238,17 @@ function j(e, t) {
     return !1;
   if (e.type === c.ELEMENT) {
     const r = e, n = t, {
-      tag: s,
+      tag: o,
       props: { key: i }
     } = r, {
-      tag: o,
+      tag: s,
       props: { key: l }
     } = n;
-    return s === o && i === l;
+    return o === s && i === l;
   }
   if (e.type === c.COMPONENT) {
-    const r = e, n = t, { tag: s } = r, { tag: i } = n;
-    return s === i;
+    const r = e, n = t, { tag: o } = r, { tag: i } = n;
+    return o === i;
   }
   if (e.type === c.PORTAL) {
     const r = e, n = t;
@@ -256,32 +256,32 @@ function j(e, t) {
   }
   return !0;
 }
-function S(e, t) {
-  const r = Object.keys(e), n = Object.keys(t), s = [], i = [];
-  for (const o of n)
-    o in e ? e[o] !== t[o] && i.push(o) : s.push(o);
+function C(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);
   return {
-    added: s,
-    removed: r.filter((o) => !(o in t)),
+    added: o,
+    removed: r.filter((s) => !(s in t)),
     updated: i
   };
 }
 function rt(e) {
   return e !== "";
 }
-function C(e) {
+function S(e) {
   return rt(e.trim());
 }
-function y(e, t, r, n = null) {
+function E(e, t, r, n = null) {
   if (!j(e, t)) {
-    const s = nt(r, e.el);
-    return p(e), h(t, r, s, n), t;
+    const o = nt(r, e.el);
+    return p(e), d(t, r, o, n), t;
   }
   switch (t.el = e.el, t.type) {
     case c.TEXT:
-      return st(e, t), t;
+      return ot(e, t), t;
     case c.ELEMENT: {
-      ot(e, t, n);
+      st(e, t, n);
       break;
     }
     case c.COMPONENT: {
@@ -293,94 +293,94 @@ function y(e, t, r, n = null) {
       break;
     }
   }
-  return R(e, t, n), t;
+  return F(e, t, n), t;
 }
 function nt(e, t) {
   if (!t) return null;
   const r = Array.from(e.childNodes).indexOf(t);
   return r < 0 ? null : r;
 }
-function st(e, t) {
-  const r = e.el, { value: n } = e, { value: s } = t;
-  n !== s && r && (r.nodeValue = s);
+function ot(e, t) {
+  const r = e.el, { value: n } = e, { value: o } = t;
+  n !== o && r && (r.nodeValue = o);
 }
-function ot(e, t, r) {
+function st(e, t, r) {
   const n = e.el, {
-    class: s,
+    class: o,
     style: i,
-    on: o,
+    on: s,
     ...l
   } = e.props ?? {}, {
     class: a,
     style: u,
     on: f,
-    ...E
+    ...y
   } = t.props ?? {}, { listeners: v } = e;
-  it(n, l, E), ct(n, s, a), ut(
+  it(n, l, y), ct(n, o, a), ut(
     n,
     i,
     u
   ), t.listeners = lt(
     n,
     v,
-    o ?? {},
+    s ?? {},
     f ?? {},
     r
   );
 }
 function it(e, t = {}, r = {}) {
-  const n = t.ref, s = r.ref;
-  n !== s && (n && typeof n == "object" && "current" in n && (n.current = null), s && typeof s == "object" && "current" in s && (s.current = e));
-  const i = { ...t }, o = { ...r };
-  delete i.ref, delete o.ref;
-  const { added: l, removed: a, updated: u } = S(i, o);
+  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 } = C(i, s);
   for (const f of a)
     D(e, f);
   for (const f of l.concat(u))
-    w(e, f, o[f]);
+    w(e, f, s[f]);
 }
 function ct(e, t, r) {
-  const n = T(t), s = T(r), { added: i, removed: o } = x(n, s);
-  o.length > 0 && e.classList.remove(...o), i.length > 0 && e.classList.add(...i);
+  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);
 }
-function T(e = "") {
-  return Array.isArray(e) ? e.filter(C) : String(e).split(/(\s+)/).filter(C);
+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: s, updated: i } = S(t, r);
-  for (const o of s)
-    J(e, o);
-  for (const o of n.concat(i))
-    M(e, o, r[o]);
-}
-function lt(e, t = {}, r = {}, n = {}, s = null) {
-  const { removed: i, added: o, updated: l } = S(r, n);
+  const { added: n, removed: o, updated: i } = C(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);
   for (const u of i.concat(l)) {
     const f = t?.[u];
     f && e.removeEventListener(u, f);
   }
   const a = {};
-  for (const u of o.concat(l))
+  for (const u of s.concat(l))
     a[u] = N(
       u,
       n[u],
       e,
-      s
+      o
     );
   return a;
 }
-function R(e, t, r) {
-  const n = m(e), s = m(t), i = e.el, o = F(n, s, j), l = r?.offset ?? 0;
-  for (const a of o)
+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) {
       const { originalIndex: u, index: f } = a;
-      y(n[u], s[f], i, r);
+      E(n[u], o[f], i, r);
     }
-  for (const a of o)
+  for (const a of s)
     switch (a.op) {
       case g.MOVE: {
-        const { from: u, index: f } = a, E = n[u].el, v = i.childNodes[f + l];
-        E && (i.insertBefore(E, v), y(n[u], s[f], i, r));
+        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));
         break;
       }
       case g.REMOVE: {
@@ -390,7 +390,7 @@ function R(e, t, r) {
       }
       case g.ADD: {
         const { index: u, item: f } = a;
-        h(f, i, u + l, r);
+        d(f, i, u + l, r);
         break;
       }
     }
@@ -401,13 +401,13 @@ function at(e, t) {
 }
 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;
   }
-  R(e, t, r);
+  F(e, t, r);
 }
-const ht = (e) => e.isProvider, dt = (e) => e.isConsumer;
-class k {
+const dt = (e) => e.isProvider, ht = (e) => e.isConsumer;
+class T {
   isMounted = !1;
   vdom = null;
   hostEl = null;
@@ -433,7 +433,7 @@ class k {
     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);
       });
@@ -470,8 +470,8 @@ class k {
     return this.vdom?.type === c.FRAGMENT && this.hostEl && this.firstElement ? Array.from(this.hostEl.children).indexOf(this.firstElement) : 0;
   }
   updateProps(t) {
-    const n = { ...this.getDefaultProps(), ...this.props, ...t }, s = this.props;
-    this.props = n, !this.shouldComponentUpdate(s, n) && (ht(this) && this.notify(), this.patch(s, this.state));
+    const n = { ...this.getDefaultProps(), ...this.props, ...t }, o = this.props;
+    this.props = n, !this.shouldComponentUpdate(o, n) && (dt(this) && this.notify(), this.patch(o, this.state));
   }
   setState(t) {
     const r = this.state;
@@ -483,24 +483,24 @@ class k {
   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(), h(this.vdom, t, r, this), this.hostEl = t, 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 = E(this.vdom, n, this.hostEl, this), h(() => this.didUpdate(t, r));
       } catch (n) {
         this.handleError(n, "patch");
       }
@@ -538,46 +538,52 @@ class k {
   handleError(t, r) {
     console.log("handleError");
     const n = this.findClosestErrorBoundary();
-    if (console.log("errorBoundary", n), console.log(1), n) {
-      if (console.log(2), n.isMounted) {
-        console.log(3);
-        const i = n.constructor;
-        if (i.getDerivedStateFromError) {
-          console.log(4);
-          const o = i.getDerivedStateFromError(t);
-          n.state = { ...n.state, ...o };
-        }
-        if (n.didCatch(t, {
-          phase: r,
-          failedComponent: this.constructor.name,
-          componentStack: this.getComponentStack()
-        }), n.hostEl && n.vdom) {
-          console.log(5);
-          try {
-            console.log(6);
-            const o = n.render();
-            o && (console.log(7), y(n.vdom, o, n.hostEl, n));
-          } catch (o) {
-            console.log(8), console.error("Error during ErrorBoundary recovery:", o);
-          }
+    if (console.log("errorBoundary", n), n) {
+      console.log("Found error boundary");
+      const i = n.constructor;
+      if (i.getDerivedStateFromError) {
+        console.log("Calling getDerivedStateFromError");
+        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) {
+        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;
+            }
+        } catch (s) {
+          console.error("Error during ErrorBoundary recovery:", s), n.parent && n.parent.handleError(s, r);
         }
       }
       return;
     }
-    console.log(9);
-    const s = this.constructor;
-    if (s.getDerivedStateFromError) {
-      const i = s.getDerivedStateFromError(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 };
     }
-    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 && E(this.vdom, i, this.hostEl, this);
         } catch (i) {
           console.error("Error during error recovery render:", i);
         }
@@ -603,32 +609,32 @@ class k {
     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 yt(e) {
-  class t extends k {
+function Et(e) {
+  class t extends T {
     isProvider = !0;
     render() {
-      let s = [];
-      return Array.isArray(this.props.children) ? s = this.props.children : this.props.children ? s = [this.props.children] : s = [], U(s);
+      let o = [];
+      return Array.isArray(this.props.children) ? o = this.props.children : this.props.children ? o = [this.props.children] : o = [], B(o);
     }
   }
-  class r extends k {
+  class r extends T {
     static contextType = {
       Provider: t,
       defaultValue: e
     };
     isConsumer = !0;
     render() {
-      let s = this.props.children;
-      if (Array.isArray(s))
-        if (s.length === 1 && typeof s[0] == "function")
-          s = s[0];
+      let o = this.props.children;
+      if (Array.isArray(o))
+        if (o.length === 1 && typeof o[0] == "function")
+          o = o[0];
         else
           throw new Error(
             "Consumer: expected single function child, got array"
           );
-      if (typeof s != "function")
+      if (typeof o != "function")
         throw new Error("Consumer: children is not a function");
-      return s(this.context);
+      return o(this.context);
     }
   }
   return {
@@ -637,10 +643,10 @@ function yt(e) {
     defaultValue: e
   };
 }
-function Et(e, t) {
+function yt(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 {
@@ -649,15 +655,15 @@ function gt(e = null) {
 }
 function vt(e, t) {
   const r = Array.isArray(e) ? e : [e];
-  return B(r, t);
+  return U(r, t);
 }
 export {
-  k as Component,
-  yt as createContext,
+  T as Component,
+  Et as createContext,
   vt as createPortal,
   gt as createRef,
   Pt as h,
-  U as hFragment,
+  B as hFragment,
   Ot as hString,
-  Et as render
+  yt as render
 };

package/package.json

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