ddd-react 1.10.15 → 1.10.16

package/dist/component.d.ts

@@ -4,7 +4,6 @@ export declare abstract class Component<P = {}, S = {}, C = null> {
     vdom: VDOMNode | null;
     private hostEl;
     parent: Component | null;
-    private error;
     static defaultProps: any;
     static getDerivedStateFromError?(error: Error): any;
     props: P & WithChildrenProps;

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { D as u, e as m, a as F, A as v, b as x, h as U, c as B } from "./h-BbaMkkC7.mjs";
+import { D as u, 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 Pt, f as Ot } from "./h-BbaMkkC7.mjs";
-function b(e, t) {
+function m(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 b(e, t) {
       if (e.length !== t.length)
         return !1;
       for (let n = 0; n < e.length; ++n)
-        if (!b(e[n], t[n]))
+        if (!m(e[n], t[n]))
           return !1;
       return !0;
     }
@@ -32,7 +32,7 @@ function b(e, t) {
         return !1;
     for (let n = 0; n < r.length; ++n) {
       const s = r[n];
-      if (!(s === "_owner" && e.$$typeof) && !b(e[s], t[s]))
+      if (!(s === "_owner" && e.$$typeof) && !m(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, f = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  V(f, e, n), e.el = f, i?.forEach((a) => {
-    d(a, f, null, n);
-  }), j(f, t, r);
+  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) => {
+    d(f, a, null, n);
+  }), j(a, t, r);
 }
 function V(e, t, r) {
   const { props: n, events: s } = A(t);
@@ -242,9 +242,9 @@ function L(e, t) {
       props: { key: i }
     } = r, {
       tag: o,
-      props: { key: f }
+      props: { key: a }
     } = n;
-    return s === o && i === f;
+    return s === o && i === a;
   }
   if (e.type === u.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 C(e) {
+function T(e) {
   return rt(e.trim());
 }
 function y(e, t, r, n = null) {
@@ -309,14 +309,14 @@ function ot(e, t, r) {
     class: s,
     style: i,
     on: o,
-    ...f
+    ...a
   } = e.props ?? {}, {
-    class: a,
+    class: f,
     style: c,
     on: l,
     ...E
   } = t.props ?? {}, { listeners: g } = e;
-  it(n, f, E), ct(n, s, a), ut(
+  it(n, a, E), ct(n, s, f), ut(
     n,
     i,
     c
@@ -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: f, removed: a, updated: c } = S(i, o);
-  for (const l of a)
+  const { added: a, removed: f, updated: c } = S(i, o);
+  for (const l of f)
     D(e, l);
-  for (const l of f.concat(c))
+  for (const l of a.concat(c))
     w(e, l, o[l]);
 }
 function ct(e, t, r) {
-  const n = T(t), s = T(r), { added: i, removed: o } = x(n, s);
+  const n = k(t), s = k(r), { added: i, removed: o } = F(n, s);
   o.length > 0 && e.classList.remove(...o), 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(T) : String(e).split(/(\s+)/).filter(T);
 }
 function ut(e, t = {}, r = {}) {
   const { added: n, removed: s, updated: i } = S(t, r);
@@ -354,42 +354,42 @@ function ut(e, t = {}, r = {}) {
     M(e, o, r[o]);
 }
 function at(e, t = {}, r = {}, n = {}, s = null) {
-  const { removed: i, added: o, updated: f } = S(r, n), a = { ...t };
-  for (const c of i.concat(f)) {
+  const { removed: i, added: o, updated: a } = S(r, n), f = { ...t };
+  for (const c of i.concat(a)) {
     const l = t?.[c];
-    l && (e.removeEventListener(c, l), delete a[c]);
+    l && (e.removeEventListener(c, l), delete f[c]);
   }
-  for (const c of o.concat(f))
-    a[c] = N(
+  for (const c of o.concat(a))
+    f[c] = N(
       c,
       n[c],
       e,
       s
     );
-  return a;
+  return f;
 }
 function R(e, t, r) {
-  const n = m(e), s = m(t), i = e.el, o = F(n, s, L), f = r?.offset ?? 0;
-  for (const a of o)
-    if (a.op === v.NOOP) {
-      const { originalIndex: c, index: l } = a;
+  const n = b(e), s = b(t), i = e.el, o = x(n, s, L), a = r?.offset ?? 0;
+  for (const f of o)
+    if (f.op === v.NOOP) {
+      const { originalIndex: c, index: l } = f;
       y(n[c], s[l], i, r);
     }
-  for (const a of o)
-    switch (a.op) {
+  for (const f of o)
+    switch (f.op) {
       case v.MOVE: {
-        const { from: c, index: l } = a, E = n[c].el, g = i.childNodes[l + f];
+        const { from: c, index: l } = f, E = n[c].el, g = i.childNodes[l + a];
         E && (i.insertBefore(E, g), y(n[c], s[l], i, r));
         break;
       }
       case v.REMOVE: {
-        const { item: c } = a;
+        const { item: c } = f;
         p(c);
         break;
       }
       case v.ADD: {
-        const { index: c, item: l } = a;
-        d(l, i, c + f, r);
+        const { index: c, item: l } = f;
+        d(l, i, c + a, r);
         break;
       }
     }
@@ -406,12 +406,11 @@ function lt(e, t, r) {
   R(e, t, r);
 }
 const ht = (e) => e.isProvider, dt = (e) => e.isConsumer;
-class k {
+class C {
   isMounted = !1;
   vdom = null;
   hostEl = null;
   parent = null;
-  error = null;
   static defaultProps = {};
   props;
   state = {};
@@ -454,13 +453,13 @@ class k {
     return Promise.resolve();
   }
   didCatch(t, r) {
-    return console.error("Uncaught error:", t, r), this.error = t, Promise.resolve();
+    return console.error("Uncaught error:", t, r), Promise.resolve();
   }
   shouldComponentUpdate(t, r) {
-    return b(t, r);
+    return m(t, r);
   }
   get elements() {
-    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] : [];
+    return this.vdom == null ? [] : this.vdom.type === u.FRAGMENT ? b(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];
@@ -492,7 +491,7 @@ class k {
   unmount() {
     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), h(() => 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);
   }
   patch(t, r) {
     if (!(!this.isMounted || !this.hostEl || !this.vdom)) {
@@ -546,11 +545,12 @@ class k {
         try {
           const o = n.render();
           o && (n.vdom = y(n.vdom, o, n.hostEl, n), h(() => {
-            n.didCatch(t, {
+            const a = {
               phase: r,
               failedComponent: this.constructor.name,
               componentStack: this.getComponentStack()
-            });
+            };
+            console.error("error", t, a), n.didCatch(t, a);
           }));
         } catch (o) {
           n.parent && n.parent.handleError(o, r);
@@ -592,18 +592,18 @@ class k {
     return null;
   }
   isErrorBoundary() {
-    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;
+    return this.constructor.getDerivedStateFromError !== void 0;
   }
 }
 function yt(e) {
-  class t extends k {
+  class t extends C {
     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 k {
+  class r extends C {
     static contextType = {
       Provider: t,
       defaultValue: e
@@ -644,7 +644,7 @@ function gt(e, t) {
   return B(r, t);
 }
 export {
-  k as Component,
+  C as Component,
   yt as createContext,
   gt as createPortal,
   vt as createRef,

package/package.json

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