jpf 5.0.86 → 5.0.87

package/src/controls/svg/Group/Group.ts

@@ -1,5 +1,6 @@
 import { Element, IElement, IElementProperties, extendProperties } from "../../../framework/element";
 import { ISubscribable } from "../../../framework/observable";
+import { typeName } from "../../../utilities/object/object";
 
 export interface IGroupProperties extends IElementProperties {
     x1?: number | string | ISubscribable<number | string>;
@@ -15,14 +16,16 @@ class GroupElement extends Element<IGroupProperties> {
             {
                 tagName: "g",
                 properties: extendProperties(
-                    properties,
                     {
-                        elementType: "Group",
-                        attributes: {
-                            x1: properties.x1,
-                            x2: properties.x2,
-                            y1: properties.y1,
-                            y2: properties.y2
+                        target: properties,
+                        preserveExisting: {
+                            elementType: typeName(GroupElement),
+                            attributes: {
+                                x1: properties.x1,
+                                x2: properties.x2,
+                                y1: properties.y1,
+                                y2: properties.y2
+                            }
                         }
                     }
                 )

package/src/controls/svg/Line/Line.ts

@@ -1,5 +1,6 @@
 import { Element, IElementProperties, extendProperties } from "../../../framework/element";
 import { ISubscribable } from "../../../framework/observable";
+import { typeName } from "../../../utilities/object/object";
 
 export interface ILineProperties extends IElementProperties {
     x1: number | string | ISubscribable<number | string>;
@@ -14,14 +15,16 @@ export class LineElement extends Element<ILineProperties> {
             {
                 tagName: "line",
                 properties: extendProperties(
-                    properties,
                     {
-                        elementType: "Line",
-                        attributes: {
-                            x1: properties.x1,
-                            x2: properties.x2,
-                            y1: properties.y1,
-                            y2: properties.y2
+                        target: properties,
+                        preserveExisting: {
+                            elementType: typeName(LineElement),
+                            attributes: {
+                                x1: properties.x1,
+                                x2: properties.x2,
+                                y1: properties.y1,
+                                y2: properties.y2
+                            }
                         }
                     }
                 )

package/src/controls/svg/Pattern/Pattern.ts

@@ -7,6 +7,7 @@ import { LineElement } from "../Line/Line";
 import { PolygonElement } from "../Polygon/Polygon";
 import { PolylineElement } from "../Polyline/Polyline";
 import { TextElement } from "../Text/Text";
+import { typeName } from "../../../utilities/object/object";
 
 
 export interface IPatternProperties extends IElementProperties {
@@ -24,15 +25,17 @@ export class PatternElement extends Element<IPatternProperties> {
             {
                 tagName: "pattern",
                 properties: extendProperties(
-                    properties,
                     {
-                        elementType: "Pattern",
-                        attributes: {
-                            id: properties.id,
-                            width: properties.width,
-                            height: properties.height,
-                            patternUnits: properties.patternUnits,
-                            patternTransform: properties.patternTransform
+                        target: properties,
+                        preserveExisting: {
+                            elementType: typeName(PatternElement),
+                            attributes: {
+                                id: properties.id,
+                                width: properties.width,
+                                height: properties.height,
+                                patternUnits: properties.patternUnits,
+                                patternTransform: properties.patternTransform
+                            }
                         }
                     }
                 )

package/src/controls/svg/Polygon/Polygon.ts

@@ -1,5 +1,7 @@
 import { Element, IElementProperties, extendProperties } from "../../../framework/element";
 import { ISubscribable, observable } from "../../../framework/observable";
+import { typeName } from "../../../utilities/object/object";
+import { PolylineElement } from "../Polyline/Polyline";
 import { ISvgPoint, serializePoints } from "../svg";
 
 export interface IPolygonProperties extends IElementProperties {
@@ -12,11 +14,13 @@ export class PolygonElement extends Element<IPolygonProperties> {
             {
                 tagName: "polygon",
                 properties: extendProperties(
-                    properties,
                     {
-                        elementType: "Polygon",
-                        attributes: {
-                            points: serializePoints(observable.unwrap(properties.points))
+                        target: properties,
+                        preserveExisting: {
+                            elementType: typeName(PolylineElement),
+                            attributes: {
+                                points: serializePoints(observable.unwrap(properties.points))
+                            }
                         }
                     }
                 )

package/src/controls/svg/Polyline/Polyline.ts

@@ -1,6 +1,7 @@
 import { Element, IElementProperties, extendProperties } from "../../../framework/element";
 import { ISvgPoint, serializePoints } from "../svg";
 import { ISubscribable } from "../../../framework/observable";
+import { typeName } from "../../../utilities/object/object";
 
 export interface IPolylineProperties extends IElementProperties {
     points: Array<ISvgPoint> | ISubscribable<Array<ISvgPoint>>;
@@ -12,11 +13,13 @@ export class PolylineElement extends Element<IPolylineProperties> {
             {
                 tagName: "polyline",
                 properties: extendProperties(
-                    properties,
                     {
-                        elementType: "Polyline",
-                        attributes: {
-                            points: serializePoints(properties.points)
+                        target: properties,
+                        preserveExisting: {
+                            elementType: typeName(PolylineElement),
+                            attributes: {
+                                points: serializePoints(properties.points)
+                            }
                         }
                     }
                 )

package/src/controls/svg/Rectangle/Rectangle.ts

@@ -1,5 +1,6 @@
 import { Element, IElementProperties, extendProperties } from "../../../framework/element";
 import { ISubscribable } from "../../../framework/observable";
+import { typeName } from "../../../utilities/object/object";
 
 export interface IRectangleProperties extends IElementProperties {
     x?: number | string | ISubscribable<number | string>;
@@ -14,14 +15,16 @@ export class RectangleElement extends Element<IRectangleProperties> {
             {
                 tagName: "rect",
                 properties: extendProperties(
-                    properties,
                     {
-                        elementType: "Rectangle",
-                        attributes: {
-                            x: properties.x,
-                            y: properties.y,
-                            width: properties.width,
-                            height: properties.height
+                        target: properties,
+                        preserveExisting: {
+                            elementType: typeName(RectangleElement),
+                            attributes: {
+                                x: properties.x,
+                                y: properties.y,
+                                width: properties.width,
+                                height: properties.height
+                            }
                         }
                     }
                 )

package/src/controls/svg/Svg/Svg.ts

@@ -1,6 +1,7 @@
 import { Element, IElement, IElementProperties, extendProperties } from "../../../framework/element";
 import { PreserveAspectRatio } from "../../../framework/css";
 import { ISubscribable } from "../../../framework/observable";
+import { typeName } from "../../../utilities/object/object";
 
 export interface ISvgProperties extends IElementProperties {
     x?: number | string | ISubscribable<number | string>;
@@ -18,16 +19,18 @@ export class SvgElement extends Element<ISvgProperties> {
             {
                 tagName: "svg",
                 properties: extendProperties(
-                    properties,
                     {
-                        elementType: "Svg",
-                        attributes: {
-                            x: properties.x,
-                            y: properties.y,
-                            height: properties.height,
-                            width: properties.width,
-                            viewBox: properties.viewBox,
-                            preserveAspectRatio: properties.preserveAspectRatio
+                        target: properties,
+                        preserveExisting: {
+                            elementType: typeName(SvgElement),
+                            attributes: {
+                                x: properties.x,
+                                y: properties.y,
+                                height: properties.height,
+                                width: properties.width,
+                                viewBox: properties.viewBox,
+                                preserveAspectRatio: properties.preserveAspectRatio
+                            }
                         }
                     }
                 )

package/src/controls/svg/Text/Text.ts

@@ -1,5 +1,6 @@
 import { Element, IElementProperties, extendProperties } from "../../../framework/element";
 import { ISubscribable } from "../../../framework/observable";
+import { typeName } from "../../../utilities/object/object";
 
 export interface ITextProperties extends IElementProperties {
     x?: number | string | ISubscribable<number | string>;
@@ -15,15 +16,17 @@ export class TextElement extends Element<ITextProperties> {
             {
                 tagName: "text",
                 properties: extendProperties(
-                    properties,
                     {
-                        elementType: "Text",
-                        attributes: {
-                            x: properties.x,
-                            y: properties.y,
-                            dx: properties.dx,
-                            dy: properties.dy,
-                            rotate: properties.rotate
+                        target: properties,
+                        preserveExisting: {
+                            elementType: typeName(TextElement),
+                            attributes: {
+                                x: properties.x,
+                                y: properties.y,
+                                dx: properties.dx,
+                                dy: properties.dy,
+                                rotate: properties.rotate
+                            }
                         }
                     }
                 )

package/src/controls/svg/Title/Title.ts

@@ -1,5 +1,6 @@
 import { Element, IElementProperties, extendProperties } from "../../../framework/element";
 import { ISubscribable } from "../../../framework/observable";
+import { typeName } from "../../../utilities/object/object";
 
 export interface ITitleProperties extends IElementProperties {
     title: string | ISubscribable<string>
@@ -11,10 +12,12 @@ export class TitleElement extends Element<ITitleProperties> {
             {
                 tagName: "title",
                 properties: extendProperties(
-                    properties,
                     {
-                        elementType: "Title",
-                        textContent: properties.title
+                        target: properties,
+                        preserveExisting: {
+                            elementType: typeName(TitleElement),
+                            textContent: properties.title
+                        }
                     }
                 )
             }

package/src/framework/element.ts

@@ -264,22 +264,28 @@ export abstract class ElementProperties implements IElementProperties {
 
 //#region Element helper functions
 
-export function extendProperties<TTarget = IElementProperties, TOverwritingProperties = TTarget, TPreserveExistingProperties = TTarget>(target: TTarget, preserveExisting: TPreserveExistingProperties, overWriteExisting?: TOverwritingProperties): TTarget {
-    if (overWriteExisting || preserveExisting) {
-        target = target || {} as TTarget;
+export interface IExtendPropertiesOptions<TTarget extends IElementProperties = IElementProperties, TPreserveExisting extends IElementProperties = IElementProperties, TOverwriteExisting extends IElementProperties = IElementProperties> {
+    target: TTarget;
+    preserveExisting?: TPreserveExisting;
+    overWriteExisting?: TOverwriteExisting;
+}
+
+export function extendProperties<TTarget extends IElementProperties = IElementProperties, TPreserveExisting extends IElementProperties = IElementProperties, TOverwriteExisting extends IElementProperties = IElementProperties>(options: IExtendPropertiesOptions<TTarget, TPreserveExisting, TOverwriteExisting>): TTarget {
+    const target = options.target || {} as TTarget;
 
-        if (typeof preserveExisting === "object") {
-            Object.keys(preserveExisting).forEach((key) => {
+    if (options.overWriteExisting || options.preserveExisting) {
+        if (typeof options.preserveExisting === "object") {
+            Object.keys(options.preserveExisting).forEach((key) => {
                 //Check if the target object does not already have a property with the given key
                 if (!target.hasOwnProperty(key) || typeof target[key] === "undefined") {
-                    target[key] = preserveExisting[key];
+                    target[key] = options.preserveExisting[key];
                 }
             });
         }
 
-        if (typeof overWriteExisting === "object") {
-            Object.keys(overWriteExisting).forEach((key) => {
-                target[key] = overWriteExisting[key];
+        if (typeof options.overWriteExisting === "object") {
+            Object.keys(options.overWriteExisting).forEach((key) => {
+                target[key] = options.overWriteExisting[key];
             });
         }
     }

package/src/utilities/object/object.ts

@@ -53,4 +53,20 @@ export function executeHandlerOnContext(context: object, handler: (context) => v
             }
         }
     }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+export function typeName(typeOrInstance: Function | object): string {
+    if (typeOrInstance instanceof Function) {
+        if (typeOrInstance.prototype && typeOrInstance.prototype.constructor) {
+
+            return typeOrInstance.prototype.constructor.name;
+        }
+    } else {
+        if (typeOrInstance.constructor) {
+            return typeOrInstance.constructor.name;
+        }
+    }
+
+    return null;
 }

package/src/controls/kendo/ObservableObject/ObservableObject.ts

@@ -1,45 +0,0 @@
-//import { Subscribable, isSubscribable, unwrap , action} from "../../../framework/observable";
-//import * as kendo from "@progress/kendo-ui/js/kendo.data.js";
-
-//var getUnderlyingObjectFunctionName = "getUnderlyingObject";
-
-//export function knockoutObservableToKendoObservable(object: object): kendo.data.ObservableObject {
-//    var observableObject = new kendo.data.ObservableObject();
-//    observableObject[getUnderlyingObjectFunctionName] = () => {
-//        return object;
-//    }
-//    Object.keys(object).forEach((key: string) => {
-//        var value = object[key];
-
-//        observableObject[key] = unwrap(value);
-
-//        if (isSubscribable(value)) {
-//            value.subscribe(
-//                (newValue) => {
-//                    observableObject.set(key, newValue);
-//                }
-//            );
-//        }
-//    });
-
-//    return observableObject;
-//}
-
-//export function getUnderlyingObject(observableObject: kendo.data.ObservableObject): object {
-//    if (observableObject[getUnderlyingObjectFunctionName]) {
-//        return observableObject[getUnderlyingObjectFunctionName]();
-//    }
-//    return null;
-//}
-
-//export function knockoutObservableToKendoObservableArray(array: Array<any> | Subscribable<Array<any>>): Array<kendo.data.ObservableObject> {
-
-//    var observableObjects = new Array<kendo.data.ObservableObject>();
-//    if (array) {
-//        unwrap(array).forEach((object) => {
-//            observableObjects.push(knockoutObservableToKendoObservable(object));
-//        });
-//    }
-
-//    return observableObjects;
-//}