jpf 5.0.15 → 5.0.17

package/dist/framework/observableInterfaces.d.ts

@@ -19,7 +19,7 @@ export interface IObservableArray<TItem = any, TSetter = Array<TItem>> extends A
     setInternalInAction(items: Array<TItem> | null): void;
 }
 export interface IComputed<TValue> extends ISubscribable<TValue> {
-    (): TValue;
+    get(): TValue;
 }
 export interface IObservableMap<TKey, TValue> {
 }

package/dist/framework/style.d.ts

@@ -655,3 +655,4 @@ export interface IStyleSubscribable {
     zoom?: "auto" | number | ISubscribable<"auto" | number>;
 }
 export declare const defaultStyle: IStyle;
+export declare function extendStyle(target: IStyle, source: IStyle): IStyle;

package/dist/framework/style.js

@@ -144,4 +144,11 @@ export const defaultStyle = {
     wordSpacing: "normal",
     zIndex: "auto"
 };
+export function extendStyle(target, source) {
+    if (source) {
+        target = target || {};
+        return { ...target, ...source };
+    }
+    return target;
+}
 //# sourceMappingURL=style.js.map

package/dist/framework/style.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jpf",
-    "version": "5.0.15",
+    "version": "5.0.17",
     "description": "Javascript Presentation Foundation base classes and interfaces",
     "keywords": [
         "mvvm",

package/src/framework/observableInterfaces.ts

@@ -23,7 +23,7 @@ export interface IObservableArray<TItem = any, TSetter = Array<TItem>> extends A
 }
 
 export interface IComputed<TValue> extends ISubscribable<TValue> {
-    (): TValue;
+    get(): TValue;
 }
 
 export interface IObservableMap<TKey, TValue> {

package/src/framework/style.ts

@@ -3259,3 +3259,11 @@ export const defaultStyle: IStyle = {
     wordSpacing: "normal",
     zIndex: "auto"
 }
+
+export function extendStyle(target: IStyle, source: IStyle): IStyle {
+    if (source) {
+        target = target || {};
+        return { ...target, ...source }
+    }
+    return target;
+}