ddd-react 1.3.11 → 1.5.0

package/dist/component.d.ts

@@ -23,7 +23,7 @@ export declare abstract class Component<P = {}, S = ComponentState, ContextValue
     notify(): void;
     onMount(): void | Promise<void>;
     onUnmount(): void | Promise<void>;
-    onUpdate(): void | Promise<void>;
+    onUpdate(prevProps: P, prevState: S): void | Promise<void>;
     onWillUnmount(): void | Promise<void>;
     abstract render(): VDOMNode;
     get elements(): HTMLElement[];

package/dist/index.mjs

@@ -1,157 +1,157 @@
-import { D as c, e as v, a as U, A as g, b as q, h as I, c as $ } from "./h-BbaMkkC7.mjs";
-import { d as me, f as Oe } from "./h-BbaMkkC7.mjs";
-function E(t, e) {
-  if (t === null || e === null || t === void 0 || e === void 0)
-    return t === e;
-  if (typeof t != typeof e)
+import { D as c, e as v, a as x, A as y, b as F, h as U, c as I } from "./h-BbaMkkC7.mjs";
+import { d as Ot, f as mt } from "./h-BbaMkkC7.mjs";
+function g(e, t) {
+  if (e === null || t === null || e === void 0 || t === void 0)
+    return e === t;
+  if (typeof e != typeof t)
     return !1;
-  if (Object.is(t, e))
+  if (Object.is(e, t))
     return !0;
-  if (typeof t == "object") {
-    if (t.constructor !== e.constructor)
+  if (typeof e == "object") {
+    if (e.constructor !== t.constructor)
       return !1;
-    if (Array.isArray(t)) {
-      if (t.length !== e.length)
+    if (Array.isArray(e)) {
+      if (e.length !== t.length)
         return !1;
-      for (let r = 0; r < t.length; ++r)
-        if (!E(t[r], e[r]))
+      for (let r = 0; r < e.length; ++r)
+        if (!g(e[r], t[r]))
           return !1;
       return !0;
     }
-    if (t.constructor === RegExp)
-      return t.source === e.source && t.flags === e.flags;
-    if (t.valueOf !== Object.prototype.valueOf)
-      return t.valueOf() === e.valueOf();
-    if (t.toString !== Object.prototype.toString)
-      return t.toString() === e.toString();
-    const n = Object.keys(t);
-    if (n.length !== Object.keys(e).length)
+    if (e.constructor === RegExp)
+      return e.source === t.source && e.flags === t.flags;
+    if (e.valueOf !== Object.prototype.valueOf)
+      return e.valueOf() === t.valueOf();
+    if (e.toString !== Object.prototype.toString)
+      return e.toString() === t.toString();
+    const n = Object.keys(e);
+    if (n.length !== Object.keys(t).length)
       return !1;
     for (let r = 0; r < n.length; ++r)
-      if (!Object.prototype.hasOwnProperty.call(e, n[r]))
+      if (!Object.prototype.hasOwnProperty.call(t, n[r]))
         return !1;
     for (let r = 0; r < n.length; ++r) {
       const s = n[r];
-      if (!(s === "_owner" && t.$$typeof) && !E(t[s], e[s]))
+      if (!(s === "_owner" && e.$$typeof) && !g(e[s], t[s]))
         return !1;
     }
     return !0;
   }
   return !1;
 }
-function w(t, e, n, r = null) {
+function S(e, t, n, r = null) {
   function s(o) {
     const i = o;
-    r ? e.call(r, i) : e(i);
+    r ? t.call(r, i) : t(i);
   }
-  return n.addEventListener(t, s), s;
+  return n.addEventListener(e, s), s;
 }
-function G(t = {}, e, n = null) {
+function $(e = {}, t, n = null) {
   const r = {};
-  return Object.entries(t).forEach(([s, o]) => {
-    r[s] = w(
+  return Object.entries(e).forEach(([s, o]) => {
+    r[s] = S(
       s,
       o,
-      e,
+      t,
       n
     );
   }), r;
 }
-function W(t = {}, e) {
-  Object.entries(t).forEach(([n, r]) => {
-    e.removeEventListener(n, r);
+function q(e = {}, t) {
+  Object.entries(e).forEach(([n, r]) => {
+    t.removeEventListener(n, r);
   });
 }
-function p(t) {
-  const { type: e } = t;
-  switch (e) {
+function p(e) {
+  const { type: t } = e;
+  switch (t) {
     case c.TEXT: {
-      B(t);
+      G(e);
       break;
     }
     case c.ELEMENT: {
-      X(t);
+      W(e);
       break;
     }
     case c.FRAGMENT: {
-      _(t);
+      B(e);
       break;
     }
     case c.COMPONENT: {
-      t.component?.unmount();
+      e.component?.unmount();
       break;
     }
     case c.PORTAL: {
-      J(t);
+      X(e);
       break;
     }
     default:
-      throw new Error(`Can't destroy DOM of type: ${e}`);
+      throw new Error(`Can't destroy DOM of type: ${t}`);
   }
-  delete t.el;
+  delete e.el;
 }
-function B(t) {
-  const { el: e } = t;
-  e && e.remove();
+function G(e) {
+  const { el: t } = e;
+  t && t.remove();
 }
-function X(t) {
-  const { el: e, children: n, listeners: r, props: s } = t;
-  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), e && e.remove(), n && n.forEach(p), r && e && (W(r, e), delete t.listeners);
+function W(e) {
+  const { el: t, children: n, listeners: r, props: s } = e;
+  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), t && t.remove(), n && n.forEach(p), r && t && (q(r, t), delete e.listeners);
 }
-function _(t) {
-  const { children: e } = t;
-  e && e.forEach(p);
+function B(e) {
+  const { children: t } = e;
+  t && t.forEach(p);
 }
-function J(t) {
-  const { children: e } = t;
-  e && e.forEach(p);
+function X(e) {
+  const { children: t } = e;
+  t && t.forEach(p);
 }
-function L(t, e, n) {
-  t.style[e] = n.toString();
+function C(e, t, n) {
+  e.style[t] = n.toString();
 }
-function K(t, e) {
-  t.style[e] = null;
+function _(e, t) {
+  e.style[t] = null;
 }
-function Y(t, e) {
-  const { class: n, style: r, ...s } = e;
-  n && H(t, n), r && Object.entries(r).forEach(([o, i]) => {
-    L(t, o, i);
+function J(e, t) {
+  const { class: n, style: r, ...s } = t;
+  n && K(e, n), r && Object.entries(r).forEach(([o, i]) => {
+    C(e, o, i);
   });
   for (const [o, i] of Object.entries(s))
-    j(t, o, i);
+    L(e, o, i);
 }
-function H(t, e) {
-  if (t instanceof SVGElement) {
-    t.removeAttribute("class"), typeof e == "string" ? t.setAttribute("class", e) : Array.isArray(e) && t.classList.add(...e);
+function K(e, t) {
+  if (e instanceof SVGElement) {
+    e.removeAttribute("class"), typeof t == "string" ? e.setAttribute("class", t) : Array.isArray(t) && e.classList.add(...t);
     return;
   }
-  t.className = "", typeof e == "string" ? t.className = e : Array.isArray(e) && t.classList.add(...e);
+  e.className = "", typeof t == "string" ? e.className = t : Array.isArray(t) && e.classList.add(...t);
 }
-function j(t, e, n) {
-  n == null ? x(t, e) : t.setAttribute(e, String(n));
+function L(e, t, n) {
+  n == null ? w(e, t) : e.setAttribute(t, String(n));
 }
-function x(t, e) {
-  t[e] = null, t.removeAttribute(e);
+function w(e, t) {
+  e[t] = null, e.removeAttribute(t);
 }
 let P = !1;
-const m = [];
-function y(t) {
-  m.push(t), z();
+const O = [];
+function E(e) {
+  O.push(e), Y();
 }
-function z() {
-  P || (P = !0, queueMicrotask(Q));
+function Y() {
+  P || (P = !0, queueMicrotask(H));
 }
-function Q() {
-  for (; m.length > 0; ) {
-    const t = m.shift();
-    let e;
+function H() {
+  for (; O.length > 0; ) {
+    const e = O.shift();
+    let t;
     try {
-      e = t();
+      t = e();
     } catch (n) {
       console.error(`[scheduler]: ${n}`);
       continue;
     }
-    Promise.resolve(e).then(
+    Promise.resolve(t).then(
       () => {
       },
       (n) => {
@@ -161,166 +161,166 @@ function Q() {
   }
   P = !1;
 }
-function A(t) {
-  const { on: e = {}, ...n } = t.props;
-  return delete n.key, { props: n, events: e };
+function A(e) {
+  const { on: t = {}, ...n } = e.props;
+  return delete n.key, { props: n, events: t };
 }
-function h(t, e, n = null, r = null) {
-  switch (t.type) {
+function h(e, t, n = null, r = null) {
+  switch (e.type) {
     case c.TEXT: {
-      Z(t, e, n);
+      z(e, t, n);
       break;
     }
     case c.ELEMENT: {
-      ee(t, e, n, r);
+      Z(e, t, n, r);
       break;
     }
     case c.FRAGMENT: {
-      V(t, e, n, r);
+      Q(e, t, n, r);
       break;
     }
     case c.COMPONENT: {
-      ne(t, e, n, r);
-      const s = t.component;
-      s && y(() => s.onMount());
+      tt(e, t, n, r);
+      const s = e.component;
+      s && E(() => s.onMount());
       break;
     }
     case c.PORTAL: {
-      re(t, r);
+      et(e, r);
       break;
     }
     default:
-      throw new Error(`Can't mount DOM of type: ${t.type}`);
+      throw new Error(`Can't mount DOM of type: ${e.type}`);
   }
 }
-function Z(t, e, n) {
-  const { value: r } = t, s = document.createTextNode(r);
-  t.el = s, D(s, e, n);
+function z(e, t, n) {
+  const { value: r } = e, s = document.createTextNode(r);
+  e.el = s, j(s, t, n);
 }
-function V(t, e, n, r) {
-  const { children: s } = t;
-  t.el = e, s?.forEach((o, i) => {
-    h(o, e, n != null ? n + i : null, r);
+function Q(e, t, n, r) {
+  const { children: s } = e;
+  e.el = t, s?.forEach((o, i) => {
+    h(o, t, n != null ? n + i : null, r);
   });
 }
-function ee(t, e, n, r) {
-  const { tag: s, children: o } = t, u = s === "svg" || e instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  te(u, t, r), t.el = u, o?.forEach((f) => {
-    h(f, u, null, r);
-  }), D(u, e, n);
+function Z(e, t, n, r) {
+  const { tag: s, children: o } = e, f = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
+  V(f, e, r), e.el = f, o?.forEach((l) => {
+    h(l, f, null, r);
+  }), j(f, t, n);
 }
-function te(t, e, n) {
-  const { props: r, events: s } = A(e);
-  r.ref && typeof r.ref == "object" && "current" in r.ref && (r.ref.current = t, delete r.ref), e.listeners = G(s, t, n), Y(t, r);
+function V(e, t, n) {
+  const { props: r, events: s } = A(t);
+  r.ref && typeof r.ref == "object" && "current" in r.ref && (r.ref.current = e, delete r.ref), t.listeners = $(s, e, n), J(e, r);
 }
-function ne(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 tt(e, t, n, r) {
+  const s = e.tag, { props: o } = A(e), i = new s(o, r);
+  i.mount(t, n), e.component = i, e.el = i.firstElement || null;
 }
-function D(t, e, n) {
+function j(e, t, n) {
   if (n == null) {
-    e.append(t);
+    t.append(e);
     return;
   }
   if (n < 0)
     throw new Error(`Index must be a positive integer, got ${n}`);
-  const r = e.childNodes;
-  n >= r.length ? e.append(t) : e.insertBefore(t, r[n]);
+  const r = t.childNodes;
+  n >= r.length ? t.append(e) : t.insertBefore(e, r[n]);
 }
-function re(t, e) {
-  const { children: n, container: r } = t;
+function et(e, t) {
+  const { children: n, container: r } = e;
   n?.forEach((s) => {
-    h(s, r, null, e);
+    h(s, r, null, t);
   });
 }
-function R(t, e) {
-  if (t.type !== e.type)
+function D(e, t) {
+  if (e.type !== t.type)
     return !1;
-  if (t.type === c.ELEMENT) {
-    const n = t, r = e, {
+  if (e.type === c.ELEMENT) {
+    const n = e, r = t, {
       tag: s,
       props: { key: o }
     } = n, {
       tag: i,
-      props: { key: u }
+      props: { key: f }
     } = r;
-    return s === i && o === u;
+    return s === i && o === f;
   }
-  if (t.type === c.COMPONENT) {
-    const n = t, r = e, { tag: s } = n, { tag: o } = r;
+  if (e.type === c.COMPONENT) {
+    const n = e, r = t, { tag: s } = n, { tag: o } = r;
     return s === o;
   }
-  if (t.type === c.PORTAL) {
-    const n = t, r = e;
+  if (e.type === c.PORTAL) {
+    const n = e, r = t;
     return n.container === r.container;
   }
   return !0;
 }
-function T(t, e) {
-  const n = Object.keys(t), r = Object.keys(e), s = [], o = [];
+function T(e, t) {
+  const n = Object.keys(e), r = Object.keys(t), s = [], o = [];
   for (const i of r)
-    i in t ? t[i] !== e[i] && o.push(i) : s.push(i);
+    i in e ? e[i] !== t[i] && o.push(i) : s.push(i);
   return {
     added: s,
-    removed: n.filter((i) => !(i in e)),
+    removed: n.filter((i) => !(i in t)),
     updated: o
   };
 }
-function se(t) {
-  return t !== "";
+function nt(e) {
+  return e !== "";
 }
-function N(t) {
-  return se(t.trim());
+function N(e) {
+  return nt(e.trim());
 }
-function O(t, e, n, r = null) {
-  if (!R(t, e)) {
-    const s = oe(n, t.el);
-    return p(t), h(e, n, s, r), e;
+function m(e, t, n, r = null) {
+  if (!D(e, t)) {
+    const s = rt(n, e.el);
+    return p(e), h(t, n, s, r), t;
   }
-  switch (e.el = t.el, e.type) {
+  switch (t.el = e.el, t.type) {
     case c.TEXT:
-      return ie(t, e), e;
+      return st(e, t), t;
     case c.ELEMENT: {
-      ce(t, e, r);
+      ot(e, t, r);
       break;
     }
     case c.COMPONENT: {
-      he(t, e);
+      lt(e, t);
       break;
     }
     case c.PORTAL: {
-      pe(t, e, r);
+      at(e, t, r);
       break;
     }
   }
-  return F(t, e, r), e;
+  return R(e, t, r), t;
 }
-function oe(t, e) {
-  if (!e) return null;
-  const n = Array.from(t.childNodes).indexOf(e);
+function rt(e, t) {
+  if (!t) return null;
+  const n = Array.from(e.childNodes).indexOf(t);
   return n < 0 ? null : n;
 }
-function ie(t, e) {
-  const n = t.el, { value: r } = t, { value: s } = e;
+function st(e, t) {
+  const n = e.el, { value: r } = e, { value: s } = t;
   r !== s && n && (n.nodeValue = s);
 }
-function ce(t, e, n) {
-  const r = t.el, {
+function ot(e, t, n) {
+  const r = e.el, {
     class: s,
     style: o,
     on: i,
-    ...u
-  } = t.props ?? {}, {
-    class: f,
-    style: l,
+    ...f
+  } = e.props ?? {}, {
+    class: l,
+    style: u,
     on: a,
     ...d
-  } = e.props ?? {}, { listeners: b } = t;
-  le(r, u, d), ue(r, s, f), fe(
+  } = t.props ?? {}, { listeners: b } = e;
+  it(r, f, d), ct(r, s, l), ut(
     r,
     o,
-    l
-  ), e.listeners = ae(
+    u
+  ), t.listeners = ft(
     r,
     b,
     i ?? {},
@@ -328,102 +328,99 @@ function ce(t, e, n) {
     n
   );
 }
-function le(t, e = {}, n = {}) {
-  const r = e.ref, s = n.ref;
-  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 };
+function it(e, t = {}, n = {}) {
+  const r = t.ref, s = n.ref;
+  r !== s && (r && typeof r == "object" && "current" in r && (r.current = null), s && typeof s == "object" && "current" in s && (s.current = e));
+  const o = { ...t }, i = { ...n };
   delete o.ref, delete i.ref;
-  const { added: u, removed: f, updated: l } = T(o, i);
-  for (const a of f)
-    x(t, a);
-  for (const a of u.concat(l))
-    j(t, a, i[a]);
+  const { added: f, removed: l, updated: u } = T(o, i);
+  for (const a of l)
+    w(e, a);
+  for (const a of f.concat(u))
+    L(e, a, i[a]);
 }
-function ue(t, e, n) {
-  const r = M(e), s = M(n), { added: o, removed: i } = q(r, s);
-  i.length > 0 && t.classList.remove(...i), o.length > 0 && t.classList.add(...o);
+function ct(e, t, n) {
+  const r = M(t), s = M(n), { added: o, removed: i } = F(r, s);
+  i.length > 0 && e.classList.remove(...i), o.length > 0 && e.classList.add(...o);
 }
-function M(t = "") {
-  return Array.isArray(t) ? t.filter(N) : String(t).split(/(\s+)/).filter(N);
+function M(e = "") {
+  return Array.isArray(e) ? e.filter(N) : String(e).split(/(\s+)/).filter(N);
 }
-function fe(t, e = {}, n = {}) {
-  const { added: r, removed: s, updated: o } = T(e, n);
+function ut(e, t = {}, n = {}) {
+  const { added: r, removed: s, updated: o } = T(t, n);
   for (const i of s)
-    K(t, i);
+    _(e, i);
   for (const i of r.concat(o))
-    L(t, i, n[i]);
-}
-function ae(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] = w(
-      l,
-      r[l],
-      t,
+    C(e, i, n[i]);
+}
+function ft(e, t = {}, n = {}, r = {}, s = null) {
+  const { removed: o, added: i, updated: f } = T(n, r);
+  for (const u of o.concat(f)) {
+    const a = t?.[u];
+    a && e.removeEventListener(u, a);
+  }
+  const l = {};
+  for (const u of i.concat(f))
+    l[u] = S(
+      u,
+      r[u],
+      e,
       s
     );
-  return f;
-}
-function F(t, e, n) {
-  const r = v(t), s = v(e), o = t.el, i = U(r, s, R), u = n?.offset ?? 0;
-  for (const f of i)
-    if (f.op === g.NOOP) {
-      const { originalIndex: l, index: a } = f;
-      O(r[l], s[a], o, n);
+  return l;
+}
+function R(e, t, n) {
+  const r = v(e), s = v(t), o = e.el, i = x(r, s, D), 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);
     }
-  for (const f of i)
-    switch (f.op) {
-      case g.MOVE: {
-        const { from: l, index: a } = f, d = r[l].el, b = o.childNodes[a + u];
-        d && (o.insertBefore(d, b), O(r[l], s[a], o, n));
+  for (const l of i)
+    switch (l.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));
         break;
       }
-      case g.REMOVE: {
-        const { item: l } = f;
-        p(l);
+      case y.REMOVE: {
+        const { item: u } = l;
+        p(u);
         break;
       }
-      case g.ADD: {
-        const { index: l, item: a } = f;
-        h(a, o, l + u, n);
+      case y.ADD: {
+        const { index: u, item: a } = l;
+        h(a, o, u + f, n);
         break;
       }
     }
 }
-function he(t, e) {
-  const { component: n } = t, { props: r } = A(e);
-  n.updateProps(r), e.component = n, e.el = n.firstElement;
+function lt(e, t) {
+  const { component: n } = e, { props: r } = A(t);
+  n.updateProps(r), t.component = n, t.el = n.firstElement;
 }
-function pe(t, e, n) {
-  if (t.container !== e.container) {
-    p(t), h(e, document.body, null, n);
+function at(e, t, n) {
+  if (e.container !== t.container) {
+    p(e), h(t, document.body, null, n);
     return;
   }
-  F(t, e, n);
+  R(e, t, n);
 }
-const k = (t) => (console.log("isProvider"), console.log("component.constructor.name", t.constructor.name), t.isProvider), C = (t) => (console.log("isConsumer"), console.log("component.constructor.name", t.constructor.name), t.isConsumer);
-class S {
-  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.isProvider = !1, this.isConsumer = !1, this.props = e, this.parent = n;
+const ht = (e) => e.isProvider, pt = (e) => e.isConsumer;
+class k {
+  constructor(t = {}, n) {
+    this.isMounted = !1, this.vdom = null, this.hostEl = null, this.parent = null, this.state = {}, this.context = null, this.dependencies = [], this.subscribedProvider = null, this.isProvider = !1, this.isConsumer = !1, this.props = t, this.parent = n;
   }
-  addDependency({ consumer: e }) {
-    this.dependencies.some((n) => n.consumer === e) || (this.dependencies.push({ consumer: e }), e.subscribedProvider = this);
+  addDependency({ consumer: t }) {
+    this.dependencies.some((n) => n.consumer === t) || (this.dependencies.push({ consumer: t }), t.subscribedProvider = this);
   }
-  removeDependency({ consumer: e }) {
-    const n = this.dependencies.findIndex((r) => r.consumer === e);
-    n !== -1 && (this.dependencies.splice(n, 1), e.subscribedProvider = null);
+  removeDependency({ consumer: t }) {
+    const n = this.dependencies.findIndex((r) => r.consumer === t);
+    n !== -1 && (this.dependencies.splice(n, 1), t.subscribedProvider = null);
   }
   notify() {
-    console.log("notify"), console.log("this.dependencies", this.dependencies), this.dependencies.forEach(({ consumer: e }) => {
-      if (console.log("consumer", e), console.log("consumer.isMounted", e.isMounted), e.isMounted) {
-        const n = e.updateContext();
-        console.log("changed", n), n && (console.log("consumer.patch"), e.patch());
-      }
+    this.dependencies.forEach(({ consumer: t }) => {
+      t.isMounted && t.updateContext() && t.patch(t.props, t.state);
     });
   }
   onMount() {
@@ -432,14 +429,14 @@ class S {
   onUnmount() {
     return Promise.resolve();
   }
-  onUpdate() {
+  onUpdate(t, n) {
     return Promise.resolve();
   }
   onWillUnmount() {
     return Promise.resolve();
   }
   get elements() {
-    return this.vdom == null ? [] : this.vdom.type === c.FRAGMENT ? v(this.vdom).flatMap((e) => e.type === c.COMPONENT && e.component ? e.component.elements : e.el ? [e.el] : []) : this.vdom.el ? [this.vdom.el] : [];
+    return this.vdom == null ? [] : this.vdom.type === c.FRAGMENT ? v(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];
@@ -447,61 +444,55 @@ class S {
   get offset() {
     return this.vdom?.type === c.FRAGMENT && this.hostEl && this.firstElement ? Array.from(this.hostEl.children).indexOf(this.firstElement) : 0;
   }
-  updateProps(e) {
-    console.log("updateProps", this);
-    const n = { ...this.props, ...e }, r = this.props;
+  updateProps(t) {
+    const n = { ...this.props, ...t }, r = this.props;
     this.props = n;
     let s = this.updateContext();
-    if (console.log("isEqual(oldProps, newProps)", E(r, n)), console.log("isContextUpdated", s), E(r, n) && !s) {
-      console.log("return");
-      return;
-    }
-    console.log("isProvider(this as Component)", k(this)), k(this) && this.notify(), this.patch();
+    g(r, n) && !s || (ht(this) && this.notify(), this.patch(r, this.state));
   }
-  setState(e) {
-    typeof e == "function" ? this.state = {
+  setState(t) {
+    let n = this.state;
+    typeof t == "function" ? this.state = {
       ...this.state,
-      ...e(this.state, this.props)
-    } : this.state = { ...this.state, ...e }, this.patch();
+      ...t(this.state, this.props)
+    } : this.state = { ...this.state, ...t }, this.patch(this.props, n);
   }
-  mount(e, n = null) {
+  mount(t, n = null) {
     if (this.isMounted)
       throw new Error("Component is already mounted");
-    console.log("this", this), console.log("isConsumer(this as Component)", C(this)), C(this) && !this.subscribedProvider && (console.log(" this.subscribeToProvider()"), this.subscribeToProvider()), this.updateContext(), this.vdom = this.render(), h(this.vdom, e, n, this), this.hostEl = e, this.isMounted = !0;
+    pt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext(), this.vdom = this.render(), h(this.vdom, t, n, this), this.hostEl = t, this.isMounted = !0;
   }
   unmount() {
-    this.isMounted && (y(() => this.onWillUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: e }) => {
-      e.subscribedProvider = null;
-    }), this.dependencies = [], this.vdom && p(this.vdom), y(() => this.onUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
+    this.isMounted && (E(() => 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);
   }
-  patch() {
+  patch(t, n) {
     if (!this.isMounted || !this.hostEl || !this.vdom)
       return;
-    const e = this.render();
-    this.vdom = O(this.vdom, e, this.hostEl, this), y(() => this.onUpdate());
+    const r = this.render();
+    this.vdom = m(this.vdom, r, this.hostEl, this), E(() => this.onUpdate(t, n));
   }
   updateContext() {
-    console.log("updateContext");
-    const e = Object.getPrototypeOf(this).constructor.contextType;
-    console.log("context", e);
+    const t = Object.getPrototypeOf(this).constructor.contextType;
     let n = this.parent;
-    if (e != null) {
-      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;
+    if (t != null) {
+      for (; n; ) {
+        if (Object.getPrototypeOf(n).constructor === t.Provider)
+          return this.context = n.props.value, !0;
         n = n.parent;
       }
-      n == null && (console.log(4), this.context = e.defaultValue);
+      n == null && (this.context = t.defaultValue);
     }
-    return console.log(5), !1;
+    return !1;
   }
   subscribeToProvider() {
-    const e = Object.getPrototypeOf(this).constructor.contextType;
-    if (!e)
+    const t = Object.getPrototypeOf(this).constructor.contextType;
+    if (!t)
       return;
     let n = this.parent;
     for (; n; ) {
-      if (Object.getPrototypeOf(n).constructor === e.Provider) {
+      if (Object.getPrototypeOf(n).constructor === t.Provider) {
         n.addDependency({ consumer: this });
         break;
       }
@@ -509,17 +500,17 @@ class S {
     }
   }
 }
-function ge(t) {
-  class e extends S {
+function yt(e) {
+  class t extends k {
     constructor() {
       super(...arguments), this.isProvider = !0;
     }
     render() {
       let o = [];
-      return Array.isArray(this.props.children) ? o = this.props.children : this.props.children ? o = [this.props.children] : o = [], I(o);
+      return Array.isArray(this.props.children) ? o = this.props.children : this.props.children ? o = [this.props.children] : o = [], U(o);
     }
   }
-  const r = class r extends S {
+  const r = class r extends k {
     constructor() {
       super(...arguments), this.isConsumer = !0;
     }
@@ -538,37 +529,37 @@ function ge(t) {
     }
   };
   r.contextType = {
-    Provider: e,
-    defaultValue: t
+    Provider: t,
+    defaultValue: e
   };
   let n = r;
   return {
-    Provider: e,
+    Provider: t,
     Consumer: n,
-    defaultValue: t
+    defaultValue: e
   };
 }
-function ye(t, e) {
-  if (!e)
+function Et(e, t) {
+  if (!t)
     throw new Error("Container element is not provided for rendering.");
-  h(t, e);
+  h(e, t);
 }
-function Ee(t = null) {
+function bt(e = null) {
   return {
-    current: t
+    current: e
   };
 }
-function be(t, e) {
-  const n = Array.isArray(t) ? t : [t];
-  return $(n, e);
+function vt(e, t) {
+  const n = Array.isArray(e) ? e : [e];
+  return I(n, t);
 }
 export {
-  S as Component,
-  ge as createContext,
-  be as createPortal,
-  Ee as createRef,
-  me as h,
-  I as hFragment,
-  Oe as hString,
-  ye as render
+  k as Component,
+  yt as createContext,
+  vt as createPortal,
+  bt as createRef,
+  Ot as h,
+  U as hFragment,
+  mt as hString,
+  Et as render
 };

package/package.json

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