Allow numbers in vdom (#781)

dojo · Jun 29, 2020 · e548f88 · e548f88
1 parent 9e7cf35
commit e548f88
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/core/interfaces.d.ts b/src/core/interfaces.d.ts
@@ -1359,7 +1359,7 @@ export interface WNode<W extends WidgetBaseTypes = any> {
 /**
  * union type for all possible return types from render
  */
-export type DNode<W extends WidgetBaseTypes = any> = VNode | WNode<W> | undefined | null | string | boolean;
+export type DNode<W extends WidgetBaseTypes = any> = VNode | WNode<W> | undefined | null | string | boolean | number;
 
 /**
  * Property Change record for specific property diff functions

diff --git a/src/core/vdom.ts b/src/core/vdom.ts
@@ -391,12 +391,18 @@ export function isWNode<W extends WidgetBaseTypes = any>(child: any): child is W
 
 export function isVNode(child: DNode): child is VNode {
 	return Boolean(
-		child && child !== true && typeof child !== 'string' && (child.type === VNODE || child.type === DOMVNODE)
+		child &&
+			child !== true &&
+			typeof child !== 'number' &&
+			typeof child !== 'string' &&
+			(child.type === VNODE || child.type === DOMVNODE)
 	);
 }
 
 export function isDomVNode(child: DNode): child is DomVNode {
-	return Boolean(child && child !== true && typeof child !== 'string' && child.type === DOMVNODE);
+	return Boolean(
+		child && child !== true && typeof child !== 'number' && typeof child !== 'string' && child.type === DOMVNODE
+	);
 }
 
 export function isElementNode(value: any): value is Element {
@@ -1399,7 +1405,7 @@ export function renderer(renderer: () => RenderResult): Renderer {
 			if (!renderedItem || renderedItem === true) {
 				continue;
 			}
-			if (typeof renderedItem === 'string') {
+			if (typeof renderedItem === 'string' || typeof renderedItem === 'number') {
 				renderedItem = toTextVNode(renderedItem);
 			}
 			const owningNode = _nodeToWrapperMap.get(renderedItem);

diff --git a/src/testing/assertRender.ts b/src/testing/assertRender.ts
@@ -101,7 +101,7 @@ function format(nodes: DNode | DNode[], depth = 0): string {
 			str = `${str}\n${getTabs(depth)}`;
 		}
 
-		if (typeof node === 'string') {
+		if (typeof node === 'string' || typeof node === 'number') {
 			return `${str}${node}`;
 		}
 

diff --git a/src/testing/harness/support/assertRender.ts b/src/testing/harness/support/assertRender.ts
@@ -43,7 +43,7 @@ export function formatDNodes(nodes: DNode | DNode[], depth: number = 0): string
 		}
 		result = `${result}${tabs}`;
 
-		if (typeof node === 'string') {
+		if (typeof node === 'string' || typeof node === 'number') {
 			return `${result}"${node}"`;
 		}