@web-atoms/core 2.1.353 → 2.1.369

package/dist/xf/services/XFNavigationService.sys.js.map

@@ -0,0 +1 @@
+{"version":3,"mappings":"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","names":["App","AtomBridge","AtomLoader","AtomUri","Inject","RegisterSingleton","JsonService","NavigationService","AtomWindowViewModel","XFNavigationService","constructor","app","jsonService","title","undefined","v","location","bridge","navigationService","getLocation","setLocation","toString","alert","message","Promise","resolve","reject","f","confirm","r","notify","type","delay","console","warn","navigate","url","uri","stack","push","runAsync","__awaiter","view","popup","loadView","setRoot","element","back","length","pop","refresh","instance","reset","openWindow","options","disposables","returnPromise","id","onInit","cancelToken","cancelled","callLater","remove","registerForCancel","ve","setValue","pushPage","e","add","popPage","error","__param"],"sourceRoot":"","sources":["../../../src/xf/services/XFNavigationService.ts"],"sourcesContent":[null]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-atoms/core",
-  "version": "2.1.353",
+  "version": "2.1.369",
   "description": "Web Atoms Core",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,8 @@
   "homepage": "https://github.com/neurospeech/web-atoms-core#readme",
   "devDependencies": {
     "@web-atoms/module-loader": "^2.0.6",
-    "@web-atoms/unit-test": "^1.0.31",
+    "@web-atoms/ts-to-systemjs": "^1.0.7",
+    "@web-atoms/unit-test": "^1.0.32",
     "colors": "^1.4.0",
     "istanbul": "^0.4.5",
     "jsdom": "^15.2.1",

package/src/Atom.ts

@@ -15,7 +15,7 @@ export class Atom {
         do {
             c = Object.getPrototypeOf(c);
             if (!c) {
-                throw new Error("No property descriptor found for " + name);
+                throw new Error("No property descriptor found for " + (name as any));
             }
             const pd = Object.getOwnPropertyDescriptor(c.prototype, name);
             if (!pd) {

package/src/web/controls/AtomControl.ts

@@ -3,9 +3,10 @@ import { AtomBinder } from "../../core/AtomBinder";
 import { AtomBridge, AtomElementBridge } from "../../core/AtomBridge";
 import { AtomComponent } from "../../core/AtomComponent";
 import { AtomDispatcher } from "../../core/AtomDispatcher";
+import { BindableProperty } from "../../core/BindableProperty";
 import FormattedString from "../../core/FormattedString";
 import WebImage from "../../core/WebImage";
-import { elementFactorySymbol, isControl } from "../../core/XNode";
+import XNode, { elementFactorySymbol, isControl } from "../../core/XNode";
 import { TypeKey } from "../../di/TypeKey";
 import { NavigationService } from "../../services/NavigationService";
 import { AtomStyle } from "../styles/AtomStyle";
@@ -69,6 +70,27 @@ function setStyle(name: string, applyUnit?: string) {
     };
 }
 
+function disposeChildren(owner: AtomControl, e: HTMLElement) {
+    if (!e) {
+        return;
+    }
+    let s = e.firstElementChild;
+    while (s) {
+        const c = s as HTMLElement;
+        s = s.nextElementSibling as HTMLElement;
+        const ac = c.atomControl;
+        if (ac) {
+            ac.dispose();
+            c.remove();
+            continue;
+        }
+        disposeChildren(owner, c);
+        owner.unbind(c);
+        owner.unbindEvent(c);
+        c.remove();
+    }
+}
+
 export interface ISetters {
     // tslint:disable-next-line: ban-types
     [key: string | symbol]: (ctrl: AtomControl, e: HTMLElement, value: any) => void;
@@ -218,6 +240,9 @@ export class AtomControl extends AtomComponent<HTMLElement, AtomControl> {
         return setterFx as any;
     }
 
+    @BindableProperty
+    public renderer: XNode;
+
     public defaultControlStyle: any;
 
     private mControlStyle: AtomStyle;
@@ -300,6 +325,9 @@ export class AtomControl extends AtomComponent<HTMLElement, AtomControl> {
                 this.mCachedTheme = null;
                 AtomBinder.refreshValue(this, "style");
                 break;
+            case "renderer":
+                this.rendererChanged();
+                break;
         }
     }
 
@@ -333,6 +361,16 @@ export class AtomControl extends AtomComponent<HTMLElement, AtomControl> {
         });
     }
 
+    protected rendererChanged() {
+        disposeChildren(this, this.element);
+        const r = this.renderer;
+        if (!r) {
+            return;
+        }
+        delete this.render;
+        this.render(r);
+    }
+
     protected preCreate(): void {
         // if (!this.element) {
         //     this.element = document.createElement("div");

package/src/web/styles/AtomStyle.ts

@@ -37,7 +37,7 @@ export abstract class AtomStyle
         do {
             c = Object.getPrototypeOf(c);
             if (!c) {
-                throw new Error("No property descriptor found for " + name);
+                throw new Error("No property descriptor found for " + (name as any));
             }
             const pd = Object.getOwnPropertyDescriptor(c.prototype, name);
             if (!pd) {