ddd-react 1.10.16 → 1.12.0

package/dist/component.d.ts

@@ -24,13 +24,13 @@ export declare abstract class Component<P = {}, S = {}, C = null> {
     }): void;
     notify(): void;
     didMount(): void | Promise<void>;
-    willUpdate(nextProps: P, nextState: S): void | Promise<void>;
-    didUpdate(prevProps: P, prevState: S): void | Promise<void>;
+    willUpdate(_nextProps: P, _nextState: S): void | Promise<void>;
+    didUpdate(_prevProps: P, _prevState: S): void | Promise<void>;
     willUnmount(): void | Promise<void>;
     didUnmount(): void | Promise<void>;
     didCatch(error: Error, errorInfo: any): void | Promise<void>;
     shouldComponentUpdate(prevProps: P, nextProps: P): boolean;
-    abstract render(): VDOMNode;
+    abstract render(): VDOMNode | VDOMNode[] | Function | string | null | undefined;
     get elements(): HTMLElement[];
     get firstElement(): HTMLElement | undefined;
     get offset(): number;
@@ -46,4 +46,5 @@ export declare abstract class Component<P = {}, S = {}, C = null> {
     private getComponentStack;
     private findClosestErrorBoundary;
     isErrorBoundary(): boolean;
+    private normalizeRenderResult;
 }

package/dist/{h-BbaMkkC7.mjs → h-DE267foy.mjs}

@@ -165,9 +165,9 @@ export {
   o as D,
   d as a,
   m as b,
-  E as c,
-  I as d,
+  I as c,
+  a as d,
   f as e,
-  a as f,
+  E as f,
   g as h
 };

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { h, hFragment, hString } from './h';
 import { render } from './render';
 import { createRef } from './ref';
 import type { Ref } from './ref';
-import type { ComponentType } from './types/types';
+import type { ComponentType } from './types';
 import { createPortal } from './portal';
 export type { ComponentType, Ref };
 export { Component, createContext, createRef, h, hFragment, hString, render, createPortal };

package/dist/index.mjs

@@ -1,6 +1,5 @@
-import { D as u, e as b, a as x, A as v, b as F, h as U, c as B } from "./h-BbaMkkC7.mjs";
-import { d as Pt, f as Ot } from "./h-BbaMkkC7.mjs";
-function m(e, t) {
+import { D as u, e as m, a as x, A as v, b as U, h as N, c as B, d as I, f as _ } from "./h-DE267foy.mjs";
+function b(e, t) {
   if (e === null || t === null || e === void 0 || t === void 0)
     return e === t;
   if (typeof e != typeof t)
@@ -14,7 +13,7 @@ function m(e, t) {
       if (e.length !== t.length)
         return !1;
       for (let n = 0; n < e.length; ++n)
-        if (!m(e[n], t[n]))
+        if (!b(e[n], t[n]))
           return !1;
       return !0;
     }
@@ -32,24 +31,24 @@ function m(e, t) {
         return !1;
     for (let n = 0; n < r.length; ++n) {
       const s = r[n];
-      if (!(s === "_owner" && e.$$typeof) && !m(e[s], t[s]))
+      if (!(s === "_owner" && e.$$typeof) && !b(e[s], t[s]))
         return !1;
     }
     return !0;
   }
   return !1;
 }
-function N(e, t, r, n = null) {
+function M(e, t, r, n = null) {
   function s(i) {
     const o = i;
     n ? t.call(n, o) : t(o);
   }
   return r.addEventListener(e, s), s;
 }
-function I(e = {}, t, r = null) {
+function $(e = {}, t, r = null) {
   const n = {};
   return Object.entries(e).forEach(([s, i]) => {
-    n[s] = N(
+    n[s] = M(
       s,
       i,
       t,
@@ -57,7 +56,7 @@ function I(e = {}, t, r = null) {
     );
   }), n;
 }
-function $(e = {}, t) {
+function q(e = {}, t) {
   Object.entries(e).forEach(([r, n]) => {
     t.removeEventListener(r, n);
   });
@@ -66,15 +65,15 @@ function p(e) {
   const { type: t } = e;
   switch (t) {
     case u.TEXT: {
-      q(e);
+      G(e);
       break;
     }
     case u.ELEMENT: {
-      G(e);
+      z(e);
       break;
     }
     case u.FRAGMENT: {
-      _(e);
+      X(e);
       break;
     }
     case u.COMPONENT: {
@@ -82,7 +81,7 @@ function p(e) {
       break;
     }
     case u.PORTAL: {
-      X(e);
+      J(e);
       break;
     }
     default:
@@ -90,58 +89,58 @@ function p(e) {
   }
   delete e.el;
 }
-function q(e) {
+function G(e) {
   const { el: t } = e;
   t && t.remove();
 }
-function G(e) {
+function z(e) {
   const { el: t, children: r, listeners: n, props: s } = e;
-  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), t && t.remove(), r && r.forEach(p), n && t && ($(n, t), delete e.listeners);
+  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), t && t.remove(), r && r.forEach(p), n && t && (q(n, t), delete e.listeners);
 }
-function _(e) {
+function X(e) {
   const { children: t } = e;
   t && t.forEach(p);
 }
-function X(e) {
+function J(e) {
   const { children: t } = e;
   t && t.forEach(p);
 }
-function M(e, t, r) {
+function w(e, t, r) {
   e.style[t] = r.toString();
 }
-function J(e, t) {
+function K(e, t) {
   e.style[t] = null;
 }
-function K(e, t) {
+function W(e, t) {
   const { class: r, style: n, ...s } = t;
-  r && W(e, r), n && Object.entries(n).forEach(([i, o]) => {
-    M(e, i, o);
+  r && Y(e, r), n && Object.entries(n).forEach(([i, o]) => {
+    w(e, i, o);
   });
   for (const [i, o] of Object.entries(s))
-    w(e, i, o);
+    D(e, i, o);
 }
-function W(e, t) {
+function Y(e, t) {
   if (e instanceof SVGElement) {
     e.removeAttribute("class"), typeof t == "string" ? e.setAttribute("class", t) : Array.isArray(t) && e.classList.add(...t);
     return;
   }
   e.className = "", typeof t == "string" ? e.className = t : Array.isArray(t) && e.classList.add(...t);
 }
-function w(e, t, r) {
-  r == null ? D(e, t) : e.setAttribute(t, String(r));
+function D(e, t, r) {
+  r == null ? j(e, t) : e.setAttribute(t, String(r));
 }
-function D(e, t) {
+function j(e, t) {
   e[t] = null, e.removeAttribute(t);
 }
 let P = !1;
 const O = [];
-function h(e) {
-  O.push(e), Y();
-}
-function Y() {
-  P || (P = !0, queueMicrotask(H));
+function d(e) {
+  O.push(e), H();
 }
 function H() {
+  P || (P = !0, queueMicrotask(Q));
+}
+function Q() {
   for (; O.length > 0; ) {
     const e = O.shift();
     let t;
@@ -165,59 +164,74 @@ function A(e) {
   const { on: t = {}, ...r } = e.props;
   return delete r.key, { props: r, events: t };
 }
-function d(e, t, r = null, n = null) {
+function h(e, t, r = null, n = null) {
   switch (e.type) {
     case u.TEXT: {
-      z(e, t, r);
+      Z(e, t, r);
       break;
     }
     case u.ELEMENT: {
-      Z(e, t, r, n);
+      tt(
+        e,
+        t,
+        r,
+        n
+      );
       break;
     }
     case u.FRAGMENT: {
-      Q(e, t, r, n);
+      V(
+        e,
+        t,
+        r,
+        n
+      );
       break;
     }
     case u.COMPONENT: {
-      tt(e, t, r, n);
+      rt(
+        e,
+        t,
+        r,
+        n
+      );
       const s = e.component;
-      s && h(() => s.didMount());
+      s && d(() => s.didMount());
       break;
     }
     case u.PORTAL: {
-      et(e, n);
+      nt(e, n);
       break;
     }
     default:
       throw new Error(`Can't mount DOM of type: ${e.type}`);
   }
 }
-function z(e, t, r) {
+function Z(e, t, r) {
   const { value: n } = e, s = document.createTextNode(n);
-  e.el = s, j(s, t, r);
+  e.el = s, L(s, t, r);
 }
-function Q(e, t, r, n) {
+function V(e, t, r, n) {
   const { children: s } = e;
   e.el = t, s?.forEach((i, o) => {
-    d(i, t, r != null ? r + o : null, n);
+    h(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((f) => {
-    d(f, a, null, n);
-  }), j(a, t, r);
+function tt(e, t, r, n) {
+  const { tag: s, children: i } = e, l = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
+  et(l, e, n), e.el = l, i?.forEach((f) => {
+    h(f, l, null, n);
+  }), L(l, t, r);
 }
-function V(e, t, r) {
+function et(e, t, r) {
   const { props: n, events: s } = A(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);
+  n.ref && typeof n.ref == "object" && "current" in n.ref && (n.ref.current = e, delete n.ref), t.listeners = $(s, e, r), W(e, n);
 }
-function tt(e, t, r, n) {
+function rt(e, t, r, n) {
   const s = e.tag, { props: i } = A(e), o = new s(i, n);
   o.mount(t, r), e.component = o, e.el = o.firstElement || null;
 }
-function j(e, t, r) {
+function L(e, t, r) {
   if (r == null) {
     t.append(e);
     return;
@@ -227,13 +241,13 @@ function j(e, t, r) {
   const n = t.childNodes;
   r >= n.length ? t.append(e) : t.insertBefore(e, n[r]);
 }
-function et(e, t) {
+function nt(e, t) {
   const { children: r, container: n } = e;
   r?.forEach((s) => {
-    d(s, n, null, t);
+    h(s, n, null, t);
   });
 }
-function L(e, t) {
+function R(e, t) {
   if (e.type !== t.type)
     return !1;
   if (e.type === u.ELEMENT) {
@@ -242,9 +256,9 @@ function L(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 === u.COMPONENT) {
     const r = e, n = t, { tag: s } = r, { tag: i } = n;
@@ -266,57 +280,68 @@ function S(e, t) {
     updated: i
   };
 }
-function rt(e) {
+function st(e) {
   return e !== "";
 }
 function T(e) {
-  return rt(e.trim());
+  return st(e.trim());
 }
 function y(e, t, r, n = null) {
-  if (!L(e, t)) {
-    const s = nt(r, e.el);
-    return p(e), d(t, r, s, n), t;
+  if (!R(e, t)) {
+    const s = ot(r, e.el);
+    return p(e), h(t, r, s, n), t;
   }
   switch (t.el = e.el, t.type) {
     case u.TEXT:
-      return st(e, t), t;
+      return it(e, t), t;
     case u.ELEMENT: {
-      ot(e, t, n);
+      ct(
+        e,
+        t,
+        n
+      );
       break;
     }
     case u.COMPONENT: {
-      ft(e, t);
+      ht(
+        e,
+        t
+      );
       break;
     }
     case u.PORTAL: {
-      lt(e, t, n);
+      dt(
+        e,
+        t,
+        n
+      );
       break;
     }
   }
-  return R(e, t, n), t;
+  return F(e, t, n), t;
 }
-function nt(e, t) {
+function ot(e, t) {
   if (!t) return null;
   const r = Array.from(e.childNodes).indexOf(t);
   return r < 0 ? null : r;
 }
-function st(e, t) {
+function it(e, t) {
   const r = e.el, { value: n } = e, { value: s } = t;
   n !== s && r && (r.nodeValue = s);
 }
-function ot(e, t, r) {
+function ct(e, t, r) {
   const n = e.el, {
     class: s,
     style: i,
     on: o,
-    ...a
+    ...l
   } = e.props ?? {}, {
     class: f,
     style: c,
-    on: l,
+    on: a,
     ...E
   } = t.props ?? {}, { listeners: g } = e;
-  it(n, a, E), ct(n, s, f), ut(
+  ut(n, l, E), lt(n, s, f), ft(
     n,
     i,
     c
@@ -324,43 +349,46 @@ function ot(e, t, r) {
     n,
     g,
     o ?? {},
-    l ?? {},
+    a ?? {},
     r
   );
 }
-function it(e, t = {}, r = {}) {
+function ut(e, t = {}, r = {}) {
   const n = t.ref, s = r.ref;
   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: f, updated: c } = S(i, o);
-  for (const l of f)
-    D(e, l);
-  for (const l of a.concat(c))
-    w(e, l, o[l]);
+  const { added: l, removed: f, updated: c } = S(
+    i,
+    o
+  );
+  for (const a of f)
+    j(e, a);
+  for (const a of l.concat(c))
+    D(e, a, o[a]);
 }
-function ct(e, t, r) {
-  const n = k(t), s = k(r), { added: i, removed: o } = F(n, s);
+function lt(e, t, r) {
+  const n = k(t), s = k(r), { added: i, removed: o } = U(n, s);
   o.length > 0 && e.classList.remove(...o), i.length > 0 && e.classList.add(...i);
 }
 function k(e = "") {
   return Array.isArray(e) ? e.filter(T) : String(e).split(/(\s+)/).filter(T);
 }
-function ut(e, t = {}, r = {}) {
+function ft(e, t = {}, r = {}) {
   const { added: n, removed: s, updated: i } = S(t, r);
   for (const o of s)
-    J(e, o);
+    K(e, o);
   for (const o of n.concat(i))
-    M(e, o, r[o]);
+    w(e, o, r[o]);
 }
 function at(e, t = {}, r = {}, n = {}, s = null) {
-  const { removed: i, added: o, updated: a } = S(r, n), f = { ...t };
-  for (const c of i.concat(a)) {
-    const l = t?.[c];
-    l && (e.removeEventListener(c, l), delete f[c]);
+  const { removed: i, added: o, updated: l } = S(r, n), f = { ...t };
+  for (const c of i.concat(l)) {
+    const a = t?.[c];
+    a && (e.removeEventListener(c, a), delete f[c]);
   }
-  for (const c of o.concat(a))
-    f[c] = N(
+  for (const c of o.concat(l))
+    f[c] = M(
       c,
       n[c],
       e,
@@ -368,18 +396,32 @@ function at(e, t = {}, r = {}, n = {}, s = null) {
     );
   return f;
 }
-function R(e, t, r) {
-  const n = b(e), s = b(t), i = e.el, o = x(n, s, L), a = r?.offset ?? 0;
+function F(e, t, r) {
+  const n = m(e), s = m(t), i = e.el, o = x(
+    n,
+    s,
+    R
+  ), l = r?.offset ?? 0;
   for (const f of o)
     if (f.op === v.NOOP) {
-      const { originalIndex: c, index: l } = f;
-      y(n[c], s[l], i, r);
+      const { originalIndex: c, index: a } = f;
+      y(
+        n[c],
+        s[a],
+        i,
+        r
+      );
     }
   for (const f of o)
     switch (f.op) {
       case v.MOVE: {
-        const { from: c, index: l } = f, E = n[c].el, g = i.childNodes[l + a];
-        E && (i.insertBefore(E, g), y(n[c], s[l], i, r));
+        const { from: c, index: a } = f, E = n[c].el, g = i.childNodes[a + l];
+        E && (i.insertBefore(E, g), y(
+          n[c],
+          s[a],
+          i,
+          r
+        ));
         break;
       }
       case v.REMOVE: {
@@ -388,24 +430,24 @@ function R(e, t, r) {
         break;
       }
       case v.ADD: {
-        const { index: c, item: l } = f;
-        d(l, i, c + a, r);
+        const { index: c, item: a } = f;
+        h(a, i, c + l, r);
         break;
       }
     }
 }
-function ft(e, t) {
+function ht(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 dt(e, t, r) {
   if (e.container !== t.container) {
-    p(e), d(t, document.body, null, r);
+    p(e), h(t, document.body, null, r);
     return;
   }
-  R(e, t, r);
+  F(e, t, r);
 }
-const ht = (e) => e.isProvider, dt = (e) => e.isConsumer;
+const pt = (e) => e.isProvider, yt = (e) => e.isConsumer;
 class C {
   isMounted = !1;
   vdom = null;
@@ -427,11 +469,13 @@ class C {
     this.dependencies.some((r) => r.consumer === t) || (this.dependencies.push({ consumer: t }), t.subscribedProvider = this);
   }
   removeDependency({ consumer: t }) {
-    const r = this.dependencies.findIndex((n) => n.consumer === t);
+    const r = this.dependencies.findIndex(
+      (n) => n.consumer === t
+    );
     r !== -1 && (this.dependencies.splice(r, 1), t.subscribedProvider = null);
   }
   notify() {
-    h(() => {
+    d(() => {
       this.dependencies.forEach(({ consumer: t }) => {
         t.isMounted && t.updateContext() && t.patch(t.props, t.state);
       });
@@ -456,10 +500,10 @@ class C {
     return console.error("Uncaught error:", t, r), Promise.resolve();
   }
   shouldComponentUpdate(t, r) {
-    return m(t, r);
+    return b(t, r);
   }
   get elements() {
-    return this.vdom == null ? [] : this.vdom.type === u.FRAGMENT ? b(this.vdom).flatMap((t) => t.type === u.COMPONENT && t.component ? t.component.elements : t.el ? [t.el] : []) : this.vdom.el ? [this.vdom.el] : [];
+    return this.vdom == null ? [] : this.vdom.type === u.FRAGMENT ? m(this.vdom).flatMap((t) => t.type === u.COMPONENT && t.component ? t.component.elements : t.el ? [t.el] : []) : this.vdom.el ? [this.vdom.el] : [];
   }
   get firstElement() {
     return this.elements[0];
@@ -469,36 +513,40 @@ class C {
   }
   updateProps(t) {
     const n = { ...this.getDefaultProps(), ...this.props, ...t }, s = this.props;
-    this.props = n, !this.shouldComponentUpdate(s, n) && (ht(this) && this.notify(), this.patch(s, this.state));
+    this.props = n, !this.shouldComponentUpdate(s, n) && (pt(this) && this.notify(), this.patch(s, this.state));
   }
   setState(t) {
     const r = this.state;
     typeof t == "function" ? this.state = {
       ...this.state,
-      ...t(this.state, this.props)
+      ...t(
+        this.state,
+        this.props
+      )
     } : this.state = { ...this.state, ...t }, this.patch(this.props, r);
   }
   mount(t, r = null) {
     if (this.isMounted)
       throw new Error("Component is already mounted");
-    dt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext();
+    yt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext();
     try {
-      this.vdom = this.render(), this.hostEl = t, this.isMounted = !0, d(this.vdom, t, r, this);
+      const n = this.render(), s = this.normalizeRenderResult(n);
+      this.hostEl = t, this.isMounted = !0, s !== null ? (h(s, t, r, this), this.vdom = s) : this.vdom = null;
     } catch (n) {
       this.handleError(n, "mount");
     }
   }
   unmount() {
-    this.isMounted && (h(() => this.willUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: t }) => {
+    this.isMounted && (d(() => this.willUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: t }) => {
       t.subscribedProvider = null;
-    }), this.dependencies = [], this.vdom && p(this.vdom), h(() => this.didUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
+    }), this.dependencies = [], this.vdom && p(this.vdom), d(() => this.didUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
   }
   patch(t, r) {
-    if (!(!this.isMounted || !this.hostEl || !this.vdom)) {
-      h(() => this.willUpdate(this.props, this.state));
+    if (!(!this.isMounted || !this.hostEl)) {
+      d(() => this.willUpdate(this.props, this.state));
       try {
-        const n = this.render();
-        this.vdom = y(this.vdom, n, this.hostEl, this), h(() => this.didUpdate(t, r));
+        const n = this.render(), s = this.normalizeRenderResult(n);
+        this.vdom === null && s !== null ? (h(s, this.hostEl, null, this), this.vdom = s) : this.vdom !== null && s === null ? (p(this.vdom), this.vdom = null) : this.vdom !== null && s !== null && (this.vdom = y(this.vdom, s, this.hostEl, this)), d(() => this.didUpdate(t, r));
       } catch (n) {
         this.handleError(n, "patch");
       }
@@ -544,13 +592,18 @@ class C {
       if (n.hostEl && n.isMounted)
         try {
           const o = n.render();
-          o && (n.vdom = y(n.vdom, o, n.hostEl, n), h(() => {
-            const a = {
+          o && (n.vdom = y(
+            n.vdom,
+            o,
+            n.hostEl,
+            n
+          ), d(() => {
+            const l = {
               phase: r,
               failedComponent: this.constructor.name,
               componentStack: this.getComponentStack()
             };
-            console.error("error", t, a), n.didCatch(t, a);
+            console.error("error", t, l), n.didCatch(t, l);
           }));
         } catch (o) {
           n.parent && n.parent.handleError(o, r);
@@ -562,7 +615,7 @@ class C {
       const i = s.getDerivedStateFromError(t);
       this.state = { ...this.state, ...i };
     }
-    h(() => {
+    d(() => {
       if (this.didCatch(t, {
         phase: r,
         componentStack: this.getComponentStack()
@@ -594,13 +647,16 @@ class C {
   isErrorBoundary() {
     return this.constructor.getDerivedStateFromError !== void 0;
   }
+  normalizeRenderResult(t) {
+    return t == null ? null : Array.isArray(t) ? t.length > 0 ? N(t) : null : typeof t == "function" ? B(t, {}) : typeof t == "string" ? I(t) : t;
+  }
 }
-function yt(e) {
+function vt(e) {
   class t extends C {
     isProvider = !0;
     render() {
       let s = [];
-      return Array.isArray(this.props.children) ? s = this.props.children : this.props.children ? s = [this.props.children] : s = [], U(s);
+      return Array.isArray(this.props.children) ? s = this.props.children : this.props.children ? s = [this.props.children] : s = [], N(s);
     }
   }
   class r extends C {
@@ -629,27 +685,27 @@ function yt(e) {
     defaultValue: e
   };
 }
-function Et(e, t) {
+function gt(e, t) {
   if (!t)
     throw new Error("Container element is not provided for rendering.");
-  d(e, t);
+  h(e, t);
 }
-function vt(e = null) {
+function mt(e = null) {
   return {
     current: e
   };
 }
-function gt(e, t) {
+function bt(e, t) {
   const r = Array.isArray(e) ? e : [e];
-  return B(r, t);
+  return _(r, t);
 }
 export {
   C as Component,
-  yt as createContext,
-  gt as createPortal,
-  vt as createRef,
-  Pt as h,
-  U as hFragment,
-  Ot as hString,
-  Et as render
+  vt as createContext,
+  bt as createPortal,
+  mt as createRef,
+  B as h,
+  N as hFragment,
+  I as hString,
+  gt as render
 };

package/dist/jsx-runtime.mjs

@@ -1,18 +1,18 @@
-import { h as p, d as c, f as a } from "./h-BbaMkkC7.mjs";
-const b = /* @__PURE__ */ Symbol("Fragment");
+import { h as p, c, d as a } from "./h-DE267foy.mjs";
+const h = /* @__PURE__ */ Symbol("Fragment");
 function l(n) {
   return n == null || n === !1 ? null : typeof n == "string" || typeof n == "number" || typeof n == "boolean" ? a(String(n)) : n;
 }
-function j(n, o, ...r) {
-  if (n === b) {
-    const t = r.flat().map(l).filter((e) => e != null);
+function d(n, o, ...s) {
+  if (n === h) {
+    const t = s.flat().map(l).filter((e) => e != null);
     return p(t);
   }
   let f = {}, i = {};
   if (o && Object.entries(o).forEach(([t, e]) => {
     if (t.startsWith("on") && typeof e == "function") {
-      const s = t.slice(2).toLowerCase();
-      f[s] = e;
+      const r = t.slice(2).toLowerCase();
+      f[r] = e;
     } else t === "ref" ? i.ref = e : t === "className" ? i.class = e : t === "style" && typeof e == "object" ? i.style = e : t === "colorInterpolationFilters" ? i["color-interpolation-filters"] = e : t === "viewbox" ? i.viewBox = e : t !== "children" && t !== "key" && (i[t] = e);
   }), typeof n == "function")
     try {
@@ -21,18 +21,22 @@ function j(n, o, ...r) {
     }
   if (typeof n == "function" || typeof n == "object" && n != null && "render" in n) {
     const t = { ...o ?? {} };
-    return r.length > 0 && (t.children = r.flat().map(l).filter((e) => e != null)), c(n, t);
+    if (s.length > 0) {
+      const e = s.flat().map(l).filter((r) => r != null);
+      e.length === 1 ? t.children = e[0] : t.children = e;
+    }
+    return c(n, t);
   }
   f = {}, i = {}, o && Object.entries(o).forEach(([t, e]) => {
     if (t.startsWith("on") && typeof e == "function") {
-      const s = t.slice(2).toLowerCase();
-      f[s] = e;
+      const r = t.slice(2).toLowerCase();
+      f[r] = e;
     } else t === "ref" ? i.ref = e : t === "className" ? i.class = e : t === "style" && typeof e == "object" ? i.style = e : t === "colorInterpolationFilters" ? i["color-interpolation-filters"] = e : t === "filterUnits" ? i.filterUnits = e : t === "clipPath" ? i["clip-path"] = e : t === "floodOpacity" ? i["flood-opacity"] = e : t === "stdDeviation" ? i.stdDeviation = e : t === "viewbox" ? i.viewBox = e : t !== "children" && t !== "key" && (i[t] = e);
   });
-  const m = r.flat().map(l).filter((t) => t != null);
+  const m = s.flat().map(l).filter((t) => t != null);
   return c(n, { ...i, on: f }, m);
 }
 export {
-  b as Fragment,
-  j as jsx
+  h as Fragment,
+  d as jsx
 };

package/dist/types/types.d.ts

@@ -40,7 +40,7 @@ export interface Context<T> {
     defaultValue: T;
 }
 export interface WithChildrenProps {
-    children?: VDOMNode[] | VDOMNode | string | Function;
+    children?: VDOMNode[] | VDOMNode | Function;
 }
 export type ComponentType<Props = any, ComponentState = any, Context = any> = new (props: Props, parentComponent: Component<{}, any, null> | null) => Component<Props, ComponentState, Context>;
 export type Consumer<T> = Component<{}, {}, T>;

package/package.json

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