jpf 4.2.4 → 4.2.6

package/dist/controls/codeMirror/HtmlEditor/HtmlEditor.d.ts

@@ -1,16 +1,14 @@
 import { View } from "../../../framework/View";
-import { ViewModelOptions, ViewModel } from "../../../framework/ViewModel";
+import { Properties, ViewModel } from "../../../framework/ViewModel";
 import { ObservableProperty } from "../../../framework/observable";
-export interface HtmlEditorViewModelOptions extends ViewModelOptions {
+export interface HtmlEditorProperties extends Properties {
     value?: string | ObservableProperty<string>;
 }
-export declare class HtmlEditorViewModel extends ViewModel implements HtmlEditorViewModelOptions {
-    constructor(options: HtmlEditorViewModelOptions);
-    readonly value: ObservableProperty<string>;
-}
-export declare class HtmlEditorView extends View<HtmlEditorViewModelOptions> {
-    constructor(options: HtmlEditorViewModelOptions);
+export declare class HtmlEditorView extends View<HtmlEditorProperties> {
+    constructor(properties: HtmlEditorProperties);
     private editor;
     build(): void;
 }
-export declare function htmlEditorView(options: HtmlEditorViewModelOptions): HtmlEditorView;
+export declare function htmlEditorView(properties: HtmlEditorProperties): HtmlEditorView;
+export declare class HtmlEditorViewModel extends ViewModel<HtmlEditorProperties> {
+}

package/dist/controls/codeMirror/HtmlEditor/HtmlEditor.js

@@ -1,7 +1,7 @@
 import { View, registerView } from "../../../framework/View";
-import { ViewModel, extendOptions } from "../../../framework/ViewModel";
+import { ViewModel, extendProperties } from "../../../framework/ViewModel";
 import { unwrap, isObservable } from "knockout";
-import { isObservableProperty, observableProperty } from "../../../framework/observable";
+import { isObservableProperty } from "../../../framework/observable";
 import { EditorView, basicSetup } from "codemirror";
 import { EditorState } from "@codemirror/state";
 import { keymap } from "@codemirror/view";
@@ -11,28 +11,11 @@ import { foldAll } from "@codemirror/language";
 import { ButtonView } from "../../html/Button/Button";
 import { prettifyHtml } from "../../../utilities/html/html";
 import { DivView } from "../../html/Div/Div";
-export class HtmlEditorViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        if (options) {
-            if (isObservableProperty(options.value)) {
-                this.value = options.value;
-            }
-            else {
-                this.value = observableProperty(options.value);
-            }
-            if (!options.eventListeners) {
-                options.eventListeners = {};
-            }
-        }
-    }
-    value;
-}
 export class HtmlEditorView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "div",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "HtmlEditor",
                 attributes: {
                     tabindex: 1
@@ -42,13 +25,13 @@ export class HtmlEditorView extends View {
                     flexDirection: "column",
                     border: "1px solid #a3d0e4"
                 }
-            }, options)
+            }, properties)
         });
     }
     editor;
     build() {
         super.build();
-        const viewModel = this.options;
+        const viewModel = this.properties;
         const foldAllButton = new ButtonView({
             content: "Collapse all",
             style: {
@@ -123,8 +106,10 @@ export class HtmlEditorView extends View {
         }
     }
 }
-export function htmlEditorView(options) {
-    return new HtmlEditorView(options);
+export function htmlEditorView(properties) {
+    return new HtmlEditorView(properties);
+}
+export class HtmlEditorViewModel extends ViewModel {
 }
 registerView(HtmlEditorViewModel, HtmlEditorView);
 //# sourceMappingURL=HtmlEditor.js.map

package/dist/controls/codeMirror/HtmlEditor/HtmlEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"HtmlEditor.js","sourceRoot":"","sources":["../../../../src/controls/codeMirror/HtmlEditor/HtmlEditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAoB,SAAS,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAsB,MAAM,+BAA+B,CAAC;AAC7G,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAM7C,MAAM,OAAO,mBAAoB,SAAQ,SAAS;IAC9C,YAAY,OAAmC;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,OAAO,EAAE;YACT,IAAI,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;aAC9B;iBAAM;gBACH,IAAI,CAAC,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;aAClD;YACD,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBACzB,OAAO,CAAC,cAAc,GAAG,EAAE,CAAA;aAC9B;SAEJ;IACL,CAAC;IAEQ,KAAK,CAA6B;CAC9C;AAED,MAAM,OAAO,cAAe,SAAQ,IAAgC;IAChE,YAAY,OAAmC;QAC3C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,aAAa,CAClB;gBACI,QAAQ,EAAE,YAAY;gBACtB,UAAU,EAAE;oBACR,QAAQ,EAAE,CAAC;iBACd;gBACD,KAAK,EAAE;oBACH,OAAO,EAAE,MAAM;oBACf,aAAa,EAAE,QAAQ;oBACvB,MAAM,EAAE,mBAAmB;iBAC9B;aACJ,EACD,OAAO,CACV;SACJ,CACJ,CAAC;IACN,CAAC;IAEO,MAAM,CAAa;IAG3B,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC;YACjC,OAAO,EAAE,cAAc;YACvB,KAAK,EAAE;gBACH,MAAM,EAAE,KAAK;aAChB;YACD,cAAc,EAAE;gBACZ,KAAK,EAAE;oBACH,QAAQ,EAAE,GAAG,EAAE;wBACX,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACzB,CAAC;iBACJ;aACJ;SACJ,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAI,UAAU,CAAC;YAChC,OAAO,EAAE,QAAQ;YACjB,KAAK,EAAE;gBACH,MAAM,EAAE,KAAK;aAChB;YACD,cAAc,EAAE;gBACZ,KAAK,EAAE;oBACH,QAAQ,EAAE,GAAG,EAAE;wBACX,IAAI,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;wBACnE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;oBAC5G,CAAC;iBACJ;aACJ;SACJ,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC;YAC9B,OAAO,EAAE,MAAM;YACf,KAAK,EAAE;gBACH,MAAM,EAAE,KAAK;aAChB;YACD,cAAc,EAAE;gBACZ,KAAK,EAAE;oBACH,QAAQ,EAAE,GAAG,EAAE;wBACX,IAAI,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;4BACvC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;yBACzD;oBACL,CAAC;iBACJ;aACJ;SACJ,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;YACxB,KAAK,EAAE;gBACH,OAAO,EAAE,MAAM;aAClB;YACD,QAAQ,EAAE;gBACN,aAAa;gBACb,YAAY;gBACZ,UAAU;aACb;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAE3C,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC;YAC7B,UAAU,EAAE;gBACR,UAAU;gBACV,IAAI,EAAE;gBACN,UAAU,CAAC,YAAY;gBACvB,MAAM,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC;aAC7B;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,GAAG,IAAI,UAAU,CAAC;YACzB,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI,CAAC,OAAO;SAEvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;QAGxC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,CAAkB,EAAE,EAAE,CAAC,CAAC;QAGnI,IAAI,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC/B,IAAI,CAAC,aAAa,CAAC,IAAI,CACnB,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAY,EAAE,EAAE;gBACvC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YACnG,CAAC,CAAC,CACL,CAAC;SACL;IACL,CAAC;CACJ;AAED,MAAM,UAAU,cAAc,CAAC,OAAmC;IAC9D,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AAED,YAAY,CACR,mBAAmB,EACnB,cAAc,CACjB,CAAA"}
+{"version":3,"file":"HtmlEditor.js","sourceRoot":"","sources":["../../../../src/controls/codeMirror/HtmlEditor/HtmlEditor.ts"],"names":[],"mappings":"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"}

package/dist/controls/codeMirror/JsonEditor/JsonEditor.d.ts

@@ -1,16 +1,14 @@
 import { View } from "../../../framework/View";
-import { ViewModelOptions, ViewModel } from "../../../framework/ViewModel";
+import { Properties, ViewModel } from "../../../framework/ViewModel";
 import { ObservableProperty } from "../../../framework/observable";
-export interface JsonEditorViewModelOptions extends ViewModelOptions {
+export interface JsonEditorProperties extends Properties {
     value?: string | ObservableProperty<string>;
 }
-export declare class JsonEditorViewModel extends ViewModel implements JsonEditorViewModelOptions {
-    constructor(options: JsonEditorViewModelOptions);
-    readonly value: ObservableProperty<string>;
-}
-export declare class JsonEditorView extends View<JsonEditorViewModelOptions> {
-    constructor(options: JsonEditorViewModelOptions);
+export declare class JsonEditorView extends View<JsonEditorProperties> {
+    constructor(properties: JsonEditorProperties);
     private editor;
     build(): void;
 }
-export declare function jsonEditorView(options: JsonEditorViewModelOptions): JsonEditorView;
+export declare function jsonEditorView(properties: JsonEditorProperties): JsonEditorView;
+export declare class JsonEditorViewModel extends ViewModel<JsonEditorProperties> {
+}

package/dist/controls/codeMirror/JsonEditor/JsonEditor.js

@@ -1,7 +1,7 @@
 import { View, registerView } from "../../../framework/View";
-import { ViewModel, extendOptions } from "../../../framework/ViewModel";
+import { ViewModel, extendProperties } from "../../../framework/ViewModel";
 import { unwrap, isObservable } from "knockout";
-import { isObservableProperty, observableProperty } from "../../../framework/observable";
+import { isObservableProperty } from "../../../framework/observable";
 import { EditorView, basicSetup } from "codemirror";
 import { EditorState } from "@codemirror/state";
 import { keymap } from "@codemirror/view";
@@ -10,28 +10,11 @@ import { indentWithTab } from "@codemirror/commands";
 import { foldAll } from "@codemirror/language";
 import { ButtonView } from "../../html/Button/Button";
 import { DivView } from "../../html/Div/Div";
-export class JsonEditorViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        if (options) {
-            if (isObservableProperty(options.value)) {
-                this.value = options.value;
-            }
-            else {
-                this.value = observableProperty(options.value);
-            }
-            if (!options.eventListeners) {
-                options.eventListeners = {};
-            }
-        }
-    }
-    value;
-}
 export class JsonEditorView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "div",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "JsonEditor",
                 attributes: {
                     tabindex: 1
@@ -41,13 +24,13 @@ export class JsonEditorView extends View {
                     flexDirection: "column",
                     border: "1px solid #a3d0e4"
                 }
-            }, options)
+            }, properties)
         });
     }
     editor;
     build() {
         super.build();
-        const viewModel = this.options;
+        const viewModel = this.properties;
         const foldAllButton = new ButtonView({
             content: "Collapse all",
             style: {
@@ -107,8 +90,10 @@ export class JsonEditorView extends View {
         }
     }
 }
-export function jsonEditorView(options) {
-    return new JsonEditorView(options);
+export function jsonEditorView(properties) {
+    return new JsonEditorView(properties);
+}
+export class JsonEditorViewModel extends ViewModel {
 }
 registerView(JsonEditorViewModel, JsonEditorView);
 //# sourceMappingURL=JsonEditor.js.map

package/dist/controls/codeMirror/JsonEditor/JsonEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonEditor.js","sourceRoot":"","sources":["../../../../src/controls/codeMirror/JsonEditor/JsonEditor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonEditor.js","sourceRoot":"","sources":["../../../../src/controls/codeMirror/JsonEditor/JsonEditor.ts"],"names":[],"mappings":"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"}

package/dist/controls/custom/FileSelector/FileSelector.d.ts

@@ -1,18 +1,15 @@
-import { ViewModel, ViewModelOptions } from "../../../framework/ViewModel";
+import { ViewModel, Properties } from "../../../framework/ViewModel";
 import { View } from "../../../framework/View";
-import { ButtonViewModelOptions } from "../../html/Button/Button";
-import { InputViewModelOptions } from "../../html/Input/Input";
-export interface InputFileViewModelOptions extends ViewModelOptions {
-    button?: ButtonViewModelOptions;
-    inputFile: InputViewModelOptions<FileList>;
+import { ButtonProperties } from "../../html/Button/Button";
+import { InputProperties } from "../../html/Input/Input";
+export interface FileSelectorProperties extends Properties {
+    button?: ButtonProperties;
+    inputFile: InputProperties<FileList>;
 }
-export declare class FileSelectorViewModel extends ViewModel {
-    constructor(options?: InputFileViewModelOptions);
-    readonly button: ButtonViewModelOptions;
-    readonly inputFile: InputViewModelOptions<FileList>;
-}
-export declare class FileSelectorView extends View<FileSelectorViewModel> {
-    constructor(options: FileSelectorViewModel);
+export declare class FileSelectorView extends View<FileSelectorProperties> {
+    constructor(properties: FileSelectorProperties);
     protected build(): void;
 }
-export declare function fileSelectorView(options: FileSelectorViewModel): FileSelectorView;
+export declare function fileSelectorView(properties: FileSelectorProperties): FileSelectorView;
+export declare class FileSelectorViewModel extends ViewModel<FileSelectorProperties> {
+}

package/dist/controls/custom/FileSelector/FileSelector.js

@@ -1,41 +1,23 @@
-import { ViewModel, extendOptions } from "../../../framework/ViewModel";
+import { ViewModel, extendProperties } from "../../../framework/ViewModel";
 import { View, registerView } from "../../../framework/View";
 import { ButtonView } from "../../html/Button/Button";
 import { InputView } from "../../html/Input/Input";
-export class FileSelectorViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        if (options) {
-            this.button = options.button;
-            options.inputFile.type = "file";
-            if (options.button) {
-                if (!options.inputFile.style) {
-                    options.inputFile.style = {};
-                }
-                options.inputFile.style.display = "none";
-            }
-            this.inputFile = options.inputFile;
-        }
-    }
-    button;
-    inputFile;
-}
 export class FileSelectorView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "div",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "FileSelector"
-            }, options)
+            }, properties)
         });
     }
     build() {
         super.build();
-        const viewModel = this.options;
+        const viewModel = this.properties;
         var fileInput = new InputView(viewModel.inputFile).render();
         this.element.appendChild(fileInput);
         if (viewModel.button) {
-            const button = new ButtonView(extendOptions(viewModel.button, {
+            const button = new ButtonView(extendProperties(viewModel.button, {
                 eventListeners: {
                     click: {
                         listener: () => {
@@ -50,8 +32,10 @@ export class FileSelectorView extends View {
         }
     }
 }
-export function fileSelectorView(options) {
-    return new FileSelectorView(options);
+export function fileSelectorView(properties) {
+    return new FileSelectorView(properties);
+}
+export class FileSelectorViewModel extends ViewModel {
 }
 registerView(FileSelectorViewModel, FileSelectorView);
 //# sourceMappingURL=FileSelector.js.map

package/dist/controls/custom/FileSelector/FileSelector.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileSelector.js","sourceRoot":"","sources":["../../../../src/controls/custom/FileSelector/FileSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAoB,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAA0B,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAyB,MAAM,wBAAwB,CAAC;AAO1E,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAChD,YAAY,OAAmC;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC7B,OAAO,CAAC,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC;YAEhC,IAAI,OAAO,CAAC,MAAM,EAAE;gBAChB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE;oBAC1B,OAAO,CAAC,SAAS,CAAC,KAAK,GAAG,EAAE,CAAC;iBAChC;gBACD,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;aAC5C;YAED,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;SACtC;IACL,CAAC;IAEQ,MAAM,CAAyB;IAC/B,SAAS,CAAkC;CACvD;AAED,MAAM,OAAO,gBAAiB,SAAQ,IAA2B;IAC7D,YAAY,OAA8B;QACtC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,aAAa,CAClB;gBACI,QAAQ,EAAE,cAAc;aAC3B,EACD,OAAO,CACV;SACJ,CACJ,CAAC;IACN,CAAC;IAES,KAAK;QACX,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAE/B,IAAI,SAAS,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;QAE5D,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAEpC,IAAI,SAAS,CAAC,MAAM,EAAE;YAClB,MAAM,MAAM,GAAG,IAAI,UAAU,CACzB,aAAa,CACT,SAAS,CAAC,MAAM,EAChB;gBACI,cAAc,EAAE;oBACZ,KAAK,EAAE;wBACH,QAAQ,EAAE,GAAG,EAAE;4BACX,IAAI,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;4BACpD,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;4BAC5C,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;wBACxC,CAAC;qBACJ;iBACJ;aACJ,CACJ,CACJ,CAAC,MAAM,EAAE,CAAC;YAEX,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SACpC;IACL,CAAC;CACJ;AAED,MAAM,UAAU,gBAAgB,CAAC,OAA8B;IAC3D,OAAO,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,YAAY,CACR,qBAAqB,EACrB,gBAAgB,CACnB,CAAC"}
+{"version":3,"file":"FileSelector.js","sourceRoot":"","sources":["../../../../src/controls/custom/FileSelector/FileSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAc,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAqB,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,SAAS,EAAoB,MAAM,wBAAwB,CAAC;AAOrE,MAAM,OAAO,gBAAiB,SAAQ,IAA4B;IAC9D,YAAY,UAAkC;QAC1C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB;gBACI,QAAQ,EAAE,cAAc;aAC3B,EACD,UAAU,CACb;SACJ,CACJ,CAAC;IACN,CAAC;IAES,KAAK;QACX,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAElC,IAAI,SAAS,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;QAE5D,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAEpC,IAAI,SAAS,CAAC,MAAM,EAAE;YAClB,MAAM,MAAM,GAAG,IAAI,UAAU,CACzB,gBAAgB,CACZ,SAAS,CAAC,MAAM,EAChB;gBACI,cAAc,EAAE;oBACZ,KAAK,EAAE;wBACH,QAAQ,EAAE,GAAG,EAAE;4BACX,IAAI,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;4BACpD,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;4BAC5C,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;wBACxC,CAAC;qBACJ;iBACJ;aACJ,CACJ,CACJ,CAAC,MAAM,EAAE,CAAC;YAEX,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SACpC;IACL,CAAC;CACJ;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAkC;IAC/D,OAAO,IAAI,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,OAAO,qBAAsB,SAAQ,SAAiC;CAE3E;AAED,YAAY,CACR,qBAAqB,EACrB,gBAAgB,CACnB,CAAC"}

package/dist/controls/custom/LabeledControl/LabeledControl.d.ts

@@ -1,15 +1,12 @@
-import { ViewModel, ViewModelOptions } from "../../../framework/ViewModel";
+import { ViewModel, Properties } from "../../../framework/ViewModel";
 import { View, IView } from "../../../framework/View";
-export interface LabeledViewModelOptions extends ViewModelOptions {
-    labelOptions: ViewModelOptions;
+export interface LabeledViewProperties extends Properties {
+    labelProperties: Properties;
     view: IView;
 }
-export declare class LabeledControlViewModel extends ViewModel implements LabeledViewModelOptions {
-    constructor(options: LabeledViewModelOptions);
-    labelOptions: ViewModelOptions;
-    view: IView;
+export declare class LabeledControlView extends View<LabeledViewProperties> {
+    constructor(properties: LabeledViewProperties);
 }
-export declare class LabeledControlView extends View<LabeledViewModelOptions> {
-    constructor(options: LabeledViewModelOptions);
+export declare function labeledControlView(properties: LabeledViewProperties): LabeledControlView;
+export declare class LabeledControlViewModel extends ViewModel<LabeledViewProperties> {
 }
-export declare function labeledControlView(options: LabeledViewModelOptions): LabeledControlView;

package/dist/controls/custom/LabeledControl/LabeledControl.js

@@ -1,35 +1,31 @@
-import { ViewModel, extendOptions } from "../../../framework/ViewModel";
-import { View } from "../../../framework/View";
+import { ViewModel, extendProperties } from "../../../framework/ViewModel";
+import { View, registerView } from "../../../framework/View";
 import { DivView } from "../../html/Div/Div";
-export class LabeledControlViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-    }
-    labelOptions;
-    view;
-}
 export class LabeledControlView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "div",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "LabeledControl",
                 style: {
                     display: "flex",
                     alignItems: "center"
                 },
                 classNames: ["o-labled-control"]
-            }, options),
+            }, properties),
             children: [
-                new DivView(extendOptions(options.labelOptions, {
+                new DivView(extendProperties(properties.labelProperties, {
                     viewType: "Label"
                 })),
-                options.view
+                properties.view
             ]
         });
     }
 }
-export function labeledControlView(options) {
-    return new LabeledControlView(options);
+export function labeledControlView(properties) {
+    return new LabeledControlView(properties);
+}
+export class LabeledControlViewModel extends ViewModel {
 }
+registerView(LabeledControlViewModel, LabeledControlView);
 //# sourceMappingURL=LabeledControl.js.map

package/dist/controls/custom/LabeledControl/LabeledControl.js.map

@@ -1 +1 @@
-{"version":3,"file":"LabeledControl.js","sourceRoot":"","sources":["../../../../src/controls/custom/LabeledControl/LabeledControl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAoB,aAAa,EAAE,MAAM,8BAA8B,CAAA;AACzF,OAAO,EAAE,IAAI,EAAS,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAO7C,MAAM,OAAO,uBAAwB,SAAQ,SAAS;IAClD,YAAY,OAAgC;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,YAAY,CAAmB;IAC/B,IAAI,CAAQ;CACf;AAED,MAAM,OAAO,kBAAmB,SAAQ,IAA6B;IACjE,YAAY,OAAgC;QACxC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,aAAa,CAClB;gBACI,QAAQ,EAAE,gBAAgB;gBAC1B,KAAK,EAAE;oBACH,OAAO,EAAE,MAAM;oBACf,UAAU,EAAE,QAAQ;iBACvB;gBACD,UAAU,EAAE,CAAC,kBAAkB,CAAC;aACnC,EACD,OAAO,CACV;YACD,QAAQ,EAAE;gBACN,IAAI,OAAO,CACP,aAAa,CACT,OAAO,CAAC,YAAY,EACpB;oBACI,QAAQ,EAAE,OAAO;iBACpB,CACJ,CACJ;gBACD,OAAO,CAAC,IAAI;aACf;SACJ,CACJ,CAAC;IACN,CAAC;CACJ;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAgC;IAC/D,OAAO,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"LabeledControl.js","sourceRoot":"","sources":["../../../../src/controls/custom/LabeledControl/LabeledControl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAc,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACtF,OAAO,EAAE,IAAI,EAAS,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAO7C,MAAM,OAAO,kBAAmB,SAAQ,IAA2B;IAC/D,YAAY,UAAiC;QACzC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB;gBACI,QAAQ,EAAE,gBAAgB;gBAC1B,KAAK,EAAE;oBACH,OAAO,EAAE,MAAM;oBACf,UAAU,EAAE,QAAQ;iBACvB;gBACD,UAAU,EAAE,CAAC,kBAAkB,CAAC;aACnC,EACD,UAAU,CACb;YACD,QAAQ,EAAE;gBACN,IAAI,OAAO,CACP,gBAAgB,CACZ,UAAU,CAAC,eAAe,EAC1B;oBACI,QAAQ,EAAE,OAAO;iBACpB,CACJ,CACJ;gBACD,UAAU,CAAC,IAAI;aAClB;SACJ,CACJ,CAAC;IACN,CAAC;CACJ;AAED,MAAM,UAAU,kBAAkB,CAAC,UAAiC;IAChE,OAAO,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,OAAO,uBAAwB,SAAQ,SAAgC;CAE5E;AAED,YAAY,CACR,uBAAuB,EACvB,kBAAkB,CACrB,CAAA"}

package/dist/controls/custom/ListItem/ListItem.d.ts

@@ -1,31 +1,21 @@
 import { View } from "../../../framework/View";
-import { ViewModel, ViewModelOptions } from "../../../framework/ViewModel";
-export interface ListItemViewModelOptions extends ViewModelOptions {
+import { ViewModel, Properties } from "../../../framework/ViewModel";
+export interface ListItemProperties extends Properties {
     id: number | string;
     text?: string | ViewModel;
     select?: () => void;
     order?: number | string;
 }
-export declare class ListItemViewModel extends ViewModel implements ListItemViewModelOptions {
-    constructor(options: ListItemViewModelOptions);
-    readonly id: number | string;
-    text: string | ViewModel;
-    readonly select: () => void;
-    order: number | string;
-}
-export interface HierarchicalListItemViewModelOptions extends ListItemViewModelOptions {
+export interface HierarchicalListItemProperties extends ListItemProperties {
     parentId?: number | string;
     expanded?: boolean;
+    items: Array<HierarchicalListItemProperties>;
 }
-export declare class HierarchicalListItemViewModel extends ListItemViewModel implements HierarchicalListItemViewModelOptions {
-    constructor(options: HierarchicalListItemViewModelOptions);
-    readonly parentId: number | string;
-    readonly expanded: boolean;
-    items: Array<HierarchicalListItemViewModel>;
-}
-export declare class ListItemView extends View<ListItemViewModelOptions> {
-    constructor(options: ListItemViewModelOptions);
+export declare class ListItemView extends View<ListItemProperties> {
+    constructor(properties: ListItemProperties);
     build(): void;
     private setContent;
 }
-export declare function listItemView(options: ListItemViewModel): ListItemView;
+export declare function listItemView(properties: ListItemProperties): ListItemView;
+export declare class ListItemViewModel extends ViewModel<ListItemProperties> {
+}

package/dist/controls/custom/ListItem/ListItem.js

@@ -1,43 +1,18 @@
 import { isObservable, unwrap } from "knockout";
 import { View, getView, registerView } from "../../../framework/View";
-import { ViewModel, extendOptions } from "../../../framework/ViewModel";
-export class ListItemViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        if (options) {
-            this.id = options.id;
-            this.text = options.text;
-            this.select = options.select;
-            this.order = options.order;
-        }
-    }
-    id;
-    text;
-    select;
-    order;
-}
-export class HierarchicalListItemViewModel extends ListItemViewModel {
-    constructor(options) {
-        super(options);
-        this.parentId = options.parentId;
-        this.expanded = options.expanded;
-    }
-    parentId;
-    expanded;
-    items;
-}
+import { ViewModel, extendProperties } from "../../../framework/ViewModel";
 export class ListItemView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "div",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "ListItem"
-            }, options)
+            }, properties)
         });
     }
     build() {
         super.build();
-        const viewModel = this.options;
+        const viewModel = this.properties;
         if (isObservable(viewModel.text)) {
             this.setContent(unwrap(viewModel.text));
             this.subscriptions.push(viewModel.text.subscribe((content) => {
@@ -57,8 +32,10 @@ export class ListItemView extends View {
         }
     }
 }
-export function listItemView(options) {
-    return new ListItemView(options);
+export function listItemView(properties) {
+    return new ListItemView(properties);
+}
+export class ListItemViewModel extends ViewModel {
 }
 registerView(ListItemViewModel, ListItemView);
 //# sourceMappingURL=ListItem.js.map

package/dist/controls/custom/ListItem/ListItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"ListItem.js","sourceRoot":"","sources":["../../../../src/controls/custom/ListItem/ListItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAoB,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAY1F,MAAM,OAAO,iBAAkB,SAAQ,SAAS;IAC5C,YAAY,OAAiC;QACzC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAEzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC7B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;SAC9B;IACL,CAAC;IAEQ,EAAE,CAAkB;IAC7B,IAAI,CAAqB;IAChB,MAAM,CAAa;IAC5B,KAAK,CAAkB;CAC1B;AAOD,MAAM,OAAO,6BAA8B,SAAQ,iBAAiB;IAChE,YAAY,OAA6C;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACrC,CAAC;IAEQ,QAAQ,CAAkB;IAC1B,QAAQ,CAAU;IAC3B,KAAK,CAAuC;CAC/C;AAED,MAAM,OAAO,YAAa,SAAQ,IAA8B;IAC5D,YAAY,OAAiC;QACzC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,aAAa,CAClB;gBACI,QAAQ,EAAE,UAAU;aACvB,EACD,OAAO,CACV;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAE/B,IAAI,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,aAAa,CAAC,IAAI,CACnB,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;gBACjC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC7B,CAAC,CAAC,CACL,CAAC;SACL;aAAM;YACH,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACnC;IACL,CAAC;IAEO,UAAU,CAAC,OAA2B;QAC1C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;SACpC;aAAM,IAAI,OAAO,YAAY,SAAS,EAAE;YACrC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;SACtC;IACL,CAAC;CACJ;AAED,MAAM,UAAU,YAAY,CAAC,OAA0B;IACnD,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,YAAY,CACR,iBAAiB,EACjB,YAAY,CACf,CAAA"}
+{"version":3,"file":"ListItem.js","sourceRoot":"","sources":["../../../../src/controls/custom/ListItem/ListItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAc,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAkBvF,MAAM,OAAO,YAAa,SAAQ,IAAwB;IACtD,YAAY,UAA8B;QACtC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB;gBACI,QAAQ,EAAE,UAAU;aACvB,EACD,UAAU,CACb;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAElC,IAAI,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,aAAa,CAAC,IAAI,CACnB,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;gBACjC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC7B,CAAC,CAAC,CACL,CAAC;SACL;aAAM;YACH,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACnC;IACL,CAAC;IAEO,UAAU,CAAC,OAA2B;QAC1C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;SACpC;aAAM,IAAI,OAAO,YAAY,SAAS,EAAE;YACrC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;SACtC;IACL,CAAC;CACJ;AAED,MAAM,UAAU,YAAY,CAAC,UAA8B;IACvD,OAAO,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,OAAO,iBAAkB,SAAQ,SAA6B;CAEnE;AAED,YAAY,CACR,iBAAiB,EACjB,YAAY,CACf,CAAC"}

package/dist/controls/html/Button/Button.d.ts

@@ -1,16 +1,14 @@
 import { Subscribable } from "knockout";
-import { ViewModel, ViewModelOptions } from "../../../framework/ViewModel";
+import { ViewModel, Properties } from "../../../framework/ViewModel";
 import { View } from "../../../framework/View";
-export interface ButtonViewModelOptions extends ViewModelOptions {
+export interface ButtonProperties extends Properties {
     content?: string | ViewModel | Subscribable<string | ViewModel>;
 }
-export declare class ButtonViewModel extends ViewModel implements ButtonViewModelOptions {
-    constructor(options: ButtonViewModelOptions);
-    readonly content: string | ViewModel | Subscribable<string | ViewModel>;
-}
-export declare class ButtonView extends View<ButtonViewModelOptions> {
-    constructor(options: ButtonViewModelOptions);
+export declare class ButtonView extends View<ButtonProperties> {
+    constructor(properties: ButtonProperties);
     build(): void;
     private buildContent;
 }
-export declare function buttonView(options: ButtonViewModelOptions): ButtonView;
+export declare function buttonView(properties: ButtonProperties): ButtonView;
+export declare class ButtonViewModel extends ViewModel<ButtonProperties> {
+}

package/dist/controls/html/Button/Button.js

@@ -1,25 +1,18 @@
 import { unwrap, isSubscribable } from "knockout";
-import { ViewModel, extendOptions } from "../../../framework/ViewModel";
+import { ViewModel, extendProperties } from "../../../framework/ViewModel";
 import { View, getView, registerView } from "../../../framework/View";
-export class ButtonViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        this.content = options.content;
-    }
-    content;
-}
 export class ButtonView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "button",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "Button"
-            }, options)
+            }, properties)
         });
     }
     build() {
         super.build();
-        const viewModel = this.options;
+        const viewModel = this.properties;
         if (viewModel.content) {
             if (isSubscribable(viewModel.content)) {
                 this.buildContent(unwrap(viewModel.content));
@@ -44,8 +37,10 @@ export class ButtonView extends View {
         }
     }
 }
-export function buttonView(options) {
-    return new ButtonView(options);
+export function buttonView(properties) {
+    return new ButtonView(properties);
+}
+export class ButtonViewModel extends ViewModel {
 }
 registerView(ButtonViewModel, ButtonView);
 //# sourceMappingURL=Button.js.map

package/dist/controls/html/Button/Button.js.map

@@ -1 +1 @@
-{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/controls/html/Button/Button.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,cAAc,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,EAAE,SAAS,EAAoB,aAAa,EAAE,MAAM,8BAA8B,CAAA;AACzF,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMtE,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAC1C,YAAY,OAA+B;QACvC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IACnC,CAAC;IAEQ,OAAO,CAAwD;CAC3E;AAED,MAAM,OAAO,UAAW,SAAQ,IAA4B;IACxD,YAAY,OAA+B;QACvC,KAAK,CACD;YACI,OAAO,EAAE,QAAQ;YACjB,OAAO,EAAE,aAAa,CAClB;gBACI,QAAQ,EAAE,QAAQ;aACrB,EACD,OAAO,CACV;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC/B,IAAI,SAAS,CAAC,OAAO,EAAE;YACnB,IAAI,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;gBACnC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC7C,IAAI,CAAC,aAAa,CAAC,IAAI,CACnB,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;oBACpC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC,CAAC,CACL,CAAC;aACL;iBAAM;gBACH,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;aACxC;SACJ;IACL,CAAC;IAEO,YAAY,CAAC,OAA2B;QAC5C,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC1C,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;SACjC;aACI,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;SACpC;aACI,IAAI,OAAO,YAAY,SAAS,EAAE;YACnC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAoB,CAAC,CAAC,CAAC;SACnD;IACL,CAAC;CACJ;AAED,MAAM,UAAU,UAAU,CAAC,OAA+B;IACtD,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,YAAY,CACR,eAAe,EACf,UAAU,CACb,CAAC"}
+{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/controls/html/Button/Button.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,cAAc,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,EAAE,SAAS,EAAc,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACtF,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMtE,MAAM,OAAO,UAAW,SAAQ,IAAsB;IAClD,YAAY,UAA4B;QACpC,KAAK,CACD;YACI,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gBAAgB,CACxB;gBACI,QAAQ,EAAE,QAAQ;aACrB,EACD,UAAU,CACb;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,SAAS,CAAC,OAAO,EAAE;YACnB,IAAI,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;gBACnC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC7C,IAAI,CAAC,aAAa,CAAC,IAAI,CACnB,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;oBACpC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC,CAAC,CACL,CAAC;aACL;iBAAM;gBACH,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;aACxC;SACJ;IACL,CAAC;IAEO,YAAY,CAAC,OAA2B;QAC5C,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC1C,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;SACjC;aACI,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;SACpC;aACI,IAAI,OAAO,YAAY,SAAS,EAAE;YACnC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAoB,CAAC,CAAC,CAAC;SACnD;IACL,CAAC;CACJ;AAED,MAAM,UAAU,UAAU,CAAC,UAA4B;IACnD,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,OAAO,eAAgB,SAAQ,SAA2B;CAE/D;AAED,YAAY,CACR,eAAe,EACf,UAAU,CACb,CAAC"}

package/dist/controls/html/Div/Div.d.ts

@@ -1,14 +1,12 @@
 import { View, IView } from "../../../framework/View";
-import { ViewModelOptions, ViewModel } from "../../../framework/ViewModel";
+import { Properties, ViewModel } from "../../../framework/ViewModel";
 import { Subscribable } from "knockout";
-export interface DivViewModelOptions extends ViewModelOptions {
-}
-export interface DivViewOptions extends DivViewModelOptions {
+export interface DivProperties extends Properties {
     children?: Array<IView> | Subscribable<Array<IView>>;
 }
-export declare class DivView extends View<DivViewOptions> {
-    constructor(options: DivViewOptions);
+export declare class DivView extends View<DivProperties> {
+    constructor(properties: DivProperties);
 }
-export declare function divView(options: DivViewModelOptions): DivView;
-export declare class DivViewModel extends ViewModel implements DivViewModelOptions {
+export declare function divView(properties: DivProperties): DivView;
+export declare class DivViewModel extends ViewModel<DivProperties> {
 }