jpf-mobx 1.0.38 → 1.0.40

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/controls/custom/FileSelector/FileSelector.js +2 -2
  2. package/dist/controls/custom/FileSelector/FileSelector.js.map +1 -1
  3. package/dist/controls/html/Div/Div.js +2 -2
  4. package/dist/controls/html/Div/Div.js.map +1 -1
  5. package/dist/framework/properties.d.ts +1 -1
  6. package/dist/framework/properties.js +13 -11
  7. package/dist/framework/properties.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/controls/custom/FileSelector/FileSelector.ts +2 -3
  10. package/src/controls/html/Button/Button.ts +1 -1
  11. package/src/controls/html/Div/Div.ts +4 -3
  12. package/src/framework/properties.ts +16 -10
package/dist/controls/custom/FileSelector/FileSelector.js CHANGED
@@ -7,8 +7,8 @@ class FileSelectorElement extends Element {
7
7
  super({
8
8
  tagName: "div",
9
9
  properties: extendProperties(properties, {
10
- viewType: "FileSelector"
11
- }, true)
10
+ elementType: "FileSelector"
11
+ })
12
12
  });
13
13
  }
14
14
  build() {
package/dist/controls/custom/FileSelector/FileSelector.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FileSelector.js","sourceRoot":"","sources":["../../../../src/controls/custom/FileSelector/FileSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAe,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAoB,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAmB,MAAM,wBAAwB,CAAC;AAOvE,MAAM,mBAAoB,SAAQ,OAAgC;IAC9D,YAAY,UAAmC;QAC3C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB,UAAU,EACV;gBACI,QAAQ,EAAE,cAAc;aAC3B,EACD,IAAI,CACP;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,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;QAE3D,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAEpC,IAAI,SAAS,CAAC,MAAM,EAAE;YAClB,MAAM,MAAM,GAAG,aAAa,CACxB,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,mBAAmB,CAAC,UAAmC;IACnE,OAAO,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,OAAO,sBAAuB,SAAQ,UAAU;IAClD,YAAY,UAAmC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,CAAoB;IAC1B,SAAS,CAA4B;CACxC;AAED,eAAe,CACX,sBAAsB,CAAC,SAAS,CAAC,WAAW,EAC5C,mBAAmB,CACtB,CAAC"}
1
+ {"version":3,"file":"FileSelector.js","sourceRoot":"","sources":["../../../../src/controls/custom/FileSelector/FileSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAe,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAoB,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAmB,MAAM,wBAAwB,CAAC;AAOvE,MAAM,mBAAoB,SAAQ,OAAgC;IAC9D,YAAY,UAAmC;QAC3C,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB,UAAU,EACV;gBACI,WAAW,EAAE,cAAc;aAC9B,CACJ;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,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;QAE3D,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAEpC,IAAI,SAAS,CAAC,MAAM,EAAE;YAClB,MAAM,MAAM,GAAG,aAAa,CACxB,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,mBAAmB,CAAC,UAAmC;IACnE,OAAO,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,OAAO,sBAAuB,SAAQ,UAAU;IAClD,YAAY,UAAmC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,CAAoB;IAC1B,SAAS,CAA4B;CACxC;AAED,eAAe,CACX,sBAAsB,CAAC,SAAS,CAAC,WAAW,EAC5C,mBAAmB,CACtB,CAAC"}
package/dist/controls/html/Div/Div.js CHANGED
@@ -4,9 +4,9 @@ class DivElement extends Element {
4
4
  constructor(properties) {
5
5
  super({
6
6
  tagName: "div",
7
- properties: extendProperties(properties, {
7
+ properties: extendProperties(properties, {}, {
8
8
  elementType: "Div"
9
- }, true),
9
+ }),
10
10
  children: properties.children
11
11
  });
12
12
  }
package/dist/controls/html/Div/Div.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Div.js","sourceRoot":"","sources":["../../../../src/controls/html/Div/Div.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAY,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAe,gBAAgB,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAO1F,MAAM,UAAW,SAAQ,OAAuB;IAC5C,YAAY,UAA0B;QAClC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB,UAAU,EACV;gBACI,WAAW,EAAE,KAAK;aACrB,EACD,IAAI,CACP;YACD,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAChC,CACJ,CAAC;IACN,CAAC;CACJ;AAED,MAAM,UAAU,UAAU,CAAC,UAA0B;IACjD,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IACzC,YAAY,UAAyB;QACjC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,QAAQ,CAAmD;CAC9D;AAED,eAAe,CACX,aAAa,CAAC,SAAS,CAAC,WAAW,EACnC,UAAU,CACb,CAAA"}
1
+ {"version":3,"file":"Div.js","sourceRoot":"","sources":["../../../../src/controls/html/Div/Div.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAY,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAe,gBAAgB,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAO1F,MAAM,UAAW,SAAQ,OAAuB;IAC5C,YAAY,UAA0B;QAClC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB,UAAU,EACV,EAAE,EACF;gBAEI,WAAW,EAAE,KAAK;aACrB,CACJ;YACD,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAChC,CACJ,CAAC;IACN,CAAC;CACJ;AAED,MAAM,UAAU,UAAU,CAAC,UAA0B;IACjD,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IACzC,YAAY,UAAyB;QACjC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IACD,QAAQ,CAAmD;CAC9D;AAED,eAAe,CACX,aAAa,CAAC,SAAS,CAAC,WAAW,EACnC,UAAU,CACb,CAAA"}
package/dist/framework/properties.d.ts CHANGED
@@ -37,5 +37,5 @@ export declare abstract class Properties implements IProperties {
37
37
  elementType?: string;
38
38
  focused?: boolean | Subscribable<boolean>;
39
39
  }
40
- export declare function extendProperties<TTarget = IProperties, TSource = IProperties>(target: TTarget, source: TSource, overwriteExisting?: boolean): TTarget;
40
+ export declare function extendProperties<TTarget = IProperties, TOverwritingProperties = TTarget, TPreserveExistingProperties = TTarget>(target: TTarget, overWriteExistingProperties: TOverwritingProperties, preserveExisting?: TPreserveExistingProperties): TTarget;
41
41
  export declare function applyBindings(properties: IProperties, element: HTMLElement, subscriptions: Array<IReactionDisposer>): void;
package/dist/framework/properties.js CHANGED
@@ -34,19 +34,21 @@ export class Properties {
34
34
  elementType;
35
35
  focused;
36
36
  }
37
- export function extendProperties(target, source, overwriteExisting = false) {
38
- if (source) {
37
+ export function extendProperties(target, overWriteExistingProperties, preserveExisting) {
38
+ if (overWriteExistingProperties || preserveExisting) {
39
39
  target = target || {};
40
- Object.keys(source).forEach((key) => {
41
- if (overwriteExisting) {
42
- target[key] = source[key];
43
- }
44
- else {
45
- if (!target.hasOwnProperty(key)) {
46
- target[key] = source[key];
40
+ if (overWriteExistingProperties) {
41
+ Object.keys(overWriteExistingProperties).forEach((key) => {
42
+ target[key] = overWriteExistingProperties[key];
43
+ });
44
+ }
45
+ if (preserveExisting) {
46
+ Object.keys(preserveExisting).forEach((key) => {
47
+ if (!preserveExisting.hasOwnProperty(key)) {
48
+ target[key] = preserveExisting[key];
47
49
  }
48
- }
49
- });
50
+ });
51
+ }
50
52
  }
51
53
  return target;
52
54
  }
package/dist/framework/properties.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"properties.js","sourceRoot":"","sources":["../../src/framework/properties.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"properties.js","sourceRoot":"","sources":["../../src/framework/properties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAmF,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGnJ,OAAO,EAAE,MAAM,EAAgB,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAqB,MAAM,MAAM,CAAC;AAMlD,MAAM,UAAU,sBAAsB,CAAC,MAAc,EAAE,OAAY;IAC/D,sBAAsB,CAClB,CAAC,MAAM,EAAE,EAAE;QACP,MAAM,uBAAuB,GAAG,MAAiC,CAAC;QAClE,IAAI,uBAAuB,CAAC,sBAAsB,IAAI,OAAO,uBAAuB,CAAC,sBAAsB,KAAK,UAAU,EAAE;YAExH,uBAAuB,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;SAC3D;IACL,CAAC,EACD,MAAM,CACT,CAAC;AACN,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAK;IACnC,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,CAAC;AAC1D,CAAC;AAiBD,MAAM,OAAgB,UAAU;IAClB,aAAa,CAAc,MAAc,EAAE,UAAwB;QACzE,IAAI,UAAU,EAAE;YACZ,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACzC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAED,UAAU,CAAuC;IACjD,UAAU,CAA+C;IACzD,KAAK,CAA6B;IAClC,OAAO,CAAmC;IAC1C,QAAQ,CAAmC;IAC3C,SAAS,CAA2B;IACpC,WAAW,CAAiC;IAC5C,wBAAwB,CAAW;IACnC,cAAc,CAAW;IACzB,cAAc,CAAkB;IAChC,WAAW,CAAU;IACrB,OAAO,CAAmC;CAC7C;AAKD,MAAM,UAAU,gBAAgB,CAAiG,MAAe,EAAE,2BAAmD,EAAE,gBAA8C;IAEjP,IAAI,2BAA2B,IAAI,gBAAgB,EAAE;QACjD,MAAM,GAAG,MAAM,IAAI,EAAa,CAAC;QACjC,IAAI,2BAA2B,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACrD,MAAM,CAAC,GAAG,CAAC,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;SACN;QACD,IAAI,gBAAgB,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAE1C,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;oBACvC,MAAM,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;iBACvC;YACL,CAAC,CAAC,CAAC;SACN;KAEJ;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,MAAM,UAAU,aAAa,CAAC,UAAuB,EAAE,OAAoB,EAAE,aAAuC;IAChH,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,UAAU,CAAC,WAAW,IAAI,SAAS,CAAC,CAAC;IAEzE,IAAI,UAAU,CAAC,UAAU,EAAE;QAEvB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;YAC9B,qBAAqB,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,IAAI,aAAa,EAAE;YACf,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACpC;KAaJ;IAED,IAAI,UAAU,CAAC,UAAU,EAAE;QACvB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/C,IAAI,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAEvC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;gBAC9B,uBAAuB,CAAC,GAAuB,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;YAC7E,CAAC,CAAC,CAAC;YAEH,IAAI,aAAa,EAAE;gBACf,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACpC;QAYL,CAAC,CAAC,CAAC;KACN;IAED,IAAI,UAAU,CAAC,KAAK,EAAE;QAClB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEpC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;gBAC9B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;YAEH,IAAI,aAAa,EAAE;gBACf,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACpC;QAYL,CAAC,CAAC,CAAC;KACN;IAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAE1C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;YAC9B,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,IAAI,aAAa,EAAE;YACf,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACpC;KAYJ;IAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;QAC5C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;YAC9B,IAAI,WAAW,GAAG,MAAM,CAAS,UAAU,CAAC,WAAW,CAAC,CAAC;YAEzD,IAAI,OAAO,CAAC,aAAa,EAAE,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,EAAE;gBACpG,OAAO,CAAC,UAAU,CAAC,SAAS,GAAG,WAAW,CAAC;aAC9C;iBAAM;gBACH,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;aACxD;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,aAAa,EAAE;YACf,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACpC;KAiBJ;IAGD,IAAI,UAAU,CAAC,cAAc,KAAK,KAAK,EAAE;QACrC,2BAA2B,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAChG,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC;KACrC;IAED,IAAI,UAAU,CAAC,wBAAwB,EAAE;QACrC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAClB,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;SACxB;QACD,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,GAAG,UAAU,CAAC;KAC1C;IAED,IAAI,UAAU,CAAC,cAAc,EAAE;QAC3B,4BAA4B,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;KACrD;IAGD,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,EAAE;QACrC,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,IAAI,aAAa,EAAE;QACf,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;KAC3C;IAcD,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,EAAE;QACtC,sBAAsB,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,IAAI,aAAa,EAAE;QACf,aAAa,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;KAC5C;IAcD,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,EAAE;QACnC,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IACH,IAAI,aAAa,EAAE;QACf,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KACzC;AAYL,CAAC;AAED,SAAS,wBAAwB,CAAC,OAAgB,EAAE,OAAoB;IACpE,IAAI,OAAO,KAAK,KAAK,EAAE;QACnB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;KACnC;SAAM;QACH,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;KACtC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAiB,EAAE,OAAoB;IACnE,IAAI,QAAQ,EAAE;QACV,OAAO,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;KAChD;SAAM;QACH,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;KACvC;AACL,CAAC;AAED,SAAS,4BAA4B,CAAC,UAAuB,EAAE,OAAoB;IAE/E,MAAM,mBAAmB,GAAG,IAAI,KAAK,EAAyB,CAAC;IAC/D,MAAM,yBAAyB,GAAG,IAAI,KAAK,EAAyB,CAAC;IAErE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACxD,IAAI,SAAS,GAAG,KAAK,CAAC,CAAC,CAA4B,CAAC;QACpD,IAAI,aAAa,GAAG,KAAK,CAAC,CAAC,CAA0B,CAAC;QAEtD,IAAI,SAAS,KAAK,OAAO,EAAE;YACvB,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACxC,OAAO;SACV;QACD,IAAI,SAAS,KAAK,UAAU,EAAE;YAC1B,yBAAyB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC9C,OAAO;SACV;QAED,IAAI,SAAS,KAAK,WAAW,EAAE;YAC3B,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;SAC7C;QAED,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE;YAC1B,2BAA2B,CACvB,SAAS,EACT,CAAC,KAAY,EAAE,EAAE;gBACb,IAAI,aAAa,CAAC,OAAO,EAAE;oBACvB,MAAM,OAAO,GAAG,aAAa,CAAC,OAAgC,CAAC;oBAC/D,MAAM,QAAQ,GAAG,KAAsB,CAAC;oBACxC,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;wBACpC,OAAO;qBACV;oBACD,IAAI,OAAO,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;wBACxC,OAAO;qBACV;oBACD,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;wBACtC,OAAO;qBACV;oBACD,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,GAAG,EAAE;wBACvD,OAAO;qBACV;iBACJ;gBAED,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YACnD,CAAC,EACD,aAAa,CAAC,OAAO,EACrB,OAAO,CACV,CAAC;SACL;aACI,IAAI,WAAW,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACrE,2BAA2B,CAAC,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SAClG;aACI,IAAI,WAAW,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACrE,2BAA2B,CAAC,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SAClG;IACL,CAAC,CAAC,CAAC;IAEH,mBAAmB,CAAC,OAAO,CAAC,CAAC,kBAAkB,EAAE,EAAE;QAC/C,IAAI,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE;YAEtC,2BAA2B,CAAC,KAAK,EAAE,kBAAkB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACxG;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACtC,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SAC1G;IACL,CAAC,CAAC,CAAC;IAEH,yBAAyB,CAAC,OAAO,CAAC,CAAC,wBAAwB,EAAE,EAAE;QAC3D,IAAI,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE;YAEtC,2BAA2B,CAAC,QAAQ,EAAE,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACvH;QACD,IAAI,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACtC,2BAA2B,CAAC,UAAU,EAAE,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACzH;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,2BAA2B,CAAC,IAA6B,EAAE,QAA6B,EAAE,OAA8B,EAAE,OAAoB;IACnJ,IAAI,CAAC,IAAI,EAAE;QACP,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACxC;IACD,IAAI,CAAC,QAAQ,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;KAC5C;IACD,IAAI,CAAC,OAAO,EAAE;QACV,OAAO,GAAG,EAAE,CAAC;KAChB;IACD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QAClB,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC;KAC3B;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACf,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;KACxB;IAED,IAAI,OAAO,CAAC,gBAAgB,EAAE;QAC1B,OAAO,CAAC,gBAAgB,CACpB,IAAI,EACJ,CAAC,KAAK,EAAE,EAAE;YACN,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,EACD;YACI,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC,CAAC;KACV;SAAM,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO,CAAC,aAAa,CAAC,CAClB,IAAI,EACJ,CAAC,KAAK,EAAE,EAAE;YACN,QAAQ,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC,CACJ,CAAC;KACL;SAAM;QACH,MAAM,kDAAkD,CAAC;KAC5D;AACL,CAAC;AAED,SAAS,qBAAqB,CAAC,UAAoB,EAAE,OAAgB,EAAE,OAAoB;IAEvF,IAAI,OAAO,EAAE;QACT,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC;KAC1B;IAGD,IAAI,UAAU,EAAE;QACZ,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC7B,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;KACN;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAsB,EAAE,KAAa,EAAE,OAAoB;IACxF,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE;QAC1B,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;KACjC;SAAM;QACH,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KACrC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgB,EAAE,OAAoB;IAC/D,IAAI,OAAO,EAAE;QACT,OAAO,CAAC,KAAK,EAAE,CAAC;KACnB;AACL,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jpf-mobx",
3
- "version": "1.0.38",
3
+ "version": "1.0.40",
4
4
  "description": "Javascript Presentation Foundation with mobx state management",
5
5
  "keywords": [
6
6
  "mvvm",
package/src/controls/custom/FileSelector/FileSelector.ts CHANGED
@@ -16,9 +16,8 @@ class FileSelectorElement extends Element<IFileSelectorProperties> {
16
16
  properties: extendProperties(
17
17
  properties,
18
18
  {
19
- viewType: "FileSelector"
20
- },
21
- true
19
+ elementType: "FileSelector"
20
+ }
22
21
  )
23
22
  }
24
23
  );
package/src/controls/html/Button/Button.ts CHANGED
@@ -57,7 +57,7 @@ class ButtonElement extends Element<IButtonProperties> {
57
57
  }
58
58
  }
59
59
 
60
- export function buttonElement(properties: IButtonProperties): ButtonElement {
60
+ export function buttonElement(properties: IButtonProperties) {
61
61
  return new ButtonElement(properties);
62
62
  }
63
63
 
package/src/controls/html/Div/Div.ts CHANGED
@@ -13,10 +13,11 @@ class DivElement extends Element<IDivProperties> {
13
13
  tagName: "div",
14
14
  properties: extendProperties(
15
15
  properties,
16
+ {},
16
17
  {
18
+ //Set the elementType only if it does not already have a value
17
19
  elementType: "Div"
18
- },
19
- true
20
+ }
20
21
  ),
21
22
  children: properties.children
22
23
  },
@@ -24,7 +25,7 @@ class DivElement extends Element<IDivProperties> {
24
25
  }
25
26
  }
26
27
 
27
- export function divElement(properties: IDivProperties): DivElement {
28
+ export function divElement(properties: IDivProperties) {
28
29
  return new DivElement(properties);
29
30
  }
30
31
 
package/src/framework/properties.ts CHANGED
@@ -67,18 +67,24 @@ export abstract class Properties implements IProperties {
67
67
  //#region Properties helper functions
68
68
 
69
69
 
70
- export function extendProperties<TTarget = IProperties, TSource = IProperties>(target: TTarget, source: TSource, overwriteExisting = false): TTarget {
71
- if (source) {
70
+ export function extendProperties<TTarget = IProperties, TOverwritingProperties = TTarget, TPreserveExistingProperties = TTarget>(target: TTarget, overWriteExistingProperties: TOverwritingProperties, preserveExisting?: TPreserveExistingProperties): TTarget {
71
+
72
+ if (overWriteExistingProperties || preserveExisting) {
72
73
  target = target || {} as TTarget;
73
- Object.keys(source).forEach((key) => {
74
- if (overwriteExisting) {
75
- target[key] = source[key];
76
- } else {
77
- if (!target.hasOwnProperty(key)) {
78
- target[key] = source[key];
74
+ if (overWriteExistingProperties) {
75
+ Object.keys(overWriteExistingProperties).forEach((key) => {
76
+ target[key] = overWriteExistingProperties[key];
77
+ });
78
+ }
79
+ if (preserveExisting) {
80
+ Object.keys(preserveExisting).forEach((key) => {
81
+ //Check if the target object does not already have a property with the given key
82
+ if (!preserveExisting.hasOwnProperty(key)) {
83
+ target[key] = preserveExisting[key];
79
84
  }
80
- }
81
- });
85
+ });
86
+ }
87
+
82
88
  }
83
89
 
84
90
  return target;