implab/implabjs-djx Commit - r112:2ccfaae984e9

fixed NlsBundle locale package loading...

cin -

r112:2ccfaae984e9 v1.4.4 default

parent child

Context file:

r112:2ccfaae984e9

Collapse all files

djx/src/main/ts/NlsBundle.ts +9 -7

                     cb(value);
             }
-            const chainObjects = <T extends object, T2 extends object>(o1: T, o2: T2) =>
+            const loadPackage = <T extends object>(localeData: LocaleProvider<Partial<T>> | undefined) =>
-                mixin(Object.create(o1) as T, o2);
+                localeData ?
+                    when(localeData(), data => data && "default" in data ? data.default : data) :
+                    undefined;
+            const chainObjects = <T extends object>(o1: T, o2: Partial<T> | undefined): T =>
+                o2 ? mixin(Object.create(o1) as T, o2) : o1;
             export class NlsBundle<T extends object> {
                 private readonly _locales: MapOf<LocaleProvider<Partial<T>>>;
                     if (this._cache[locale])
                         return this._cache[locale];
-                    const data = this._loadPackage(this._locales[locale]);
+                    const data = loadPackage(this._locales[locale]);
                     const parent = this._resolveLocale(locales);
                     return this._cache[locale] = when(data, x => {
                         return when(parent, y => this._cache[locale] = chainObjects(y, x));
                     });
                 }
-                _loadPackage(localeData: LocaleProvider<Partial<T>>) {
-                    return when(localeData(), data => data && "default" in data ? data.default : data);
             }

djx/src/main/ts/tsx/DjxFragment.ts +7 -3

@@ -1,7 +1,11
		1	import { FunctionRendition } from "./FunctionRendition";
		2	import { getItemDom } from "./render";
		3
1	/** Special functional component used to create a document fragment */	4	/** Special functional component used to create a document fragment */
2	export ~~fun~~ction DjxFragment({ children }: { children?: ~~Node~~ \| ~~Node~~[] }) {	5	export const DjxFragment = ({ children }: { children?: unknown \| unknown[] }) =>
		6	new FunctionRendition(() => {
3	const fragment = document.createDocumentFragment();	7	const fragment = document.createDocumentFragment();
4	if (children)	8	if (children)
5	(children instanceof Array ? children : [children]).forEach(child => fragment.appendChild(child));	9	(children instanceof Array ? children : [children]).map(getItemDom).forEach(child => fragment.appendChild(child));
6	return fragment;	10	return fragment;
7	} No newline at end of file	11	}); No newline at end of file

djx/src/main/ts/tsx/DjxWidgetBase.ts +9 -5

             import { djbase, djclass } from "../declare";
             import _WidgetBase = require("dijit/_WidgetBase");
             import _AttachMixin = require("dijit/_AttachMixin");
-            import { Rendition, isNode, isElementNode } from "./traits";
+            import { isNode, isElementNode } from "./traits";
             import registry = require("dijit/registry");
             import on = require("dojo/on");
             import { Scope } from "./Scope";
             import { render } from "./render";
+            import { isNull } from "@implab/core-amd/safe";
             // type Handle = dojo.Handle;
                     }
                 }
-                abstract render(): Rendition;
+                abstract render(): JSX.Element;
                 private _connectEventHandlers() {
                     if (this._eventHandlers)
                 _processTemplateNode<T extends (Element | Node | _WidgetBase)>(
                     baseNode: T,
-                    getAttrFunc: (baseNode: T, attr: string) => string,
+                    getAttrFunc: (baseNode: T, attr: string) => string | undefined,
                     // tslint:disable-next-line: ban-types
                     attachFunc: (node: T, type: string, func?: (...args: unknown[]) => unknown) => dojo.Handle
                 ): boolean {
                         if (w) {
                             // from dijit/_WidgetsInTemplateMixin
                             this._processTemplateNode(w,
-                                (n, p) => String(n.get(p as keyof typeof n)), // callback to get a property of a widget
+                                (n, p) => {
+                                    const v = n.get(p as keyof typeof n);
+                                    return isNull(v) ? undefined : String(v);
+                                }, // callback to get a property of a widget
                                 (widget, type, callback) => {
                                     if (!callback)
                                         throw new Error("The callback must be specified");
                         }
                     }
                     // eslint-disable-next-line @typescript-eslint/ban-types
-                    return super._processTemplateNode(baseNode, getAttrFunc, attachFunc as (node: T, type: string, func?: Function) => dojo.Handle);
+                    return super._processTemplateNode(baseNode, getAttrFunc as (baseNode: T, attr: string) => string, attachFunc as (node: T, type: string, func?: Function) => dojo.Handle);
                 }
                 /** Starts current widget and all its supporting widgets (placed outside

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

                     placeAt(domNode, refNode, position);
-                    if (isMounted(startupPending[0]))
+                    if (startupPending.length && isMounted(startupPending[0]))
                         startupPending.forEach(n => startupWidgets(n));
                 }

playground/package-lock.json +1 0

                     },
                     "../djx/build/npm/package": {
                         "name": "@implab/djx",
+                        "version": "1.4.4",
                         "dev": true,
                         "license": "BSD-2-Clause",
                         "peerDependencies": {

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