implab/implabjs-djx Commit - r62:141ef477a5ff

Merge

cin -

r62:141ef477a5ff default

parent child

Context file:

r62:141ef477a5ff

src/main/ts/tsx/BuildContextBase.ts +6 -2

              import { isNull, mixin } from "@implab/core-amd/safe";
-             import { isPlainObject, isNode, isBuildContext, DojoNodePosition, BuildContext, isInPage } from "./traits";
+             import { isPlainObject, isNode, isBuildContext, DojoNodePosition, BuildContext, isInPage, isWidget } from "./traits";
              import dom = require("dojo/dom-construct");
              import registry = require("dijit/registry");
                      }
                  }
-                 getChildDom(v: any) {
+                 protected getItemDom(v: any) {
                      const tv = typeof v;
                      if (tv === "string" || tv === "number" || v instanceof RegExp || v instanceof Date) {
                          return document.createTextNode(v.toString());
                          return v;
                      } else if (isBuildContext(v)) {
                          return v.getDomNode();
+                     } else if(isWidget(v)) {
+                         return v.domNode;
+                     } else if(tv === "boolean" || v === null || v === undefined) {
+                         return document.createComment(`[${tv} ${String(v)}]`);
                      } else {
                          throw new Error("Invalid parameter");
                      }

src/main/ts/tsx/DjxFragment.ts +5 -17

		@@ -1,18 +1,6
1		import { _Widget } from "./WidgetContext";
2		import { MapOf } from "@implab/core-amd/interfaces";
3		import { prototype } from "../declare";
4
5		/** Special widget used to create a document fragment */
6		export class DjxFragment implements _Widget {
7
8		domNode: Node;
9
10		containerNode: Node;
11
12		constructor() {
13		this.domNode = this.containerNode = document.createDocumentFragment();
14		}
15		buildRendering() {
16		// this function marks this class as _Widget
17		}
	1	/** Special functional component used to create a document fragment */
	2	export function DjxFragment({children}: {children: Node[]}){
	3	const fragment = document.createDocumentFragment();
	4	if (children)
	5	children.forEach(child => fragment.appendChild(child));
18	6	} No newline at end of file

src/main/ts/tsx/FunctionComponentContext.ts +2 -2

                  _create(attrs: object, children: any[]) {
                      const _attrs: any = attrs || {};
-                     _attrs.children = children.map(x => this.getChildDom(x));
+                     _attrs.children = children.map(x => this.getItemDom(x));
-                     this._node = this.getChildDom(this._component.call(null, _attrs));
+                     this._node = this.getItemDom(this._component.call(null, _attrs));
                  }
                  _getDomNode() {

src/main/ts/tsx/HtmlElementContext.ts +1 -1

                  _addChild(child: any): void {
                      if (!this._element)
                          throw new Error("The HTML element isn't created");
-                     dom.place(this.getChildDom(child), this._element);
+                     dom.place(this.getItemDom(child), this._element);
                  }
                  _create(attrs: object, children: any[]) {

src/main/ts/tsx/WidgetContext.ts +3 -3

                                  throw new Error("The widget doesn't have neither addChild nor containerNode");
                              // the current widget isn't started, it's children shouldn't start too
-                             dom.place(this.getChildDom(child), instance.containerNode);
+                             dom.place(this.getItemDom(child), instance.containerNode);
                          }
                      } else {
                          if (!instance.containerNode)
                              throw new Error("The widget doesn't have neither addChild nor containerNode");
                          // the current widget isn't started, it's children shouldn't start too
-                         dom.place(this.getChildDom(child), instance.containerNode);
+                         dom.place(this.getItemDom(child), instance.containerNode);
                      }
                  }
                          // render children to the DocumentFragment
                          const content = document.createDocumentFragment();
-                         children.forEach(child => content.appendChild(this.getChildDom(child)));
+                         children.forEach(child => content.appendChild(this.getItemDom(child)));
                          // set the content property to the parameters of the widget
                          const _attrs = { ...attrs, content };

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages