ddd-react 1.10.12 → 1.10.13

package/dist/index.mjs

@@ -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 s = e.component;
-      s && d(() => s.didMount());
+      s && h(() => s.didMount());
       break;
     }
     case c.PORTAL: {
@@ -200,21 +200,21 @@ function z(e, 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);
+    d(i, t, r != null ? r + o : null, 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((l) => {
-    h(l, 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) => {
+    d(a, l, null, n);
+  }), L(l, t, r);
 }
 function V(e, t, r) {
-  const { props: n, events: s } = A(t);
+  const { props: n, events: s } = C(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);
 }
 function tt(e, t, r, n) {
-  const s = e.tag, { props: i } = A(e), o = new s(i, n);
+  const s = e.tag, { props: i } = C(e), o = new s(i, n);
   o.mount(t, r), e.component = o, e.el = o.firstElement || null;
 }
 function L(e, t, r) {
@@ -230,7 +230,7 @@ function L(e, t, r) {
 function et(e, t) {
   const { children: r, container: n } = e;
   r?.forEach((s) => {
-    h(s, n, null, t);
+    d(s, n, null, t);
   });
 }
 function j(e, 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;
@@ -256,7 +256,7 @@ function j(e, t) {
   }
   return !0;
 }
-function S(e, t) {
+function A(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);
@@ -269,13 +269,13 @@ function S(e, t) {
 function rt(e) {
   return e !== "";
 }
-function C(e) {
+function S(e) {
   return rt(e.trim());
 }
 function y(e, t, r, n = null) {
   if (!j(e, t)) {
     const s = nt(r, e.el);
-    return p(e), h(t, r, s, n), t;
+    return p(e), d(t, r, s, n), t;
   }
   switch (t.el = e.el, t.type) {
     case c.TEXT:
@@ -285,7 +285,7 @@ function y(e, t, r, n = null) {
       break;
     }
     case c.COMPONENT: {
-      lt(e, t);
+      at(e, t);
       break;
     }
     case c.PORTAL: {
@@ -309,18 +309,18 @@ function ot(e, t, r) {
     class: s,
     style: i,
     on: o,
-    ...a
+    ...l
   } = e.props ?? {}, {
-    class: l,
+    class: a,
     style: u,
     on: f,
     ...E
   } = t.props ?? {}, { listeners: v } = e;
-  it(n, a, E), ct(n, s, l), ut(
+  it(n, l, E), ct(n, s, a), ut(
     n,
     i,
     u
-  ), t.listeners = at(
+  ), t.listeners = lt(
     n,
     v,
     o ?? {},
@@ -333,10 +333,10 @@ 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: l, updated: u } = S(i, o);
-  for (const f of l)
+  const { added: l, removed: a, updated: u } = A(i, o);
+  for (const f of a)
     D(e, f);
-  for (const f of a.concat(u))
+  for (const f of l.concat(u))
     w(e, f, o[f]);
 }
 function ct(e, t, r) {
@@ -344,69 +344,69 @@ function ct(e, t, r) {
   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);
+  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);
+  const { added: n, removed: s, updated: i } = A(t, r);
   for (const o of s)
     J(e, o);
   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)) {
+function lt(e, t = {}, r = {}, n = {}, s = null) {
+  const { removed: i, added: o, updated: l } = A(r, n);
+  for (const u of i.concat(l)) {
     const f = t?.[u];
     f && e.removeEventListener(u, f);
   }
-  const l = {};
-  for (const u of o.concat(a))
-    l[u] = N(
+  const a = {};
+  for (const u of o.concat(l))
+    a[u] = N(
       u,
       n[u],
       e,
       s
     );
-  return l;
+  return a;
 }
 function F(e, t, r) {
-  const n = m(e), s = m(t), i = e.el, o = R(n, s, j), a = r?.offset ?? 0;
-  for (const l of o)
-    if (l.op === g.NOOP) {
-      const { originalIndex: u, index: f } = l;
+  const n = m(e), s = m(t), i = e.el, o = R(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 l of o)
-    switch (l.op) {
+  for (const a of o)
+    switch (a.op) {
       case g.MOVE: {
-        const { from: u, index: f } = l, E = n[u].el, v = i.childNodes[f + a];
+        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 g.REMOVE: {
-        const { item: u } = l;
+        const { item: u } = a;
         p(u);
         break;
       }
       case g.ADD: {
-        const { index: u, item: f } = l;
-        h(f, i, u + a, r);
+        const { index: u, item: f } = a;
+        d(f, i, u + l, r);
         break;
       }
     }
 }
-function lt(e, t) {
-  const { component: r } = e, { props: n } = A(t);
+function at(e, 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 dt = (e) => e.isProvider, ht = (e) => e.isConsumer;
+const ht = (e) => e.isProvider, dt = (e) => e.isConsumer;
 class k {
   isMounted = !1;
   vdom = 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);
       });
@@ -471,7 +471,7 @@ class k {
   }
   updateProps(t) {
     const n = { ...this.getDefaultProps(), ...this.props, ...t }, s = this.props;
-    this.props = n, !this.shouldComponentUpdate(s, n) && (dt(this) && this.notify(), this.patch(s, this.state));
+    this.props = n, !this.shouldComponentUpdate(s, n) && (ht(this) && this.notify(), this.patch(s, 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");
-    ht(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext();
+    dt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext();
     try {
-      this.vdom = this.render(), this.hostEl = t, this.isMounted = !0, h(this.vdom, t, r, this);
+      this.vdom = this.render(), this.hostEl = t, this.isMounted = !0, d(this.vdom, t, r, this);
     } 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 = y(this.vdom, n, this.hostEl, this), h(() => this.didUpdate(t, r));
       } catch (n) {
         this.handleError(n, "patch");
       }
@@ -546,11 +546,13 @@ class k {
         const o = i.getDerivedStateFromError(t);
         n.state = { ...n.state, ...o };
       }
+      for (; n.hostEl.firstChild; )
+        n.hostEl.removeChild(n.hostEl.firstChild);
       if (n.hostEl && n.isMounted) {
         console.log("Rendering fallback UI");
         try {
           const o = n.render();
-          o && (n.vdom = y(n.vdom, o, n.hostEl, n), d(() => {
+          o && (n.vdom = y(n.vdom, o, n.hostEl, n), h(() => {
             n.didCatch(t, {
               phase: r,
               failedComponent: this.constructor.name,
@@ -569,7 +571,7 @@ class k {
       const i = s.getDerivedStateFromError(t);
       this.state = { ...this.state, ...i };
     }
-    d(() => {
+    h(() => {
       if (this.didCatch(t, {
         phase: r,
         componentStack: this.getComponentStack()
@@ -639,7 +641,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 {

package/package.json

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