@omnia/velcron 8.0.94-vnext → 8.0.96-vnext

package/models/VelcronDefinitions.d.ts

@@ -183,9 +183,9 @@ export interface VelcronAppDefinition<TState extends DynamicState = DynamicState
 }
 export interface VelcronComponentDefinition extends VelcronDefinition {
     type: string;
-    events: any;
-    properties: [];
-    icon: any;
+    events?: any;
+    properties?: [];
+    icon?: any;
 }
 /*** Built-in Components *********************************************************************/
 export interface VelcronViewDefinition extends VelcronDefinition, VelcronColorStyling {

package/models/VelcronPropertyEditorDefinitions.d.ts

@@ -42,13 +42,19 @@ export interface VelcronSliderPropertyEditorSettings {
     max: number;
     step: number;
 }
+export interface VelcronTypographyEditorSettings {
+    type: "title" | "text";
+}
 export interface VelcronSliderPropertyEditor extends VelcronPropertyEditor<VelcronSliderPropertyEditorSettings> {
     type: "slider";
 }
 export interface VelcronTextPropertyEditor extends VelcronPropertyEditor<any> {
     type: "text";
 }
-export interface VelcronTypographyPropertyEditor extends VelcronPropertyEditor<any> {
+export interface VelcronEnterprisePropertyEditor extends VelcronPropertyEditor<any> {
+    type: "enterprise-property";
+}
+export interface VelcronTypographyPropertyEditor extends VelcronPropertyEditor<VelcronTypographyEditorSettings> {
     type: "typography";
 }
 export interface VelcronSwitchPropertyEditor extends VelcronPropertyEditor<any> {
@@ -78,6 +84,9 @@ export interface VelcronContentState {
         main?: string;
     };
 }
+export interface VelcronPropertiesState {
+    propertyItems: Array<any>;
+}
 export interface VelcronImageState {
     url?: string;
     ratio?: VelcronImageRatios;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/velcron",
   "license": "MIT",
-  "version": "8.0.94-vnext",
+  "version": "8.0.96-vnext",
   "description": "Provide Omnia Velcron Stuffs.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/parser/VelcronConstants.d.ts

@@ -6,9 +6,10 @@ export declare const VelcronConstants: {
         text: string;
         image: string;
         button: string;
-        textInput: string;
-        progress: string;
-        webView: string;
+        "text-input": string;
+        "progress-circle": string;
+        "web-view": string;
+        "custom-component": string;
         dialog: string;
         icon: string;
         chip: string;
@@ -29,4 +30,7 @@ export declare const VelcronConstants: {
         tokenEnd: string;
         propsToken: string;
     };
+    context: {
+        thisToken: string;
+    };
 };

package/parser/VelcronConstants.js

@@ -9,9 +9,10 @@ exports.VelcronConstants = {
         text: "text",
         image: "image",
         button: "button",
-        textInput: "text-input",
-        progress: "progress",
-        webView: "web-view",
+        "text-input": "text-input",
+        "progress-circle": "progress-circle",
+        "web-view": "web-view",
+        "custom-component": "custom-component",
         dialog: "dialog",
         icon: "icon",
         chip: "chip",
@@ -31,5 +32,8 @@ exports.VelcronConstants = {
         tokenStart: "{{",
         tokenEnd: "}}",
         propsToken: "$props"
+    },
+    context: {
+        thisToken: "$this"
     }
 };

package/parser/VelcronData.js

@@ -274,7 +274,7 @@ class VelcronData {
             else if (assignOperator && VelcronData.isString(value)) {
                 //Value is assignment from renderContext
                 // "$state.title = title" or "$state.title = $state.anotherTitle"
-                if (value === "this") {
+                if (value === "$this") {
                     // $state.currentItem = this (this means currentContext)
                     value = renderContext.currentContext;
                 }
@@ -518,6 +518,10 @@ class VelcronData {
             }
             result = propObj;
         }
+        else if (path === VelcronConstants_1.VelcronConstants.context.thisToken) {
+            //Eg foreach loop and binding to the whole object in binding use $this
+            result = renderContext.currentContext;
+        }
         else {
             const tokens = VelcronData.getTokens(path, true);
             if (tokens.length > 0) {

package/parser/VelcronRenderers.js

@@ -33,7 +33,7 @@ class VelcronRenderers {
             customComponentDefinition = renderContext.components?.find(p => p.type.toLowerCase() === definition.type.toLowerCase());
         }
         if (customComponentDefinition) {
-            if (!this.components["customcomponent"]) {
+            if (!this.components[__1.VelcronConstants.components["custom-component"]]) {
                 throw "Cant find the custom component renderer";
             }
             //Make a new instance of the custom component
@@ -43,7 +43,7 @@ class VelcronRenderers {
             //comes from the current instance and override the ones from the original to make style overide work as we want
             customComponentInstance.style = definition.style;
             result = {
-                component: this.components["customcomponent"],
+                component: this.components[__1.VelcronConstants.components["custom-component"]],
                 definition: customComponentInstance,
                 customComponent: true
             };

package/templatebuilder/editor/VelcronEditorBuilder.d.ts

@@ -2,12 +2,15 @@ import { VelcronPropertyEditor } from "@omnia/fx-models";
 import { VelcronContentEditorBuilder } from "./VelcronContentEditor";
 import { VelcronColorSchemaEditorBuilder } from "./VelcronColorSchemaEditor";
 import { VelcronImageEditorBuilder } from "./VelcronImageEditor";
+import { VelcronPropertyMappingEditorBuilder } from "./VelcronPropertyMappingEditorBuilder";
 export declare class VelcronEditorBuilder {
     private contentEditorBuilder;
     private colorSchemaEditorBuilder;
     private imageEditorBuilder;
+    private propertyMappingBuilder;
     content(): VelcronContentEditorBuilder;
     colorSchemaType(): VelcronColorSchemaEditorBuilder;
     image(): VelcronImageEditorBuilder;
+    properties(): VelcronPropertyMappingEditorBuilder;
     build(): VelcronPropertyEditor<any>[];
 }

package/templatebuilder/editor/VelcronEditorBuilder.js

@@ -4,6 +4,7 @@ exports.VelcronEditorBuilder = void 0;
 const VelcronContentEditor_1 = require("./VelcronContentEditor");
 const VelcronColorSchemaEditor_1 = require("./VelcronColorSchemaEditor");
 const VelcronImageEditor_1 = require("./VelcronImageEditor");
+const VelcronPropertyMappingEditorBuilder_1 = require("./VelcronPropertyMappingEditorBuilder");
 class VelcronEditorBuilder {
     content() {
         if (!this.contentEditorBuilder) {
@@ -23,6 +24,12 @@ class VelcronEditorBuilder {
         }
         return this.imageEditorBuilder;
     }
+    properties() {
+        if (!this.propertyMappingBuilder) {
+            this.propertyMappingBuilder = new VelcronPropertyMappingEditorBuilder_1.VelcronPropertyMappingEditorBuilder(this);
+        }
+        return this.propertyMappingBuilder;
+    }
     build() {
         const result = [];
         if (this.colorSchemaEditorBuilder) {
@@ -34,6 +41,9 @@ class VelcronEditorBuilder {
         if (this.imageEditorBuilder) {
             result.push(...this.imageEditorBuilder.internalBuild());
         }
+        if (this.propertyMappingBuilder) {
+            result.push(...this.propertyMappingBuilder.internalBuild());
+        }
         return result;
     }
 }

package/templatebuilder/editor/VelcronPropertyMappingEditorBuilder.d.ts

@@ -0,0 +1,9 @@
+import { VelcronPropertyEditor } from "@omnia/fx-models";
+import { VelcronEditorBuilder } from "./VelcronEditorBuilder";
+import { VelcronEditorBuilderBase } from "./VelcronEditorBuilderBase";
+export declare class VelcronPropertyMappingEditorBuilder extends VelcronEditorBuilderBase {
+    private editor;
+    constructor(builder: any);
+    add(): VelcronEditorBuilder;
+    protected internalBuild(): VelcronPropertyEditor<any>[];
+}

package/templatebuilder/editor/VelcronPropertyMappingEditorBuilder.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VelcronPropertyMappingEditorBuilder = void 0;
+const VelcronEditorBuilderBase_1 = require("./VelcronEditorBuilderBase");
+class VelcronPropertyMappingEditorBuilder extends VelcronEditorBuilderBase_1.VelcronEditorBuilderBase {
+    constructor(builder) {
+        super(builder);
+        this.editor = null;
+    }
+    add() {
+        if (!this.editor) {
+            this.editor = {
+                name: "Properties",
+                type: "enterprise-property",
+                stateMapping: "propertyItems",
+                propertyMapping: true,
+                multiple: true,
+            };
+        }
+        return this.builder;
+    }
+    internalBuild() {
+        const result = [];
+        if (this.editor) {
+            result.push(this.editor);
+        }
+        return result;
+    }
+}
+exports.VelcronPropertyMappingEditorBuilder = VelcronPropertyMappingEditorBuilder;

package/templatebuilder/state/VelcronPropertyMappingStateBuilder.d.ts

@@ -0,0 +1,11 @@
+import { VelcronStateBuilderBase } from "./VelcronStateBuilderBase";
+export declare class VelcronPropertyMappingStateBuilder extends VelcronStateBuilderBase {
+    private propertyItemsValue;
+    constructor(stateBuilder: any);
+    propertyItems: {
+        add: (items?: any[]) => VelcronPropertyMappingStateBuilder;
+        bind: string;
+        foreach: string;
+    };
+    protected internalBuild(): {};
+}

package/templatebuilder/state/VelcronPropertyMappingStateBuilder.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VelcronPropertyMappingStateBuilder = void 0;
+const VelcronStateBuilderBase_1 = require("./VelcronStateBuilderBase");
+class VelcronPropertyMappingStateBuilder extends VelcronStateBuilderBase_1.VelcronStateBuilderBase {
+    constructor(stateBuilder) {
+        super(stateBuilder);
+        this.propertyItemsValue = [];
+        this.propertyItems = {
+            add: (items) => {
+                this.propertyItemsValue = items;
+                return this;
+            },
+            bind: "$propertyItems",
+            foreach: "propertyItems"
+        };
+    }
+    internalBuild() {
+        const resultValue = {};
+        let hasContent = false;
+        if (this.propertyItemsValue) {
+            resultValue.propertyItems = this.propertyItemsValue;
+            hasContent = true;
+        }
+        return resultValue;
+    }
+}
+exports.VelcronPropertyMappingStateBuilder = VelcronPropertyMappingStateBuilder;

package/templatebuilder/state/VelcronStateBuilder.d.ts

@@ -1,12 +1,15 @@
 import { VelcronColorSchemaStateBuilder } from "./VelcronColorSchemaBuilder";
 import { VelcronContentStateBuilder } from "./VelcronContentStateBuilder";
 import { VelcronImageStateBuilder } from "./VelcronImageStateBuilder";
+import { VelcronPropertyMappingStateBuilder } from "./VelcronPropertyMappingStateBuilder";
 export declare class VelcronStateBuilder {
     private contentStateBuilder;
     private imageStateBuilder;
     private colorSchemaStateBuilder;
+    private propertyMappingStateBuilder;
     content(): VelcronContentStateBuilder;
     image(): VelcronImageStateBuilder;
     colorSchemaType(): VelcronColorSchemaStateBuilder;
+    properties(): VelcronPropertyMappingStateBuilder;
     build(): any;
 }

package/templatebuilder/state/VelcronStateBuilder.js

@@ -4,6 +4,7 @@ exports.VelcronStateBuilder = void 0;
 const VelcronColorSchemaBuilder_1 = require("./VelcronColorSchemaBuilder");
 const VelcronContentStateBuilder_1 = require("./VelcronContentStateBuilder");
 const VelcronImageStateBuilder_1 = require("./VelcronImageStateBuilder");
+const VelcronPropertyMappingStateBuilder_1 = require("./VelcronPropertyMappingStateBuilder");
 class VelcronStateBuilder {
     content() {
         if (!this.contentStateBuilder) {
@@ -23,11 +24,18 @@ class VelcronStateBuilder {
         }
         return this.colorSchemaStateBuilder;
     }
+    properties() {
+        if (!this.propertyMappingStateBuilder) {
+            this.propertyMappingStateBuilder = new VelcronPropertyMappingStateBuilder_1.VelcronPropertyMappingStateBuilder(this);
+        }
+        return this.propertyMappingStateBuilder;
+    }
     build() {
         return {
             ...this?.contentStateBuilder?.internalBuild(),
             ...this?.imageStateBuilder?.internalBuild(),
             ...this?.colorSchemaStateBuilder?.internalBuild(),
+            ...this?.propertyMappingStateBuilder?.internalBuild(),
         };
     }
 }