jpf-mobx 1.0.42 → 1.0.44
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.
- package/dist/controls/html/Input/Input.js +11 -9
- package/dist/controls/html/Input/Input.js.map +1 -1
- package/dist/framework/properties.js +3 -3
- package/dist/framework/properties.js.map +1 -1
- package/package.json +1 -1
- package/src/controls/html/Input/Input.ts +14 -9
- package/src/framework/properties.ts +3 -3
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Element, registerElement } from "../../../framework/element";
|
|
2
2
|
import { Properties, extendProperties, isNullOrUndefined } from "../../../framework/properties";
|
|
3
|
-
import { isSubscribable, unwrap, reaction, isObservableValue } from "../../../framework/observable";
|
|
3
|
+
import { isSubscribable, unwrap, reaction, isObservableValue, runInAction } from "../../../framework/observable";
|
|
4
4
|
import { isInteger } from "../../../utilities/integer/integer";
|
|
5
5
|
import { isFloat } from "../../../utilities/float/float";
|
|
6
6
|
export var ValueUpdateModeEnum;
|
|
@@ -142,15 +142,17 @@ class InputElement extends Element {
|
|
|
142
142
|
return;
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
|
-
|
|
146
|
-
if ((
|
|
147
|
-
(event.type === "
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
145
|
+
runInAction(() => {
|
|
146
|
+
if (isObservableValue(viewModel.value)) {
|
|
147
|
+
if ((event.type === "change" && viewModel.valueUpdateMode === ValueUpdateModeEnum.OnChange) ||
|
|
148
|
+
(event.type === "input" && viewModel.valueUpdateMode === ValueUpdateModeEnum.OnInput)) {
|
|
149
|
+
viewModel.value.set(newValue);
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
viewModel.value.setInternal(newValue);
|
|
153
|
+
}
|
|
152
154
|
}
|
|
153
|
-
}
|
|
155
|
+
});
|
|
154
156
|
}
|
|
155
157
|
}
|
|
156
158
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Input.js","sourceRoot":"","sources":["../../../../src/controls/html/Input/Input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,UAAU,EAAe,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC7G,OAAO,EAAmB,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"Input.js","sourceRoot":"","sources":["../../../../src/controls/html/Input/Input.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,14 +37,14 @@ export class Properties {
|
|
|
37
37
|
export function extendProperties(target, preserveExisting, overWriteExisting) {
|
|
38
38
|
if (overWriteExisting || preserveExisting) {
|
|
39
39
|
target = target || {};
|
|
40
|
-
if (
|
|
40
|
+
if (typeof preserveExisting === "object") {
|
|
41
41
|
Object.keys(preserveExisting).forEach((key) => {
|
|
42
|
-
if (!
|
|
42
|
+
if (!target.hasOwnProperty(key)) {
|
|
43
43
|
target[key] = preserveExisting[key];
|
|
44
44
|
}
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
|
-
if (
|
|
47
|
+
if (typeof overWriteExisting === "object") {
|
|
48
48
|
Object.keys(overWriteExisting).forEach((key) => {
|
|
49
49
|
target[key] = overWriteExisting[key];
|
|
50
50
|
});
|
|
@@ -1 +1 @@
|
|
|
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,gBAA6C,EAAE,iBAA0C;IACvO,IAAI,iBAAiB,IAAI,gBAAgB,EAAE;QACvC,MAAM,GAAG,MAAM,IAAI,EAAa,CAAC;QAEjC,IAAI,
|
|
1
|
+
{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../src/framework/properties.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Element, registerElement } from "../../../framework/element";
|
|
2
2
|
import { Properties, IProperties, extendProperties, isNullOrUndefined } from "../../../framework/properties";
|
|
3
|
-
import { ObservableValue, isSubscribable, unwrap, reaction, isObservableValue } from "../../../framework/observable";
|
|
3
|
+
import { ObservableValue, isSubscribable, unwrap, reaction, isObservableValue, runInAction } from "../../../framework/observable";
|
|
4
4
|
import { isInteger } from "../../../utilities/integer/integer";
|
|
5
5
|
import { isFloat } from "../../../utilities/float/float";
|
|
6
6
|
|
|
@@ -206,15 +206,20 @@ class InputElement<TValue> extends Element<IInputProperties<TValue>> {
|
|
|
206
206
|
}
|
|
207
207
|
}
|
|
208
208
|
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
if ((
|
|
212
|
-
(event.type === "
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
209
|
+
runInAction(() => {
|
|
210
|
+
//if validation has succeeded we set the viewModel value
|
|
211
|
+
if (isObservableValue(viewModel.value)) {
|
|
212
|
+
if ((event.type === "change" && viewModel.valueUpdateMode === ValueUpdateModeEnum.OnChange) ||
|
|
213
|
+
(event.type === "input" && viewModel.valueUpdateMode === ValueUpdateModeEnum.OnInput)) {
|
|
214
|
+
|
|
215
|
+
viewModel.value.set(newValue);
|
|
216
|
+
|
|
217
|
+
|
|
218
|
+
} else {
|
|
219
|
+
viewModel.value.setInternal(newValue);
|
|
220
|
+
}
|
|
216
221
|
}
|
|
217
|
-
}
|
|
222
|
+
});
|
|
218
223
|
}
|
|
219
224
|
}
|
|
220
225
|
}
|
|
@@ -71,16 +71,16 @@ export function extendProperties<TTarget = IProperties, TOverwritingProperties =
|
|
|
71
71
|
if (overWriteExisting || preserveExisting) {
|
|
72
72
|
target = target || {} as TTarget;
|
|
73
73
|
|
|
74
|
-
if (
|
|
74
|
+
if (typeof preserveExisting === "object") {
|
|
75
75
|
Object.keys(preserveExisting).forEach((key) => {
|
|
76
76
|
//Check if the target object does not already have a property with the given key
|
|
77
|
-
if (!
|
|
77
|
+
if (!target.hasOwnProperty(key)) {
|
|
78
78
|
target[key] = preserveExisting[key];
|
|
79
79
|
}
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
if (
|
|
83
|
+
if (typeof overWriteExisting === "object") {
|
|
84
84
|
Object.keys(overWriteExisting).forEach((key) => {
|
|
85
85
|
target[key] = overWriteExisting[key];
|
|
86
86
|
});
|