ddd-react 1.10.2 → 1.10.4

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { D as c, e as b, a as x, A as v, b as F, h as U, c as B } from "./h-BbaMkkC7.mjs";
+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 Pt, f as Ot } from "./h-BbaMkkC7.mjs";
-function m(e, t) {
+function b(e, t) {
   if (e === null || t === null || e === void 0 || t === void 0)
     return e === t;
   if (typeof e != typeof t)
@@ -14,7 +14,7 @@ function m(e, t) {
       if (e.length !== t.length)
         return !1;
       for (let n = 0; n < e.length; ++n)
-        if (!m(e[n], t[n]))
+        if (!b(e[n], t[n]))
           return !1;
       return !0;
     }
@@ -32,7 +32,7 @@ function m(e, t) {
         return !1;
     for (let n = 0; n < r.length; ++n) {
       const s = r[n];
-      if (!(s === "_owner" && e.$$typeof) && !m(e[s], t[s]))
+      if (!(s === "_owner" && e.$$typeof) && !b(e[s], t[s]))
         return !1;
     }
     return !0;
@@ -204,10 +204,10 @@ function Q(e, t, r, n) {
   });
 }
 function Z(e, t, r, n) {
-  const { tag: s, children: i } = e, a = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  V(a, e, n), e.el = a, i?.forEach((f) => {
-    h(f, a, null, n);
-  }), L(a, t, r);
+  const { tag: s, children: i } = e, l = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
+  V(l, e, n), e.el = l, i?.forEach((a) => {
+    h(a, l, null, n);
+  }), L(l, t, r);
 }
 function V(e, t, r) {
   const { props: n, events: s } = A(t);
@@ -242,9 +242,9 @@ function j(e, t) {
       props: { key: i }
     } = r, {
       tag: o,
-      props: { key: a }
+      props: { key: l }
     } = n;
-    return s === o && i === a;
+    return s === o && i === l;
   }
   if (e.type === c.COMPONENT) {
     const r = e, n = t, { tag: s } = r, { tag: i } = n;
@@ -269,7 +269,7 @@ function S(e, t) {
 function rt(e) {
   return e !== "";
 }
-function T(e) {
+function C(e) {
   return rt(e.trim());
 }
 function y(e, t, r, n = null) {
@@ -285,11 +285,11 @@ function y(e, t, r, n = null) {
       break;
     }
     case c.COMPONENT: {
-      ft(e, t);
+      at(e, t);
       break;
     }
     case c.PORTAL: {
-      lt(e, t, n);
+      ft(e, t, n);
       break;
     }
   }
@@ -309,22 +309,22 @@ function ot(e, t, r) {
     class: s,
     style: i,
     on: o,
-    ...a
+    ...l
   } = e.props ?? {}, {
-    class: f,
+    class: a,
     style: u,
-    on: l,
+    on: f,
     ...E
-  } = t.props ?? {}, { listeners: g } = e;
-  it(n, a, E), ct(n, s, f), ut(
+  } = t.props ?? {}, { listeners: v } = e;
+  it(n, l, E), ct(n, s, a), ut(
     n,
     i,
     u
-  ), t.listeners = at(
+  ), t.listeners = lt(
     n,
-    g,
+    v,
     o ?? {},
-    l ?? {},
+    f ?? {},
     r
   );
 }
@@ -333,18 +333,18 @@ function it(e, t = {}, r = {}) {
   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: a, removed: f, updated: u } = S(i, o);
-  for (const l of f)
-    D(e, l);
-  for (const l of a.concat(u))
-    w(e, l, o[l]);
+  const { added: l, removed: a, updated: u } = S(i, o);
+  for (const f of a)
+    D(e, f);
+  for (const f of l.concat(u))
+    w(e, f, o[f]);
 }
 function ct(e, t, r) {
-  const n = k(t), s = k(r), { added: i, removed: o } = F(n, s);
+  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);
 }
-function k(e = "") {
-  return Array.isArray(e) ? e.filter(T) : String(e).split(/(\s+)/).filter(T);
+function T(e = "") {
+  return Array.isArray(e) ? e.filter(C) : String(e).split(/(\s+)/).filter(C);
 }
 function ut(e, t = {}, r = {}) {
   const { added: n, removed: s, updated: i } = S(t, r);
@@ -353,53 +353,53 @@ function ut(e, t = {}, r = {}) {
   for (const o of n.concat(i))
     M(e, o, r[o]);
 }
-function at(e, t = {}, r = {}, n = {}, s = null) {
-  const { removed: i, added: o, updated: a } = S(r, n);
-  for (const u of i.concat(a)) {
-    const l = t?.[u];
-    l && e.removeEventListener(u, l);
+function lt(e, t = {}, r = {}, n = {}, s = null) {
+  const { removed: i, added: o, updated: l } = S(r, n);
+  for (const u of i.concat(l)) {
+    const f = t?.[u];
+    f && e.removeEventListener(u, f);
   }
-  const f = {};
-  for (const u of o.concat(a))
-    f[u] = N(
+  const a = {};
+  for (const u of o.concat(l))
+    a[u] = N(
       u,
       n[u],
       e,
       s
     );
-  return f;
+  return a;
 }
 function R(e, t, r) {
-  const n = b(e), s = b(t), i = e.el, o = x(n, s, j), a = r?.offset ?? 0;
-  for (const f of o)
-    if (f.op === v.NOOP) {
-      const { originalIndex: u, index: l } = f;
-      y(n[u], s[l], i, 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)
+    if (a.op === g.NOOP) {
+      const { originalIndex: u, index: f } = a;
+      y(n[u], s[f], i, r);
     }
-  for (const f of o)
-    switch (f.op) {
-      case v.MOVE: {
-        const { from: u, index: l } = f, E = n[u].el, g = i.childNodes[l + a];
-        E && (i.insertBefore(E, g), y(n[u], s[l], i, r));
+  for (const a of o)
+    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));
         break;
       }
-      case v.REMOVE: {
-        const { item: u } = f;
+      case g.REMOVE: {
+        const { item: u } = a;
         p(u);
         break;
       }
-      case v.ADD: {
-        const { index: u, item: l } = f;
-        h(l, i, u + a, r);
+      case g.ADD: {
+        const { index: u, item: f } = a;
+        h(f, i, u + l, r);
         break;
       }
     }
 }
-function ft(e, t) {
+function at(e, t) {
   const { component: r } = e, { props: n } = A(t);
   r.updateProps(n), t.component = r, t.el = r.firstElement;
 }
-function lt(e, t, r) {
+function ft(e, t, r) {
   if (e.container !== t.container) {
     p(e), h(t, document.body, null, r);
     return;
@@ -407,7 +407,7 @@ function lt(e, t, r) {
   R(e, t, r);
 }
 const ht = (e) => e.isProvider, dt = (e) => e.isConsumer;
-class C {
+class k {
   isMounted = !1;
   vdom = null;
   hostEl = null;
@@ -458,10 +458,10 @@ class C {
     return console.error("Uncaught error:", t, r), this.error = t, Promise.resolve();
   }
   shouldComponentUpdate(t, r) {
-    return m(t, r);
+    return b(t, r);
   }
   get elements() {
-    return this.vdom == null ? [] : this.vdom.type === c.FRAGMENT ? b(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 === 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] : [];
   }
   get firstElement() {
     return this.elements[0];
@@ -536,28 +536,35 @@ class C {
     return this.constructor.defaultProps || {};
   }
   handleError(t, r) {
+    console.log("handleError");
     const n = this.findClosestErrorBoundary();
-    if (n && n.isMounted) {
-      const i = n.constructor;
-      if (i.getDerivedStateFromError) {
-        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)
-        try {
-          const o = n.render();
-          if (o) {
-            y(n.vdom, o, n.hostEl, n);
-            return;
+    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);
           }
-        } catch (o) {
-          console.error("Error during ErrorBoundary recovery:", o);
         }
+      }
+      return;
     }
+    console.log(9);
     const s = this.constructor;
     if (s.getDerivedStateFromError) {
       const i = s.getDerivedStateFromError(t);
@@ -593,18 +600,18 @@ class C {
     return null;
   }
   isErrorBoundary() {
-    return this.constructor.getDerivedStateFromError !== void 0;
+    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 C {
+  class t extends k {
     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);
     }
   }
-  class r extends C {
+  class r extends k {
     static contextType = {
       Provider: t,
       defaultValue: e
@@ -635,20 +642,20 @@ function Et(e, t) {
     throw new Error("Container element is not provided for rendering.");
   h(e, t);
 }
-function vt(e = null) {
+function gt(e = null) {
   return {
     current: e
   };
 }
-function gt(e, t) {
+function vt(e, t) {
   const r = Array.isArray(e) ? e : [e];
   return B(r, t);
 }
 export {
-  C as Component,
+  k as Component,
   yt as createContext,
-  gt as createPortal,
-  vt as createRef,
+  vt as createPortal,
+  gt as createRef,
   Pt as h,
   U as hFragment,
   Ot as hString,

package/package.json

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