ddd-react 1.3.4 → 1.3.6

package/README.md

@@ -1 +1,3 @@
-# react-new
+# React v2
+
+[npm](https://www.npmjs.com/package/ddd-react)

package/dist/component.d.ts

@@ -1,6 +1,6 @@
 import type { ComponentState, VDOMNode, WithChildrenProps } from './types';
 export declare abstract class Component<P = {}, S = ComponentState, ContextValueType = null> {
-    private isMounted;
+    isMounted: boolean;
     vdom: VDOMNode | null;
     private hostEl;
     parent: Component | null;

package/dist/index.mjs

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

package/dist/ref.d.ts

@@ -1,4 +1,4 @@
 export interface Ref<T = unknown> {
     current: T | null;
 }
-export declare function createRef<T = unknown>(initialValue?: T): Ref<T>;
+export declare function createRef<T = unknown>(initialValue?: T | null): Ref<T>;

package/package.json

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