ddd-react 1.3.6 → 1.3.7

package/dist/index.mjs

@@ -39,7 +39,7 @@ function E(t, e) {
   }
   return !1;
 }
-function C(t, e, n, r = null) {
+function S(t, e, n, r = null) {
   function s(o) {
     const i = o;
     r ? e.call(r, i) : e(i);
@@ -49,7 +49,7 @@ function C(t, e, n, r = null) {
 function $(t = {}, e, n = null) {
   const r = {};
   return Object.entries(t).forEach(([s, o]) => {
-    r[s] = C(
+    r[s] = S(
       s,
       o,
       e,
@@ -195,7 +195,7 @@ function h(t, e, n = null, r = null) {
 }
 function Q(t, e, n) {
   const { value: r } = t, s = document.createTextNode(r);
-  t.el = s, D(s, e, n);
+  t.el = s, x(s, e, n);
 }
 function Z(t, e, n, r) {
   const { children: s } = t;
@@ -204,10 +204,10 @@ function Z(t, e, n, r) {
   });
 }
 function V(t, e, n, r) {
-  const { tag: s, children: o } = t, f = s === "svg" || e instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  ee(f, t, r), t.el = f, o?.forEach((l) => {
-    h(l, f, null, r);
-  }), D(f, e, n);
+  const { tag: s, children: o } = t, u = s === "svg" || e instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
+  ee(u, t, r), t.el = u, o?.forEach((f) => {
+    h(f, u, null, r);
+  }), x(u, e, n);
 }
 function ee(t, e, n) {
   const { props: r, events: s } = A(e);
@@ -217,7 +217,7 @@ function te(t, e, n, r) {
   const s = t.tag, { props: o } = A(t), i = new s(o, r);
   i.mount(e, n), t.component = i, t.el = i.firstElement || null;
 }
-function D(t, e, n) {
+function x(t, e, n) {
   if (n == null) {
     e.append(t);
     return;
@@ -233,7 +233,7 @@ function ne(t, e) {
     h(s, r, null, e);
   });
 }
-function R(t, e) {
+function D(t, e) {
   if (t.type !== e.type)
     return !1;
   if (t.type === c.ELEMENT) {
@@ -242,9 +242,9 @@ function R(t, e) {
       props: { key: o }
     } = n, {
       tag: i,
-      props: { key: f }
+      props: { key: u }
     } = r;
-    return s === i && o === f;
+    return s === i && o === u;
   }
   if (t.type === c.COMPONENT) {
     const n = t, r = e, { tag: s } = n, { tag: o } = r;
@@ -273,7 +273,7 @@ function N(t) {
   return re(t.trim());
 }
 function m(t, e, n, r = null) {
-  if (!R(t, e)) {
+  if (!D(t, e)) {
     const s = se(n, t.el);
     return p(t), h(e, n, s, r), e;
   }
@@ -293,7 +293,7 @@ function m(t, e, n, r = null) {
       break;
     }
   }
-  return x(t, e, r), e;
+  return R(t, e, r), e;
 }
 function se(t, e) {
   if (!e) return null;
@@ -309,18 +309,18 @@ function ie(t, e, n) {
     class: s,
     style: o,
     on: i,
-    ...f
+    ...u
   } = t.props ?? {}, {
-    class: l,
-    style: u,
+    class: f,
+    style: l,
     on: a,
     ...d
   } = e.props ?? {}, { listeners: b } = t;
-  ce(r, f, d), ue(r, s, l), fe(
+  ce(r, u, d), le(r, s, f), ue(
     r,
     o,
-    u
-  ), e.listeners = le(
+    l
+  ), e.listeners = fe(
     r,
     b,
     i ?? {},
@@ -333,64 +333,64 @@ function ce(t, e = {}, n = {}) {
   r !== s && (r && typeof r == "object" && "current" in r && (r.current = null), s && typeof s == "object" && "current" in s && (s.current = t));
   const o = { ...e }, i = { ...n };
   delete o.ref, delete i.ref;
-  const { added: f, removed: l, updated: u } = T(o, i);
-  for (const a of l)
+  const { added: u, removed: f, updated: l } = T(o, i);
+  for (const a of f)
     j(t, a);
-  for (const a of f.concat(u))
+  for (const a of u.concat(l))
     L(t, a, i[a]);
 }
-function ue(t, e, n) {
+function le(t, e, n) {
   const r = M(e), s = M(n), { added: o, removed: i } = U(r, s);
   i.length > 0 && t.classList.remove(...i), o.length > 0 && t.classList.add(...o);
 }
 function M(t = "") {
   return Array.isArray(t) ? t.filter(N) : String(t).split(/(\s+)/).filter(N);
 }
-function fe(t, e = {}, n = {}) {
+function ue(t, e = {}, n = {}) {
   const { added: r, removed: s, updated: o } = T(e, n);
   for (const i of s)
     J(t, i);
   for (const i of r.concat(o))
     w(t, i, n[i]);
 }
-function le(t, e = {}, n = {}, r = {}, s = null) {
-  const { removed: o, added: i, updated: f } = T(n, r);
-  for (const u of o.concat(f)) {
-    const a = e?.[u];
-    a && t.removeEventListener(u, a);
-  }
-  const l = {};
-  for (const u of i.concat(f))
-    l[u] = C(
-      u,
-      r[u],
+function fe(t, e = {}, n = {}, r = {}, s = null) {
+  const { removed: o, added: i, updated: u } = T(n, r);
+  for (const l of o.concat(u)) {
+    const a = e?.[l];
+    a && t.removeEventListener(l, a);
+  }
+  const f = {};
+  for (const l of i.concat(u))
+    f[l] = S(
+      l,
+      r[l],
       t,
       s
     );
-  return l;
-}
-function x(t, e, n) {
-  const r = v(t), s = v(e), o = t.el, i = F(r, s, R), f = n?.offset ?? 0;
-  for (const l of i)
-    if (l.op === y.NOOP) {
-      const { originalIndex: u, index: a } = l;
-      m(r[u], s[a], o, n);
+  return f;
+}
+function R(t, e, n) {
+  const r = v(t), s = v(e), o = t.el, i = F(r, s, D), u = n?.offset ?? 0;
+  for (const f of i)
+    if (f.op === y.NOOP) {
+      const { originalIndex: l, index: a } = f;
+      m(r[l], s[a], o, n);
     }
-  for (const l of i)
-    switch (l.op) {
+  for (const f of i)
+    switch (f.op) {
       case y.MOVE: {
-        const { from: u, index: a } = l, d = r[u].el, b = o.childNodes[a + f];
-        d && (o.insertBefore(d, b), m(r[u], s[a], o, n));
+        const { from: l, index: a } = f, d = r[l].el, b = o.childNodes[a + u];
+        d && (o.insertBefore(d, b), m(r[l], s[a], o, n));
         break;
       }
       case y.REMOVE: {
-        const { item: u } = l;
-        p(u);
+        const { item: l } = f;
+        p(l);
         break;
       }
       case y.ADD: {
-        const { index: u, item: a } = l;
-        h(a, o, u + f, n);
+        const { index: l, item: a } = f;
+        h(a, o, l + u, n);
         break;
       }
     }
@@ -404,10 +404,10 @@ function he(t, e, n) {
     p(t), h(e, document.body, null, n);
     return;
   }
-  x(t, e, n);
+  R(t, e, n);
 }
 const k = (t) => t.constructor.name.includes("Provider"), pe = (t) => t.constructor.name.includes("Consumer");
-class S {
+class C {
   constructor(e = {}, n) {
     this.isMounted = !1, this.vdom = null, this.hostEl = null, this.parent = null, this.state = {}, this.context = null, this.dependencies = [], this.subscribedProvider = null, this.props = e, this.parent = n;
   }
@@ -448,7 +448,7 @@ class S {
     return this.vdom?.type === c.FRAGMENT && this.hostEl && this.firstElement ? Array.from(this.hostEl.children).indexOf(this.firstElement) : 0;
   }
   updateProps(e) {
-    console.log("updateProps");
+    console.log("updateProps", this);
     const n = { ...this.props, ...e }, r = this.props;
     this.props = n;
     let s = this.updateContext();
@@ -481,17 +481,19 @@ class S {
     this.vdom = m(this.vdom, e, this.hostEl, this), g(() => this.onUpdate());
   }
   updateContext() {
+    console.log("updateContext");
     const e = Object.getPrototypeOf(this).constructor.contextType;
+    console.log("context", e);
     let n = this.parent;
     if (e != null) {
-      for (; n; ) {
-        if (Object.getPrototypeOf(n).constructor === e.Provider)
-          return this.context = n.props.value, !0;
+      for (console.log(1); n; ) {
+        if (console.log(2), Object.getPrototypeOf(n).constructor === e.Provider)
+          return this.context = n.props.value, console.log("this.context", this.context), console.log(3), !0;
         n = n.parent;
       }
-      n == null && (this.context = e.defaultValue);
+      n == null && (console.log(4), this.context = e.defaultValue);
     }
-    return !1;
+    return console.log(5), !1;
   }
   subscribeToProvider() {
     const e = Object.getPrototypeOf(this).constructor.contextType;
@@ -508,13 +510,13 @@ class S {
   }
 }
 function ye(t) {
-  class e extends S {
+  class e extends C {
     render() {
       let o = [];
       return Array.isArray(this.props.children) ? o = this.props.children : this.props.children ? o = [this.props.children] : o = [], q(o);
     }
   }
-  const r = class r extends S {
+  const r = class r extends C {
     render() {
       let o = this.props.children;
       if (Array.isArray(o))
@@ -555,7 +557,7 @@ function be(t, e) {
   return I(n, e);
 }
 export {
-  S as Component,
+  C as Component,
   ye as createContext,
   be as createPortal,
   Ee as createRef,

package/package.json

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