implab/implabjs-djx Commit - r40:ac3004768754

src/main/typings/css.d.ts created 644 +4 0

@@ -0,0 +1,4
	1	declare module "@implab/djx/css!*" {
	2	const result: { url: string };
	3	export = result;
	4	} No newline at end of file

src/main/typings/dijit.d.ts created 644 +14 0

@@ -0,0 +1,14
	1	declare namespace dijit {
	2	interface _WidgetBase {
	3
	4	_started?: boolean;
	5
	6	_set<K extends keyof this>(key: K, value: this[K]): void;
	7	}
	8
	9	interface TooltipDialog {
	10
	11	content: any;
	12
	13	}
	14	}

src/main/typings/legacy.d.ts created 644 +7 0

@@ -0,0 +1,7
	1	/// <reference path="./index.d.ts"/>
	2
	3	declare namespace JSX {
	4	interface IntrinsicElements {
	5
	6	}
	7	} No newline at end of file

.vscode/settings.json +1 0

                     "**/.factorypath": true
                 },
                 "cSpell.words": [
+                    "dijit",
                     "djbase",
                     "djclass"
                 ]

build.gradle +1 -1

             configureTsTest {
                 compilerOptions {
                     typeRoots = []
-                    types = ["requirejs", sources.main.output.typingsDir.get().toString() ]
+                    types = ["requirejs", sources.main.output.typingsDir.get().toString()+"/legacy" ]
                 }
             }

package-lock.json +3 -3

                         }
                     },
                     "@implab/core-amd": {
-                        "version": "1.3.2",
+                        "version": "1.4.0",
-                        "resolved": "https://registry.npmjs.org/@implab/core-amd/-/core-amd-1.3.2.tgz",
+                        "resolved": "https://registry.npmjs.org/@implab/core-amd/-/core-amd-1.4.0.tgz",
-                        "integrity": "sha512-OPx02obqz60FiOzDqEFuPfag/0ugl1tuQouI+52Op0k+fcmuBK4QACJy7o3fzOYvejdjF1DG4aRXuCm6+vgMYQ==",
+                        "integrity": "sha512-gaJX1mhri7YpmXDTAYELZnmTznzXYpk2AI7Decsttdi6xY+bqGgH24q0AFcKrx8RY2jfsFXxDdf0fITz2HpBbw==",
                         "dev": true
                     },
                     "@types/chai": {

package.json +2 -2

                 },
                 "peerDependencies": {
                     "dojo": "1.16.0",
-                    "@implab/core-amd": "^1.3.2"
+                    "@implab/core-amd": "^1.4.0"
                 },
                 "devDependencies": {
-                    "@implab/core-amd": "^1.3.2",
+                    "@implab/core-amd": "^1.4.0",
                     "@types/chai": "4.1.3",
                     "@types/requirejs": "2.1.31",
                     "@types/yaml": "1.2.0",

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

                     if (this._created)
                         throw new Error("The Element is already created");
-                    if (isNull(v))
+                    if (isNull(v) || typeof v === "boolean")
+                        // skip null, undefined, booleans ( this will work:  {value && <span>{value}</span>} )
                         return;
                     if (isPlainObject(v)) {
                 getChildDom(v: any) {
                     const tv = typeof v;
-                    if (tv === "string" || tv === "number" || tv === "boolean" || v instanceof RegExp || v instanceof Date) {
+                    if (tv === "string" || tv === "number" || v instanceof RegExp || v instanceof Date) {
                         return document.createTextNode(v.toString());
                     } else if (isNode(v)) {
                         return v;

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

                 domNode: Node;
-                containerNode?: Node;
+                containerNode: Node;
                 constructor() {
                     this.domNode = this.containerNode = document.createDocumentFragment();

src/main/typings/index.d.ts +25 -21

@@ -1,30 +1,34
1	declare module "@implab/djx/css!*" {	1	/// <reference path="./css.d.ts"/>
2	const result: { url: string };	2	/// <reference path="./dijit.d.ts"/>
3	export = result;
4	}
5		3
6	declare namespace JSX {	4	declare namespace JSX {
		5
7	interface DjxIntrinsicAttributes {	6	interface DjxIntrinsicAttributes {
8	class: string;	7	class: string;
9	"data-dojo-attach-point": string;	8	"data-dojo-attach-point": string;
10	"data-dojo-attach-event": string;	9	"data-dojo-attach-event": string;
11	}	10	}
12	type IntrinsicElements = {	11
13	[name in keyof HTMLElementTagNameMap]: Partial<Omit<HTMLElementTagNameMap[name], "children"> & DjxIntrinsicAttributes>;	12	type RecursivePartial<T> = T extends string \| number \| boolean \| null \| undefined \| Function ?
		13	T :
		14	{ [k in keyof T]?: RecursivePartial<T[k]> };
		15
		16	type MatchingMemberKeys<T, U> = {
		17	[K in keyof T]: T[K] extends U ? K : never;
		18	}[keyof T];
		19	type NotMatchingMemberKeys<T, U> = {
		20	[K in keyof T]: T[K] extends U ? never : K;
		21	}[keyof T];
		22	type ElementAttrNames<E> = NotMatchingMemberKeys<E, (...args: any[]) => any>;
		23
		24	type ElementAttrType<E, K extends keyof any> = K extends keyof E ? RecursivePartial<E[K]> : string;
		25
		26	type LaxElement<E extends object> = E & { }
		27
		28	type LegacyElementAttributes<E> = {
		29	[attr in ElementAttrNames<E>]?: ElementAttrType<E, attr>;
		30	} \| Partial<DjxIntrinsicAttributes>;
		31	interface IntrinsicElements {
		32	[tag: keyof HTMLElementTagNameMap]: LegacyElementAttributes<HTMLElementTagNameMap[tag]>;
14	}	33	}
15	}	34	}
16
17	declare namespace dijit {
18	interface _WidgetBase {
19
20	_started?: boolean;
21
22	_set<K extends keyof this>(key: K, value: this[K]): void;
23	}
24
25	interface TooltipDialog {
26
27	content: any;
28
29	}
30	} No newline at end of file

src/test/ts/view/MyWidget.tsx +6 -1

                 render() {
                     const Frame = (props: any) => <div>{props.children}</div>;
-                    return <div>
+                    return <div class="" className="" tabIndex={1} style={{ alignContentz: "", border: "" }} >
                         <h1 data-dojo-attach-point="titleNode"></h1>
                         <Frame>
                             <span class="up-button" onclick={e => this._onIncClick(e)}>[+]</span>
                             <span class="down-button"  onclick={() => this._onDecClick()}>[-]</span>
                         </Frame>
+                        <table style="pretty">
+                            <tr>
+                                <td colSpan={2} colspan="3" onclick=""></td>
+                            </tr>
+                        </table>
                     </div>;
                 }

src/test/tsconfig.json +1 -1

                         "../main/ts",
                         "../main/typings"
                     ],
-                    "types": ["requirejs", "../main/typings", "dojo-typings"]
+                    "types": ["requirejs", "../main/typings/legacy", "dojo-typings"]
                 }
             }

src/tsconfig.json +1 -1

                     "types": [],
                     "experimentalDecorators": true,
                     "jsxFactory": "createElement",
-                    "skipLibCheck": true,
+                    //"skipLibCheck": true,
                     "jsx": "react",
                     "lib": ["es5", "es2015.promise", "es2015.symbol", "es2015.iterable", "dom", "scripthost"]
                 }

	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