implab/implabjs-djx Commit - r98:12074cb11473

file rename

cin -

r98:12074cb11473 v1.3

parent child

Context file:

r98:12074cb11473

Collapse all files

djx/src/main/ts/tsx/FunctionRendition.ts +1 -1

             import { argumentNotNull } from "@implab/core-amd/safe";
-            import { getItemDom } from "./Renderer";
+            import { getItemDom } from "./render";
             import { RenditionBase } from "./RenditionBase";
             import { IScope } from "./Scope";

djx/src/main/ts/tsx/HtmlRendition.ts +1 -1

             import { RenditionBase } from "./RenditionBase";
             import { placeAt } from "./traits";
             import { IScope } from "./Scope";
-            import { getItemDom } from "./Renderer";
+            import { getItemDom } from "./render";
             export class HtmlRendition extends RenditionBase<HTMLElement> {
                 elementType: string;

djx/src/main/ts/tsx/RenditionBase.ts +1 -1

             import { isPlainObject, DojoNodePosition, Rendition, isDocumentFragmentNode, placeAt, collectNodes, autostartWidgets } from "./traits";
             import { IScope } from "./Scope";
-            import { getScope } from "./Renderer";
+            import { getScope } from "./render";
             export abstract class RenditionBase<TNode extends Node> implements Rendition<TNode> {
                 private _attrs = {};

djx/src/main/ts/tsx/WatchRendition.ts +7 -8

             import { id as mid } from "module";
             import { TraceSource } from "@implab/core-amd/log/TraceSource";
             import { argumentNotNull } from "@implab/core-amd/safe";
-            import { render } from "./Renderer";
+            import { getItemDom, render } from "./render";
             import { RenditionBase } from "./RenditionBase";
             import { IScope, Scope } from "./Scope";
             import { Observable } from "../observable";
             const trace = TraceSource.get(mid);
-            const noop = () => {};
             export class WatchRendition<T> extends RenditionBase<Node> {
-                private readonly _factory: (arg: T) => any;
+                private readonly _component: (arg: T) => unknown;
                 private _node: Node;
                 private readonly _subject: Observable<T>;
-                constructor(component: (arg: T) => any, subject: Observable<T>) {
+                constructor(component: (arg: T) => unknown, subject: Observable<T>) {
                     super();
                     argumentNotNull(component, "component");
-                    this._factory = component;
+                    this._component = component;
                     this._subject = subject;
                     scope.own(this._subject.on({ next: this._onValue }));
                 }
-                private _onValue = (value: T) => void this._render(value).catch( e => trace.error(e));
+                private _onValue = (value: T) =>
+                    void this._render(value).catch( e => trace.error(e));
                 private async _render(value: T) {
                     const prevNode = this._node;
                     this._scope.clean();
-                    this._node = await render(() => this._factory(value), this._scope);
+                    this._node = await render(this._component(value), this._scope);
                     this.placeAt(prevNode, "replace");
                 }

djx/src/main/ts/tsx/WidgetRendition.ts +1 -1

             import registry = require("dijit/registry");
             import ContentPane = require("dijit/layout/ContentPane");
             import { IScope } from "./Scope";
-            import { getItemDom, getScope } from "./Renderer";
+            import { getItemDom, getScope } from "./render";
             // tslint:disable-next-line: class-name
             export interface _Widget {

djx/src/main/ts/tsx/render.ts ~~djx/src/main/ts/tsx/Renderer.ts~~ renamed +13 -2

             const endRender = () => {
             }
+            /** Returns the current scope */
             export const getScope = () => _scope;
-            export const render = async (rendition: () => Rendition, scope = Scope.dummy) => {
+            /** Schedules the rendition to be rendered to the DOM Node
+             * @param rendition The rendition to be rendered
+             * @param scope The scope
+             */
+            export const render = async (rendition: unknown, scope = Scope.dummy) => {
                 await beginRender();
                 const prev = _scope;
                 _scope = scope;
                 try {
-                    const node = rendition().getDomNode();
+                    const node = getItemDom(rendition, scope);
                     scope.own(() => destroy(node));
                     return node;
                 } finally {
                 } else if (typeof v === "boolean" || v === null || v === undefined) {
                     // null | undefined | boolean are removed, converted to comments
                     return document.createComment(`[${typeof v} ${String(v)}]`);
+                } else if (v instanceof Array) {
+                    // arrays will be translated to document fragments
+                    const fragment = document.createDocumentFragment();
+                    v.map(item => getItemDom(item, scope))
+                        .forEach(node => fragment.appendChild(node));
+                    return fragment;
                 } else {
                     // bug: explicit error otherwise
                     throw new Error("Invalid parameter: " + v);

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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