jpf 5.0.62 → 5.0.63

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

@@ -1,8 +1,7 @@
-import { Element } from "../../../framework/element";
-import { Properties, IProperties } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observableInterfaces";
+import { Element, ElementProperties, IElementProperties } from "../../../framework/element";
+import { ISubscribable } from "../../../framework/observable";
 export type mode = "json" | "html" | "css" | "less" | "javascript" | "typescript";
-export interface IEditorProperties extends IProperties {
+export interface IEditorProperties extends IElementProperties {
     mode: mode;
     value?: string | ISubscribable<string>;
 }
@@ -12,7 +11,7 @@ export declare class EditorElement extends Element<IEditorProperties> {
     build(): void;
 }
 export declare function createEditor(properties: IEditorProperties): EditorElement;
-export declare class EditorProperties extends Properties implements IEditorProperties {
+export declare class EditorProperties extends ElementProperties implements IEditorProperties {
     constructor(properties: IEditorProperties);
     mode: mode;
     value?: string | ISubscribable<string>;

package/dist/controls/codeMirror/Editor/Editor.js

@@ -4,8 +4,7 @@ exports.EditorProperties = exports.EditorElement = void 0;
 exports.createEditor = createEditor;
 const element_1 = require("../../../framework/element");
 const event_1 = require("../../../framework/event");
-const properties_1 = require("../../../framework/properties");
-const observablelmplementations_1 = require("../../../framework/observablelmplementations");
+const observable_1 = require("../../../framework/observable");
 const codemirror_1 = require("codemirror");
 const state_1 = require("@codemirror/state");
 const view_1 = require("@codemirror/view");
@@ -21,7 +20,7 @@ class EditorElement extends element_1.Element {
     constructor(properties) {
         super({
             tagName: "div",
-            properties: (0, properties_1.extendProperties)(properties, {
+            properties: (0, element_1.extendProperties)(properties, {
                 elementType: "CodeEditor",
             }, {
                 attributes: {
@@ -86,7 +85,7 @@ class EditorElement extends element_1.Element {
             },
             eventListeners: [
                 (0, event_1.createClickEvent)(() => {
-                    if ((0, observablelmplementations_1.isObservableValue)(properties.value)) {
+                    if (observable_1.observable.isObservableValue(properties.value)) {
                         properties.value.setValue(this.editor.state.doc.toString());
                     }
                 })
@@ -102,7 +101,7 @@ class EditorElement extends element_1.Element {
                 saveButton
             ]
         });
-        this.element.appendChild(buttons.render());
+        this.htmlElement.appendChild(buttons.render());
         const extensions = [
             codemirror_1.basicSetup,
             codemirror_1.EditorView.lineWrapping,
@@ -124,11 +123,11 @@ class EditorElement extends element_1.Element {
             state: state_1.EditorState.create({
                 extensions: extensions
             }),
-            parent: this.element,
+            parent: this.htmlElement,
         });
         this.editor.dom.style.overflow = "auto";
-        this.editor.dispatch({ changes: { from: 0, to: this.editor.state.doc.length, insert: (0, observablelmplementations_1.unwrap)(properties.value) } });
-        if ((0, observablelmplementations_1.isSubscribable)(properties.value)) {
+        this.editor.dispatch({ changes: { from: 0, to: this.editor.state.doc.length, insert: observable_1.observable.unwrap(properties.value) } });
+        if (observable_1.observable.isSubscribable(properties.value)) {
             this.disposers.push(properties.value.subscribe((html) => {
                 this.editor.dispatch({ changes: { from: 0, to: this.editor.state.doc.length, insert: html } });
             }));
@@ -139,7 +138,7 @@ exports.EditorElement = EditorElement;
 function createEditor(properties) {
     return new EditorElement(properties);
 }
-class EditorProperties extends properties_1.Properties {
+class EditorProperties extends element_1.ElementProperties {
     constructor(properties) {
         super();
         this.setProperties(this, properties);

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

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

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

@@ -1,8 +1,7 @@
-import { Properties, IProperties } from "../../../framework/properties";
-import { Element } from "../../../framework/element";
+import { Element, ElementProperties, IElementProperties } from "../../../framework/element";
 import { IButtonProperties } from "../../html/Button/Button";
 import { IInputProperties } from "../../html/Input/Input";
-export interface IFileSelectorProperties extends IProperties {
+export interface IFileSelectorProperties extends IElementProperties {
     button?: IButtonProperties;
     inputFile: IInputProperties<FileList>;
 }
@@ -11,7 +10,7 @@ export declare class FileSelectorElement extends Element<IFileSelectorProperties
     protected build(): void;
 }
 export declare function createFileSelector(properties: IFileSelectorProperties): FileSelectorElement;
-export declare class FileSelectorProperties extends Properties implements IFileSelectorProperties {
+export declare class FileSelectorProperties extends ElementProperties implements IFileSelectorProperties {
     constructor(properties: IFileSelectorProperties);
     button?: IButtonProperties;
     inputFile: IInputProperties<FileList>;

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileSelectorProperties = exports.FileSelectorElement = void 0;
 exports.createFileSelector = createFileSelector;
-const properties_1 = require("../../../framework/properties");
 const element_1 = require("../../../framework/element");
 const Button_1 = require("../../html/Button/Button");
 const Input_1 = require("../../html/Input/Input");
@@ -10,7 +9,7 @@ class FileSelectorElement extends element_1.Element {
     constructor(properties) {
         super({
             tagName: "div",
-            properties: (0, properties_1.extendProperties)(properties, {}, {
+            properties: (0, element_1.extendProperties)(properties, {}, {
                 elementType: "FileSelector"
             })
         });
@@ -21,9 +20,9 @@ class FileSelectorElement extends element_1.Element {
         const inputProperties = properties.inputFile || {};
         inputProperties.type = "file";
         const fileInput = (0, Input_1.createInput)(inputProperties).render();
-        this.element.appendChild(fileInput);
+        this.htmlElement.appendChild(fileInput);
         if (properties.button) {
-            const button = (0, Button_1.createButton)((0, properties_1.extendProperties)(properties.button, {
+            const button = (0, Button_1.createButton)((0, element_1.extendProperties)(properties.button, {
                 eventListeners: {
                     click: {
                         listener: () => {
@@ -33,7 +32,7 @@ class FileSelectorElement extends element_1.Element {
                     }
                 }
             })).render();
-            this.element.appendChild(button);
+            this.htmlElement.appendChild(button);
         }
     }
 }
@@ -41,7 +40,7 @@ exports.FileSelectorElement = FileSelectorElement;
 function createFileSelector(properties) {
     return new FileSelectorElement(properties);
 }
-class FileSelectorProperties extends properties_1.Properties {
+class FileSelectorProperties extends element_1.ElementProperties {
     constructor(properties) {
         super();
         this.setProperties(this, properties);

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":";;;AA2DA,gDAEC;AA7DD,8DAA0F;AAC1F,wDAA6E;AAC7E,qDAA0E;AAC1E,kDAAuE;AAOvE,MAAa,mBAAoB,SAAQ,iBAAgC;IACrE,YAAY,UAAmC;QAC3C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,6BAAgB,EACxB,UAAU,EACV,EAAE,EACF;gBACI,WAAW,EAAE,cAAc;aAC9B,CACJ;SACJ,CACJ,CAAC;IACN,CAAC;IAES,KAAK;QACX,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,IAAI,EAAgC,CAAC;QACjF,eAAe,CAAC,IAAI,GAAG,MAAM,CAAC;QAE9B,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,eAAe,CAAC,CAAC,MAAM,EAAE,CAAC;QAExD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAEpC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,MAAM,GAAG,IAAA,qBAAY,EACvB,IAAA,6BAAgB,EACZ,UAAU,CAAC,MAAM,EACjB;gBACI,cAAc,EAAE;oBACZ,KAAK,EAAE;wBACH,QAAQ,EAAE,GAAG,EAAE;4BACX,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;4BAC3C,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;QACrC,CAAC;IACL,CAAC;CACJ;AA/CD,kDA+CC;AAED,SAAgB,kBAAkB,CAAC,UAAmC;IAClE,OAAO,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC;AAED,MAAa,sBAAuB,SAAQ,uBAAU;IAClD,YAAY,UAAmC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,CAAqB;IAC3B,SAAS,CAA6B;CACzC;AAPD,wDAOC;AAED,IAAA,gCAAsB,EAClB,sBAAsB,EACtB,mBAAmB,CACtB,CAAC"}
+{"version":3,"file":"FileSelector.js","sourceRoot":"","sources":["../../../../src/controls/custom/FileSelector/FileSelector.ts"],"names":[],"mappings":";;;AA0DA,gDAEC;AA5DD,wDAAsI;AACtI,qDAA0E;AAC1E,kDAAuE;AAOvE,MAAa,mBAAoB,SAAQ,iBAAgC;IACrE,YAAY,UAAmC;QAC3C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,0BAAgB,EACxB,UAAU,EACV,EAAE,EACF;gBACI,WAAW,EAAE,cAAc;aAC9B,CACJ;SACJ,CACJ,CAAC;IACN,CAAC;IAES,KAAK;QACX,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,IAAI,EAAgC,CAAC;QACjF,eAAe,CAAC,IAAI,GAAG,MAAM,CAAC;QAE9B,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,eAAe,CAAC,CAAC,MAAM,EAAE,CAAC;QAExD,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAExC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,MAAM,GAAG,IAAA,qBAAY,EACvB,IAAA,0BAAgB,EACZ,UAAU,CAAC,MAAM,EACjB;gBACI,cAAc,EAAE;oBACZ,KAAK,EAAE;wBACH,QAAQ,EAAE,GAAG,EAAE;4BACX,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;4BAC3C,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;wBACxC,CAAC;qBACJ;iBACJ;aACJ,CACJ,CACJ,CAAC,MAAM,EAAE,CAAC;YAEX,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;CACJ;AA/CD,kDA+CC;AAED,SAAgB,kBAAkB,CAAC,UAAmC;IAClE,OAAO,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC;AAED,MAAa,sBAAuB,SAAQ,2BAAiB;IACzD,YAAY,UAAmC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,CAAqB;IAC3B,SAAS,CAA6B;CACzC;AAPD,wDAOC;AAED,IAAA,gCAAsB,EAClB,sBAAsB,EACtB,mBAAmB,CACtB,CAAC"}

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

@@ -1,15 +1,14 @@
-import { Properties, IProperties } from "../../../framework/properties";
-import { Element, IElement } from "../../../framework/element";
-export interface ILabeledViewProperties extends IProperties {
-    labelProperties: IProperties;
+import { Element, IElement, ElementProperties, IElementProperties } from "../../../framework/element";
+export interface ILabeledViewProperties extends IElementProperties {
+    labelProperties: IElementProperties;
     element: IElement;
 }
 export declare class LabeledControlElement extends Element<ILabeledViewProperties> {
     constructor(properties: ILabeledViewProperties);
 }
 export declare function createLabeledControl(properties: ILabeledViewProperties): LabeledControlElement;
-export declare class LabeledControlProperties extends Properties implements ILabeledViewProperties {
+export declare class LabeledControlProperties extends ElementProperties implements ILabeledViewProperties {
     constructor(properties: ILabeledViewProperties);
-    labelProperties: Properties;
+    labelProperties: ElementProperties;
     element: IElement;
 }

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

@@ -2,19 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LabeledControlProperties = exports.LabeledControlElement = void 0;
 exports.createLabeledControl = createLabeledControl;
-const properties_1 = require("../../../framework/properties");
 const element_1 = require("../../../framework/element");
 const Div_1 = require("../../html/Div/Div");
 class LabeledControlElement extends element_1.Element {
     constructor(properties) {
         super({
             tagName: "div",
-            properties: (0, properties_1.extendProperties)(properties, {
+            properties: (0, element_1.extendProperties)(properties, {
                 elementType: "LabeledControl",
                 classNames: ["jpf-labled-control"]
             })
         }, [
-            (0, Div_1.createDiv)((0, properties_1.extendProperties)(properties.labelProperties, {
+            (0, Div_1.createDiv)((0, element_1.extendProperties)(properties.labelProperties, {
                 elementType: "Label"
             })),
             properties.element
@@ -25,7 +24,7 @@ exports.LabeledControlElement = LabeledControlElement;
 function createLabeledControl(properties) {
     return new LabeledControlElement(properties);
 }
-class LabeledControlProperties extends properties_1.Properties {
+class LabeledControlProperties extends element_1.ElementProperties {
     constructor(properties) {
         super();
         this.setProperties(this, properties);

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":";;;AAqCA,oDAEC;AAvCD,8DAAyF;AACzF,wDAAuF;AACvF,4CAA+C;AAO/C,MAAa,qBAAsB,SAAQ,iBAA+B;IACtE,YAAY,UAAkC;QAC1C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,6BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,gBAAgB;gBAC7B,UAAU,EAAE,CAAC,oBAAoB,CAAC;aACrC,CACJ;SACJ,EACD;YACI,IAAA,eAAS,EACL,IAAA,6BAAgB,EACZ,UAAU,CAAC,eAAe,EAC1B;gBACI,WAAW,EAAE,OAAO;aACvB,CACJ,CACJ;YACD,UAAU,CAAC,OAAO;SACrB,CACJ,CAAC;IACN,CAAC;CACJ;AA1BD,sDA0BC;AAED,SAAgB,oBAAoB,CAAC,UAAkC;IACnE,OAAO,IAAI,qBAAqB,CAAC,UAAU,CAAC,CAAC;AACjD,CAAC;AAED,MAAa,wBAAyB,SAAQ,uBAAU;IACpD,YAAY,UAAkC;QAC1C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,eAAe,CAAa;IAC5B,OAAO,CAAW;CACrB;AAPD,4DAOC;AAED,IAAA,gCAAsB,EAClB,wBAAwB,EACxB,qBAAqB,CACxB,CAAA"}
+{"version":3,"file":"LabeledControl.js","sourceRoot":"","sources":["../../../../src/controls/custom/LabeledControl/LabeledControl.ts"],"names":[],"mappings":";;;AAoCA,oDAEC;AAtCD,wDAAgJ;AAChJ,4CAA+C;AAO/C,MAAa,qBAAsB,SAAQ,iBAA+B;IACtE,YAAY,UAAkC;QAC1C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,0BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,gBAAgB;gBAC7B,UAAU,EAAE,CAAC,oBAAoB,CAAC;aACrC,CACJ;SACJ,EACD;YACI,IAAA,eAAS,EACL,IAAA,0BAAgB,EACZ,UAAU,CAAC,eAAe,EAC1B;gBACI,WAAW,EAAE,OAAO;aACvB,CACJ,CACJ;YACD,UAAU,CAAC,OAAO;SACrB,CACJ,CAAC;IACN,CAAC;CACJ;AA1BD,sDA0BC;AAED,SAAgB,oBAAoB,CAAC,UAAkC;IACnE,OAAO,IAAI,qBAAqB,CAAC,UAAU,CAAC,CAAC;AACjD,CAAC;AAED,MAAa,wBAAyB,SAAQ,2BAAiB;IAC3D,YAAY,UAAkC;QAC1C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,eAAe,CAAoB;IACnC,OAAO,CAAW;CACrB;AAPD,4DAOC;AAED,IAAA,gCAAsB,EAClB,wBAAwB,EACxB,qBAAqB,CACxB,CAAA"}

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

@@ -1,9 +1,8 @@
-import { Element } from "../../../framework/element";
-import { Properties, IProperties } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observableInterfaces";
-export interface IListItemProperties extends IProperties {
+import { Element, ElementProperties, IElementProperties } from "../../../framework/element";
+import { ISubscribable } from "../../../framework/observable";
+export interface IListItemProperties extends IElementProperties {
     id: number | string;
-    text?: string | ISubscribable<string> | Properties;
+    text?: string | ISubscribable<string> | ElementProperties;
     select?: () => void;
     order?: number | string;
 }
@@ -18,17 +17,17 @@ export declare class ListItemElement extends Element<IListItemProperties> {
     private setContent;
 }
 export declare function createListItem(properties: IListItemProperties): ListItemElement;
-export declare class ListItemProperties extends Properties implements IListItemProperties {
+export declare class ListItemProperties extends ElementProperties implements IListItemProperties {
     constructor(properties: IListItemProperties);
     id: number | string;
-    text?: string | Properties;
+    text?: string | ElementProperties;
     select?: () => void;
     order?: number | string;
 }
-export declare class HierarchicalListItemProperties extends Properties implements IHierarchicalListItemProperties {
+export declare class HierarchicalListItemProperties extends ElementProperties implements IHierarchicalListItemProperties {
     constructor(properties: IHierarchicalListItemProperties);
     id: number | string;
-    text?: string | Properties;
+    text?: string | ElementProperties;
     select?: () => void;
     order?: number | string;
     parentId?: number | string;

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

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HierarchicalListItemProperties = exports.ListItemProperties = exports.ListItemElement = void 0;
 exports.createListItem = createListItem;
 const element_1 = require("../../../framework/element");
-const properties_1 = require("../../../framework/properties");
-const observablelmplementations_1 = require("../../../framework/observablelmplementations");
+const observable_1 = require("../../../framework/observable");
 class ListItemElement extends element_1.Element {
     constructor(properties) {
         super({
             tagName: "div",
-            properties: (0, properties_1.extendProperties)(properties, {
+            properties: (0, element_1.extendProperties)(properties, {
                 elementType: "ListItem"
             })
         });
@@ -17,8 +16,8 @@ class ListItemElement extends element_1.Element {
     build() {
         super.build();
         const properties = this.properties;
-        if ((0, observablelmplementations_1.isSubscribable)(properties.text)) {
-            this.setContent((0, observablelmplementations_1.unwrap)(properties.text));
+        if (observable_1.observable.isSubscribable(properties.text)) {
+            this.setContent(observable_1.observable.unwrap(properties.text));
             this.disposers.push(properties.text.subscribe((text) => {
                 this.setContent(text);
             }));
@@ -29,9 +28,9 @@ class ListItemElement extends element_1.Element {
     }
     setContent(content) {
         if (typeof content === "string") {
-            this.element.innerHTML = content;
+            this.htmlElement.innerHTML = content;
         }
-        else if (content instanceof properties_1.Properties) {
+        else if (content instanceof element_1.ElementProperties) {
             this.setChildren((0, element_1.getElement)(content));
         }
     }
@@ -40,7 +39,7 @@ exports.ListItemElement = ListItemElement;
 function createListItem(properties) {
     return new ListItemElement(properties);
 }
-class ListItemProperties extends properties_1.Properties {
+class ListItemProperties extends element_1.ElementProperties {
     constructor(properties) {
         super();
         this.setProperties(this, properties);
@@ -52,7 +51,7 @@ class ListItemProperties extends properties_1.Properties {
 }
 exports.ListItemProperties = ListItemProperties;
 (0, element_1.addElementToDictionary)(ListItemProperties, ListItemElement);
-class HierarchicalListItemProperties extends properties_1.Properties {
+class HierarchicalListItemProperties extends element_1.ElementProperties {
     constructor(properties) {
         super();
         this.setProperties(this, properties);

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":";;;AA8DA,wCAEC;AAhED,wDAAyF;AACzF,8DAA0F;AAC1F,4FAAsF;AAmBtF,MAAa,eAAgB,SAAQ,iBAA4B;IAC7D,YAAY,UAA+B;QACvC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,6BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,UAAU;aAC1B,CACJ;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,IAAI,IAAA,0CAAc,EAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,CAAC,IAAA,kCAAM,EAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC1B,CAAC,CAAC,CACL,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,OAA4B;QAC3C,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;QACrC,CAAC;aAAM,IAAI,OAAO,YAAY,uBAAU,EAAE,CAAC;YACvC,IAAI,CAAC,WAAW,CAAC,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC,CAAC;QAC1C,CAAC;IACL,CAAC;CACJ;AAvCD,0CAuCC;AAED,SAAgB,cAAc,CAAC,UAA+B;IAC1D,OAAO,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC;AAED,MAAa,kBAAmB,SAAQ,uBAAU;IAC9C,YAAY,UAA+B;QACvC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,EAAE,CAAkB;IACpB,IAAI,CAAuB;IAC3B,MAAM,CAAc;IACpB,KAAK,CAAmB;CAC3B;AATD,gDASC;AAED,IAAA,gCAAsB,EAClB,kBAAkB,EAClB,eAAe,CAClB,CAAC;AAEF,MAAa,8BAA+B,SAAQ,uBAAU;IAC1D,YAAY,UAA2C;QACnD,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,EAAE,CAAkB;IACpB,IAAI,CAAuB;IAC3B,MAAM,CAAc;IACpB,KAAK,CAAmB;IACxB,QAAQ,CAAmB;IAC3B,QAAQ,CAAW;IACnB,KAAK,CAA0C;CAClD;AAZD,wEAYC;AAED,IAAA,gCAAsB,EAClB,8BAA8B,EAC9B,eAAe,CAClB,CAAA"}
+{"version":3,"file":"ListItem.js","sourceRoot":"","sources":["../../../../src/controls/custom/ListItem/ListItem.ts"],"names":[],"mappings":";;;AA4DA,wCAEC;AA9DD,wDAAiJ;AACjJ,8DAA0E;AAkB1E,MAAa,eAAgB,SAAQ,iBAA4B;IAC7D,YAAY,UAA+B;QACvC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,0BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,UAAU;aAC1B,CACJ;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,IAAI,uBAAU,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,UAAU,CAAC,uBAAU,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC/B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC1B,CAAC,CAAC,CACL,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,OAAmC;QAClD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,WAAW,CAAC,SAAS,GAAG,OAAO,CAAC;QACzC,CAAC;aAAM,IAAI,OAAO,YAAY,2BAAiB,EAAE,CAAC;YAC9C,IAAI,CAAC,WAAW,CAAC,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC,CAAC;QAC1C,CAAC;IACL,CAAC;CACJ;AAvCD,0CAuCC;AAED,SAAgB,cAAc,CAAC,UAA+B;IAC1D,OAAO,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC;AAED,MAAa,kBAAmB,SAAQ,2BAAiB;IACrD,YAAY,UAA+B;QACvC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,EAAE,CAAkB;IACpB,IAAI,CAA8B;IAClC,MAAM,CAAc;IACpB,KAAK,CAAmB;CAC3B;AATD,gDASC;AAED,IAAA,gCAAsB,EAClB,kBAAkB,EAClB,eAAe,CAClB,CAAC;AAEF,MAAa,8BAA+B,SAAQ,2BAAiB;IACjE,YAAY,UAA2C;QACnD,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,EAAE,CAAkB;IACpB,IAAI,CAA8B;IAClC,MAAM,CAAc;IACpB,KAAK,CAAmB;IACxB,QAAQ,CAAmB;IAC3B,QAAQ,CAAW;IACnB,KAAK,CAA0C;CAClD;AAZD,wEAYC;AAED,IAAA,gCAAsB,EAClB,8BAA8B,EAC9B,eAAe,CAClB,CAAA"}

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

@@ -1,8 +1,7 @@
-import { Properties, IProperties } from "../../../framework/properties";
-import { Element } from "../../../framework/element";
-import { ISubscribable } from "../../../framework/observableInterfaces";
-export interface IButtonProperties extends IProperties {
-    content?: string | Properties | ISubscribable<string | Properties>;
+import { Element, ElementProperties, IElementProperties } from "../../../framework/element";
+import { ISubscribable } from "../../../framework/observable";
+export interface IButtonProperties extends IElementProperties {
+    content?: string | ElementProperties | ISubscribable<string | ElementProperties>;
 }
 export declare class ButtonElement extends Element<IButtonProperties> {
     constructor(properties: IButtonProperties);
@@ -10,7 +9,7 @@ export declare class ButtonElement extends Element<IButtonProperties> {
     private buildContent;
 }
 export declare function createButton(properties: IButtonProperties): ButtonElement;
-export declare class ButtonProperties extends Properties implements IButtonProperties {
+export declare class ButtonProperties extends ElementProperties implements IButtonProperties {
     constructor(properties: IButtonProperties);
-    content?: string | Properties | ISubscribable<string | Properties>;
+    content?: string | ElementProperties | ISubscribable<string | ElementProperties>;
 }

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

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ButtonProperties = exports.ButtonElement = void 0;
 exports.createButton = createButton;
-const properties_1 = require("../../../framework/properties");
 const element_1 = require("../../../framework/element");
-const observablelmplementations_1 = require("../../../framework/observablelmplementations");
+const observable_1 = require("../../../framework/observable");
 class ButtonElement extends element_1.Element {
     constructor(properties) {
         super({
             tagName: "button",
-            properties: (0, properties_1.extendProperties)(properties, {
+            properties: (0, element_1.extendProperties)(properties, {
                 elementType: "Button"
             })
         });
@@ -18,8 +17,8 @@ class ButtonElement extends element_1.Element {
         super.build();
         const properties = this.properties;
         if (properties.content) {
-            this.buildContent((0, observablelmplementations_1.unwrap)(properties.content));
-            if ((0, observablelmplementations_1.isSubscribable)(properties.content)) {
+            this.buildContent(observable_1.observable.unwrap(properties.content));
+            if (observable_1.observable.isSubscribable(properties.content)) {
                 this.disposers.push(properties.content.subscribe((content) => {
                     this.buildContent(content);
                 }));
@@ -28,12 +27,12 @@ class ButtonElement extends element_1.Element {
     }
     buildContent(content) {
         if (content == null || content === undefined) {
-            this.element.innerText = null;
+            this.htmlElement.innerText = null;
         }
         else if (typeof content === "string") {
-            this.element.innerText = content;
+            this.htmlElement.innerText = content;
         }
-        else if (content instanceof properties_1.Properties) {
+        else if (content instanceof element_1.ElementProperties) {
             this.setChildren((0, element_1.getElement)(content));
         }
     }
@@ -42,7 +41,7 @@ exports.ButtonElement = ButtonElement;
 function createButton(properties) {
     return new ButtonElement(properties);
 }
-class ButtonProperties extends properties_1.Properties {
+class ButtonProperties extends element_1.ElementProperties {
     constructor(properties) {
         super();
         this.setProperties(this, properties);

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":";;;AAsDA,oCAEC;AAxDD,8DAAyF;AACzF,wDAAyF;AAEzF,4FAAsF;AAMtF,MAAa,aAAc,SAAQ,iBAA0B;IACzD,YAAY,UAA6B;QACrC,KAAK,CACD;YACI,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,IAAA,6BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,QAAQ;aACxB,CACJ;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,CAAC,YAAY,CAAC,IAAA,kCAAM,EAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YAE9C,IAAI,IAAA,0CAAc,EAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;oBACrC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC,CAAC,CACL,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,OAA4B;QAC7C,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3C,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;QAClC,CAAC;aACI,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;QACrC,CAAC;aACI,IAAI,OAAO,YAAY,uBAAU,EAAE,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,IAAA,oBAAU,EAAC,OAAqB,CAAC,CAAC,CAAC;QACxD,CAAC;IACL,CAAC;CACJ;AA3CD,sCA2CC;AAED,SAAgB,YAAY,CAAC,UAA6B;IACtD,OAAO,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC;AACzC,CAAC;AAED,MAAa,gBAAiB,SAAQ,uBAAU;IAC5C,YAAY,UAA6B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,CAA4D;CACtE;AAND,4CAMC;AAED,IAAA,gCAAsB,EAClB,gBAAgB,EAChB,aAAa,CAChB,CAAC"}
+{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/controls/html/Button/Button.ts"],"names":[],"mappings":";;;AAoDA,oCAEC;AAtDD,wDAAkJ;AAClJ,8DAA0E;AAM1E,MAAa,aAAc,SAAQ,iBAA0B;IACzD,YAAY,UAA6B;QACrC,KAAK,CACD;YACI,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,IAAA,0BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,QAAQ;aACxB,CACJ;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,CAAC,YAAY,CAAC,uBAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YAEzD,IAAI,uBAAU,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;oBACrC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC,CAAC,CACL,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,OAAmC;QACpD,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3C,IAAI,CAAC,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC;QACtC,CAAC;aACI,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,WAAW,CAAC,SAAS,GAAG,OAAO,CAAC;QACzC,CAAC;aACI,IAAI,OAAO,YAAY,2BAAiB,EAAE,CAAC;YAC5C,IAAI,CAAC,WAAW,CAAC,IAAA,oBAAU,EAAC,OAA4B,CAAC,CAAC,CAAC;QAC/D,CAAC;IACL,CAAC;CACJ;AA3CD,sCA2CC;AAED,SAAgB,YAAY,CAAC,UAA6B;IACtD,OAAO,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC;AACzC,CAAC;AAED,MAAa,gBAAiB,SAAQ,2BAAiB;IACnD,YAAY,UAA6B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,CAA0E;CACpF;AAND,4CAMC;AAED,IAAA,gCAAsB,EAClB,gBAAgB,EAChB,aAAa,CAChB,CAAC"}

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

@@ -1,14 +1,13 @@
-import { Element, IElement } from "../../../framework/element";
-import { IProperties, Properties } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observableInterfaces";
-export interface IDivProperties extends IProperties {
+import { Element, ElementProperties, IElement, IElementProperties } from "../../../framework/element";
+import { ISubscribable } from "../../../framework/observable";
+export interface IDivProperties extends IElementProperties {
     children?: Array<IElement> | ISubscribable<Array<IElement>>;
 }
 export declare class DivElement extends Element<IDivProperties> {
     constructor(properties: IDivProperties);
 }
 export declare function createDiv(properties: IDivProperties): DivElement;
-export declare class DivProperties extends Properties implements IDivProperties {
+export declare class DivProperties extends ElementProperties implements IDivProperties {
     constructor(properties: IDivProperties);
     children?: Array<IElement> | ISubscribable<Array<IElement>>;
 }

package/dist/controls/html/Div/Div.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DivProperties = exports.DivElement = void 0;
 exports.createDiv = createDiv;
 const element_1 = require("../../../framework/element");
-const properties_1 = require("../../../framework/properties");
 class DivElement extends element_1.Element {
     constructor(properties) {
         super({
             tagName: "div",
-            properties: (0, properties_1.extendProperties)(properties, {
+            properties: (0, element_1.extendProperties)(properties, {
                 elementType: "Div"
             })
         }, properties.children);
@@ -18,7 +17,7 @@ exports.DivElement = DivElement;
 function createDiv(properties) {
     return new DivElement(properties);
 }
-class DivProperties extends properties_1.Properties {
+class DivProperties extends element_1.ElementProperties {
     constructor(properties) {
         super();
         this.setProperties(this, properties);

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

@@ -1 +1 @@
-{"version":3,"file":"Div.js","sourceRoot":"","sources":["../../../../src/controls/html/Div/Div.ts"],"names":[],"mappings":";;;AAwBA,8BAEC;AA1BD,wDAAuF;AACvF,8DAA0F;AAM1F,MAAa,UAAW,SAAQ,iBAAuB;IACnD,YAAY,UAA0B;QAClC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,6BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,KAAK;aACrB,CACJ;SACJ,EACD,UAAU,CAAC,QAAQ,CACtB,CAAC;IACN,CAAC;CACJ;AAfD,gCAeC;AAED,SAAgB,SAAS,CAAC,UAA0B;IAChD,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAED,MAAa,aAAc,SAAQ,uBAAU;IACzC,YAAY,UAA0B;QAClC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,QAAQ,CAAoD;CAC/D;AAND,sCAMC;AAED,IAAA,gCAAsB,EAClB,aAAa,EACb,UAAU,CACb,CAAA"}
+{"version":3,"file":"Div.js","sourceRoot":"","sources":["../../../../src/controls/html/Div/Div.ts"],"names":[],"mappings":";;;AAuBA,8BAEC;AAzBD,wDAAgJ;AAMhJ,MAAa,UAAW,SAAQ,iBAAuB;IACnD,YAAY,UAA0B;QAClC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,0BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,KAAK;aACrB,CACJ;SACJ,EACD,UAAU,CAAC,QAAQ,CACtB,CAAC;IACN,CAAC;CACJ;AAfD,gCAeC;AAED,SAAgB,SAAS,CAAC,UAA0B;IAChD,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAED,MAAa,aAAc,SAAQ,2BAAiB;IAChD,YAAY,UAA0B;QAClC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,QAAQ,CAAoD;CAC/D;AAND,sCAMC;AAED,IAAA,gCAAsB,EAClB,aAAa,EACb,UAAU,CACb,CAAA"}

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

@@ -1,7 +1,6 @@
-import { Element } from "../../../framework/element";
-import { Properties, IProperties } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observableInterfaces";
-export interface IImageProperties extends IProperties {
+import { Element, ElementProperties, IElementProperties } from "../../../framework/element";
+import { ISubscribable } from "../../../framework/observable";
+export interface IImageProperties extends IElementProperties {
     src: string | ISubscribable<string>;
     alt: string | ISubscribable<string>;
 }
@@ -9,7 +8,7 @@ export declare class ImageElement extends Element<IImageProperties> {
     constructor(properties: IImageProperties);
 }
 export declare function createImage(properties: IImageProperties): ImageElement;
-export declare class ImageProperties extends Properties implements IImageProperties {
+export declare class ImageProperties extends ElementProperties implements IImageProperties {
     constructor(properties: IImageProperties);
     src: string | ISubscribable<string>;
     alt: string | ISubscribable<string>;

package/dist/controls/html/Image/Image.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImageProperties = exports.ImageElement = void 0;
 exports.createImage = createImage;
 const element_1 = require("../../../framework/element");
-const properties_1 = require("../../../framework/properties");
 class ImageElement extends element_1.Element {
     constructor(properties) {
         super({
             tagName: "img",
-            properties: (0, properties_1.extendProperties)(properties, {
+            properties: (0, element_1.extendProperties)(properties, {
                 elementType: "Image",
             }, {
                 attributes: {
@@ -23,7 +22,7 @@ exports.ImageElement = ImageElement;
 function createImage(properties) {
     return new ImageElement(properties);
 }
-class ImageProperties extends properties_1.Properties {
+class ImageProperties extends element_1.ElementProperties {
     constructor(properties) {
         super();
         this.setProperties(this, properties);

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

@@ -1 +1 @@
-{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../src/controls/html/Image/Image.ts"],"names":[],"mappings":";;;AA+BA,kCAEC;AAjCD,wDAA6E;AAC7E,8DAA0F;AAQ1F,MAAa,YAAa,SAAQ,iBAAyB;IACvD,YAAY,UAA4B;QACpC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,6BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,OAAO;aACvB,EACD;gBACI,UAAU,EAAE;oBACR,GAAG,EAAE,UAAU,CAAC,GAAG;oBACnB,GAAG,EAAE,UAAU,CAAC,GAAG;iBACtB;aACJ,CACJ;SACJ,CACJ,CAAC;IACN,CAAC;CACJ;AApBD,oCAoBC;AAED,SAAgB,WAAW,CAAC,UAA4B;IACpD,OAAO,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;AACxC,CAAC;AAED,MAAa,eAAgB,SAAQ,uBAAU;IAC3C,YAAY,UAA4B;QACpC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,GAAG,CAAiC;IACpC,GAAG,CAAiC;CACvC;AAPD,0CAOC;AAED,IAAA,gCAAsB,EAClB,eAAe,EACf,YAAY,CACf,CAAC"}
+{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../src/controls/html/Image/Image.ts"],"names":[],"mappings":";;;AA8BA,kCAEC;AAhCD,wDAAsI;AAQtI,MAAa,YAAa,SAAQ,iBAAyB;IACvD,YAAY,UAA4B;QACpC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAA,0BAAgB,EACxB,UAAU,EACV;gBACI,WAAW,EAAE,OAAO;aACvB,EACD;gBACI,UAAU,EAAE;oBACR,GAAG,EAAE,UAAU,CAAC,GAAG;oBACnB,GAAG,EAAE,UAAU,CAAC,GAAG;iBACtB;aACJ,CACJ;SACJ,CACJ,CAAC;IACN,CAAC;CACJ;AApBD,oCAoBC;AAED,SAAgB,WAAW,CAAC,UAA4B;IACpD,OAAO,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;AACxC,CAAC;AAED,MAAa,eAAgB,SAAQ,2BAAiB;IAClD,YAAY,UAA4B;QACpC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,GAAG,CAAiC;IACpC,GAAG,CAAiC;CACvC;AAPD,0CAOC;AAED,IAAA,gCAAsB,EAClB,eAAe,EACf,YAAY,CACf,CAAC"}

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

@@ -1,12 +1,11 @@
-import { Element } from "../../../framework/element";
-import { Properties, IProperties } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observableInterfaces";
+import { Element, ElementProperties, IElementProperties } from "../../../framework/element";
+import { ISubscribable } from "../../../framework/observable";
 export type InputType = "text" | "checkbox" | "file" | "integer" | "float" | "range" | "radio";
 export declare enum ValueUpdateModeEnum {
     OnChange = 1,
     OnInput = 2
 }
-export interface IInputProperties<TValue> extends IProperties {
+export interface IInputProperties<TValue> extends IElementProperties {
     value?: TValue | ISubscribable<TValue>;
     inputValidator?: (event: Event, inputViewModel: IInputProperties<TValue>, value: string) => Promise<boolean>;
     placeholder?: string | ISubscribable<string>;
@@ -21,7 +20,7 @@ export declare class InputElement<TValue> extends Element<IInputProperties<TValu
     protected build(): void;
 }
 export declare function createInput<TValue>(properties: IInputProperties<TValue>): InputElement<TValue>;
-export declare class InputProperties<TValue> extends Properties implements IInputProperties<TValue> {
+export declare class InputProperties<TValue> extends ElementProperties implements IInputProperties<TValue> {
     constructor(properties: IInputProperties<TValue>);
     value?: TValue | ISubscribable<TValue>;
     inputValidator?: (event: Event, inputViewModel: InputProperties<TValue>, value: string) => Promise<boolean>;