ddd-react 1.6.0 → 1.6.2

package/dist/component.d.ts

@@ -11,7 +11,7 @@ export declare abstract class Component<P = {}, S = ComponentState, ContextValue
         consumer: Component;
     }[];
     subscribedProvider: Component<{
-        value: any;
+        value: ContextValueType;
     }> | null;
     isProvider: boolean;
     isConsumer: boolean;

package/dist/index.mjs

@@ -135,7 +135,7 @@ function w(e, t) {
 }
 let P = !1;
 const O = [];
-function E(e) {
+function b(e) {
   O.push(e), Y();
 }
 function Y() {
@@ -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 && E(() => s.onMount());
+      s && b(() => s.onMount());
       break;
     }
     case c.PORTAL: {
@@ -205,8 +205,8 @@ 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) => {
-    h(a, f, null, n);
+  V(f, e, n), e.el = f, i?.forEach((l) => {
+    h(l, f, null, n);
   }), j(f, t, r);
 }
 function V(e, t, r) {
@@ -285,11 +285,11 @@ function m(e, t, r, n = null) {
       break;
     }
     case c.COMPONENT: {
-      at(e, t);
+      lt(e, t);
       break;
     }
     case c.PORTAL: {
-      lt(e, t, n);
+      at(e, t, n);
       break;
     }
   }
@@ -311,20 +311,20 @@ function it(e, t, r) {
     on: o,
     ...f
   } = e.props ?? {}, {
-    class: a,
+    class: l,
     style: u,
-    on: l,
+    on: a,
     ...d
-  } = t.props ?? {}, { listeners: b } = e;
-  ot(n, f, d), ct(n, s, a), ut(
+  } = t.props ?? {}, { listeners: E } = e;
+  ot(n, f, d), ct(n, s, l), ut(
     n,
     i,
     u
   ), t.listeners = ft(
     n,
-    b,
+    E,
     o ?? {},
-    l ?? {},
+    a ?? {},
     r
   );
 }
@@ -333,11 +333,11 @@ function ot(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: u } = T(i, o);
-  for (const l of a)
-    w(e, l);
-  for (const l of f.concat(u))
-    L(e, l, o[l]);
+  const { added: f, removed: l, updated: u } = T(i, o);
+  for (const a of l)
+    w(e, a);
+  for (const a of f.concat(u))
+    L(e, a, o[a]);
 }
 function ct(e, t, r) {
   const n = M(t), s = M(r), { added: i, removed: o } = F(n, s);
@@ -356,50 +356,50 @@ function ut(e, t = {}, r = {}) {
 function ft(e, t = {}, r = {}, n = {}, s = null) {
   const { removed: i, added: o, updated: f } = T(r, n);
   for (const u of i.concat(f)) {
-    const l = t?.[u];
-    l && e.removeEventListener(u, l);
+    const a = t?.[u];
+    a && e.removeEventListener(u, a);
   }
-  const a = {};
+  const l = {};
   for (const u of o.concat(f))
-    a[u] = S(
+    l[u] = S(
       u,
       n[u],
       e,
       s
     );
-  return a;
+  return l;
 }
 function R(e, t, r) {
   const n = v(e), s = v(t), i = e.el, o = x(n, s, D), f = r?.offset ?? 0;
-  for (const a of o)
-    if (a.op === y.NOOP) {
-      const { originalIndex: u, index: l } = a;
-      m(n[u], s[l], i, r);
+  for (const l of o)
+    if (l.op === y.NOOP) {
+      const { originalIndex: u, index: a } = l;
+      m(n[u], s[a], i, r);
     }
-  for (const a of o)
-    switch (a.op) {
+  for (const l of o)
+    switch (l.op) {
       case y.MOVE: {
-        const { from: u, index: l } = a, d = n[u].el, b = i.childNodes[l + f];
-        d && (i.insertBefore(d, b), m(n[u], s[l], i, r));
+        const { from: u, index: a } = l, d = n[u].el, E = i.childNodes[a + f];
+        d && (i.insertBefore(d, E), m(n[u], s[a], i, r));
         break;
       }
       case y.REMOVE: {
-        const { item: u } = a;
+        const { item: u } = l;
         p(u);
         break;
       }
       case y.ADD: {
-        const { index: u, item: l } = a;
-        h(l, i, u + f, r);
+        const { index: u, item: a } = l;
+        h(a, i, u + f, r);
         break;
       }
     }
 }
-function at(e, t) {
+function lt(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 at(e, t, r) {
   if (e.container !== t.container) {
     p(e), h(t, document.body, null, r);
     return;
@@ -463,18 +463,24 @@ class k {
     pt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext(), this.vdom = this.render(), h(this.vdom, t, r, this), this.hostEl = t, this.isMounted = !0;
   }
   unmount() {
-    this.isMounted && (E(() => this.onWillUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: t }) => {
+    this.isMounted && (b(() => this.onWillUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: t }) => {
       t.subscribedProvider = null;
-    }), this.dependencies = [], this.vdom && p(this.vdom), E(() => this.onUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
+    }), this.dependencies = [], this.vdom && p(this.vdom), b(() => this.onUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
   }
   patch(t, r) {
     if (!this.isMounted || !this.hostEl || !this.vdom)
       return;
     const n = this.render();
-    this.vdom = m(this.vdom, n, this.hostEl, this), E(() => this.onUpdate(t, r));
+    this.vdom = m(this.vdom, n, this.hostEl, this), b(() => this.onUpdate(t, r));
   }
   updateContext() {
-    return this.subscribedProvider ? (this.context = this.subscribedProvider.props.value, !0) : !1;
+    const t = Object.getPrototypeOf(this).constructor.contextType;
+    if (t != null) {
+      if (this.subscribedProvider)
+        return console.log("this.subscribedProvider", this.subscribedProvider), this.context = this.subscribedProvider.props.value, !0;
+      this.context = t.defaultValue;
+    }
+    return !1;
   }
   subscribeToProvider() {
     const t = Object.getPrototypeOf(this).constructor.contextType;
@@ -529,12 +535,12 @@ function yt(e) {
     defaultValue: e
   };
 }
-function Et(e, t) {
+function bt(e, t) {
   if (!t)
     throw new Error("Container element is not provided for rendering.");
   h(e, t);
 }
-function bt(e = null) {
+function Et(e = null) {
   return {
     current: e
   };
@@ -547,9 +553,9 @@ export {
   k as Component,
   yt as createContext,
   vt as createPortal,
-  bt as createRef,
+  Et as createRef,
   Ot as h,
   U as hFragment,
   mt as hString,
-  Et as render
+  bt as render
 };

package/package.json

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