@omnia/fx-models 8.0.285-dev → 8.0.287-dev

package/Layout.d.ts

@@ -144,10 +144,11 @@ export interface SectionSettings extends LayoutItemSettings {
     spacingBlock: SpacingValue;
     spacingColumn: SpacingValue;
     minWidthBlock: string;
-    marginSectionLeft: SpacingValue;
-    marginSectionRight: SpacingValue;
-    marginSectionTop: SpacingValue;
-    marginSectionBottom: SpacingValue;
+    margin?: Spacing;
+    marginSectionLeft?: SpacingValue;
+    marginSectionRight?: SpacingValue;
+    marginSectionTop?: SpacingValue;
+    marginSectionBottom?: SpacingValue;
     targetingFilterProperties: TargetingFilterProperty;
     anchorName?: string;
     titleSettings?: BlockTitleSettings;
@@ -264,10 +265,11 @@ export interface HeaderItemSettings {
     titleRenderer?: TitleRendererValue;
 }
 export interface SpacingItemSettings {
-    paddingRight: number | SpacingValue;
-    paddingLeft: number | SpacingValue;
-    paddingTop: number | SpacingValue;
-    paddingBottom: number | SpacingValue;
+    padding: Spacing;
+    paddingRight?: number | SpacingValue;
+    paddingLeft?: number | SpacingValue;
+    paddingTop?: number | SpacingValue;
+    paddingBottom?: number | SpacingValue;
     minHeight: string;
 }
 export interface StyleItemSettings {

package/internal-do-not-import-from-here/shared/models/ShortId.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Generates a short ID.
+ *
+ * @returns {string} The generated short ID.
+ */
+export declare function shortId(): string;

package/internal-do-not-import-from-here/shared/models/ShortId.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shortId = shortId;
+const Guid_1 = require("./Guid");
+/**
+ * Generates a short ID.
+ *
+ * @returns {string} The generated short ID.
+ */
+function shortId() {
+    return (0, Guid_1.guid)().replace("-", "").substring(0, 8);
+}

package/internal-do-not-import-from-here/shared/models/index.d.ts

@@ -20,3 +20,4 @@ export * from "./velcron";
 export * from "./DependencyInjection";
 export * from "./Messaging";
 export * from "./EventHook";
+export * from "./ShortId";

package/internal-do-not-import-from-here/shared/models/index.js

@@ -24,3 +24,4 @@ tslib_1.__exportStar(require("./velcron"), exports);
 tslib_1.__exportStar(require("./DependencyInjection"), exports);
 tslib_1.__exportStar(require("./Messaging"), exports);
 tslib_1.__exportStar(require("./EventHook"), exports);
+tslib_1.__exportStar(require("./ShortId"), exports);

package/internal-do-not-import-from-here/shared/models/theming/Blueprints.d.ts

@@ -56,10 +56,9 @@ export interface ComponentBlueprints extends Blueprints, BlueprintsReference {
     containers?: ContainerBlueprints;
 }
 export interface SpacingBlueprint {
-    layout: SpacingDefinition;
-    inner: SpacingDefinition;
+    l: SpacingDefinition;
+    s: SpacingDefinition;
 }
-export type SpacingBlueprintTypes = "inner" | "layout";
 export type WebBlueprintItemDefintionType = "button" | "searchbox" | "text" | "icon" | "tab";
 export declare enum WebBlueprintItemDefintionTypes {
     button = "button",

package/internal-do-not-import-from-here/shared/models/theming/SharedBlueprintMethods.d.ts

@@ -1,2 +1,3 @@
-import { SpacingDefinition } from "./Spacing";
-export declare function getSpacingValueFromBlueprint(spacingValue: any, definition: SpacingDefinition): number;
+import { SpacingBlueprint } from "./Blueprints";
+import { SpacingScale } from "./Spacing";
+export declare function getSpacingValueFromBlueprint(spacingValue: any, blueprint: SpacingBlueprint, scale?: SpacingScale): number;

package/internal-do-not-import-from-here/shared/models/theming/SharedBlueprintMethods.js

@@ -3,30 +3,49 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSpacingValueFromBlueprint = getSpacingValueFromBlueprint;
 const Spacing_1 = require("./Spacing");
-function getSpacingValueFromBlueprint(spacingValue, definition) {
+const useSpacingScaling_1 = require("./useSpacingScaling");
+const spacingScaling = (0, useSpacingScaling_1.useSpacingScaling)();
+function getValueWithoutScale(value) {
+    if (!value) {
+        return value;
+    }
+    if (typeof value === "number") {
+        return value;
+    }
+    if (value.indexOf(":") === -1) {
+        return value;
+    }
+    return value.split(":")[1];
+}
+function getSpacingValueFromBlueprint(spacingValue, blueprint, scale) {
     if (!spacingValue) {
         return 0;
     }
+    if (!scale) {
+        scale = spacingScaling.get.scale(spacingValue);
+    }
+    const definition = scale === "l" ? blueprint.l : blueprint.s;
     let negative = false;
     let result = spacingValue;
     if (isNaN(spacingValue) && definition) {
-        if (spacingValue.startsWith("-")) {
+        let strippedValue = getValueWithoutScale(spacingValue);
+        if (strippedValue.startsWith("-")) {
             negative = true;
         }
-        spacingValue = spacingValue.replace("-", "");
-        if (spacingValue === Spacing_1.SpacingTypes.xs) {
+        strippedValue = strippedValue.replace("-", "");
+        if (strippedValue === Spacing_1.SpacingTypes.xs) {
             result = definition.xs;
         }
-        else if (spacingValue === Spacing_1.SpacingTypes.s) {
+        else if (strippedValue === Spacing_1.SpacingTypes.s) {
             result = definition.s;
         }
-        else if (spacingValue === Spacing_1.SpacingTypes.m) {
+        else if (strippedValue === Spacing_1.SpacingTypes.m) {
             result = definition.m;
         }
-        else if (spacingValue === Spacing_1.SpacingTypes.l) {
+        else if (strippedValue === Spacing_1.SpacingTypes.l) {
             result = definition.l;
         }
-        else if (spacingValue === Spacing_1.SpacingTypes.xl) {
+        else if (strippedValue === Spacing_1.SpacingTypes.xl) {
             result = definition.xl;
         }
         else {

package/internal-do-not-import-from-here/shared/models/theming/Spacing.d.ts

@@ -1,10 +1,11 @@
-export interface Spacing {
-    scale?: "l" | "s";
+export type Spacing = {
+    scale?: SpacingScale;
     top?: SpacingValue;
     right?: SpacingValue;
     bottom?: SpacingValue;
     left?: SpacingValue;
-}
+};
+export type SpacingScale = "l" | "s";
 export interface SpacingDefinition {
     name: string;
     xs: number;
@@ -13,7 +14,7 @@ export interface SpacingDefinition {
     l: number;
     xl: number;
 }
-export type SpacingValue = "xs" | "s" | "m" | "l" | "xl" | number;
+export type SpacingValue = "xs" | "s" | "m" | "l" | "xl" | "l:xs" | "l:s" | "l:m" | "l:l" | "l:xl" | "s:xs" | "s:s" | "s:m" | "s:l" | "s:xl" | number;
 export declare enum SpacingTypes {
     xs = "xs",
     s = "s",

package/internal-do-not-import-from-here/shared/models/theming/index.d.ts

@@ -5,3 +5,4 @@ export * from "./Spacing";
 export * from "./SharedBlueprintMethods";
 export * from "./SharedColorMethods";
 export * from "./Blueprints";
+export * from "./useSpacingScaling";

package/internal-do-not-import-from-here/shared/models/theming/index.js

@@ -9,3 +9,4 @@ tslib_1.__exportStar(require("./Spacing"), exports);
 tslib_1.__exportStar(require("./SharedBlueprintMethods"), exports);
 tslib_1.__exportStar(require("./SharedColorMethods"), exports);
 tslib_1.__exportStar(require("./Blueprints"), exports);
+tslib_1.__exportStar(require("./useSpacingScaling"), exports);

package/internal-do-not-import-from-here/shared/models/theming/useSpacingScaling.d.ts

@@ -0,0 +1,15 @@
+import { Spacing, SpacingScale, SpacingValue } from "@omnia/fx-models";
+export declare function useSpacingScaling(): {
+    get: {
+        valueWithoutScale: (value: SpacingValue) => string | number;
+        scaleFromValue: (value: SpacingValue) => SpacingScale;
+        scale: (value: Spacing | SpacingValue) => SpacingScale;
+    };
+    add: {
+        scaleToValue: (value: SpacingValue, scale: SpacingScale) => string | number;
+        fallBackScale: (value: SpacingValue, scale: SpacingScale) => string | number;
+    };
+    has: {
+        scaling: (value: SpacingValue) => boolean;
+    };
+};

package/internal-do-not-import-from-here/shared/models/theming/useSpacingScaling.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSpacingScaling = useSpacingScaling;
+function useSpacingScaling() {
+    function getValueWithoutScale(value) {
+        if (!value) {
+            return value;
+        }
+        if (typeof value === "number") {
+            return value;
+        }
+        if (!value.indexOf) {
+            return value;
+        }
+        if (value.indexOf(":") === -1) {
+            return value;
+        }
+        return value.split(":")[1];
+    }
+    function getScaleFromValue(value) {
+        if (!value) {
+            return value;
+        }
+        if (typeof value === "number") {
+            return value;
+        }
+        if (value.indexOf(":") === -1) {
+            return undefined;
+        }
+        return value.split(":")[0];
+    }
+    function addScaleToValue(value, scale) {
+        if (!scale) {
+            return value;
+        }
+        if (!value) {
+            return value;
+        }
+        if (typeof value === "number") {
+            return value;
+        }
+        if (value.indexOf(":") > -1) {
+            return `${scale}:${value.split(":")[1]}`;
+        }
+        return `${scale}:${value}`;
+    }
+    function hasScaling(value) {
+        if (!value) {
+            return false;
+        }
+        if (typeof value === "number") {
+            return false;
+        }
+        if (value.indexOf(":") > -1) {
+            return true;
+        }
+        return false;
+    }
+    function getScale(value) {
+        if (!value) {
+            return undefined;
+        }
+        if (typeof value === "object") {
+            return value.scale;
+        }
+        return getScaleFromValue(value);
+    }
+    function setScaleIfEmpty(value, scale) {
+        if (hasScaling(value)) {
+            return value;
+        }
+        return addScaleToValue(value, scale);
+    }
+    return {
+        get: {
+            valueWithoutScale: getValueWithoutScale,
+            scaleFromValue: getScaleFromValue,
+            scale: getScale
+        },
+        add: {
+            scaleToValue: addScaleToValue,
+            fallBackScale: setScaleIfEmpty
+        },
+        has: {
+            scaling: hasScaling
+        }
+    };
+}

package/internal-do-not-import-from-here/shared/models/velcron/VelcronDefinition.d.ts

@@ -25,17 +25,17 @@ export interface VelcronDefinition extends VelcronDefinitionBase, VelcronDimensi
     if?: string;
     events?: VelcronEvent;
 }
+export type VelcronSpacingScale = "l" | "s";
 export interface VelcronSpacing {
+    scale?: VelcronSpacingScale;
     top?: number | string;
     right?: number | string;
     bottom?: number | string;
     left?: number | string;
 }
-export type VelcronSpacingTypes = "inner" | "layout";
 interface VelcronDimensionStyling {
     margin?: VelcronSpacing;
     padding?: VelcronSpacing;
-    spacingType?: VelcronSpacingTypes;
 }
 export interface VelcronStyling {
     margin?: string;

package/internal-do-not-import-from-here/velcron/core/models/Enums.d.ts

@@ -26,6 +26,5 @@ export declare enum VelcronDataTypes {
     number = "number",
     boolean = "boolean",
     array = "array",
-    componentArray = "componentArray",
-    bind = "bind"
+    componentArray = "componentArray"
 }

package/internal-do-not-import-from-here/velcron/core/models/Enums.js

@@ -32,6 +32,4 @@ var VelcronDataTypes;
     VelcronDataTypes["boolean"] = "boolean";
     VelcronDataTypes["array"] = "array";
     VelcronDataTypes["componentArray"] = "componentArray";
-    //Depricated????
-    VelcronDataTypes["bind"] = "bind";
 })(VelcronDataTypes || (exports.VelcronDataTypes = VelcronDataTypes = {}));

package/internal-do-not-import-from-here/velcron/core/models/VelcronDefinitions.d.ts

@@ -1,5 +1,5 @@
 import { VelcronOnUpdatedEvent, VelcronOnClosedEvent, VelcronOnCloseRequestedEvent, VelcronOnPressEvent, VelcronSpacing, VelcronStyling, VelcronCustomComponentDefinition, VelcronAppDefinition, VelcronRendererResolverReference, EventHook, Future, TextBlueprint, VelcronBindableProp, VelcronEditor, ContainerBlueprint, BackgroundDefinition, ContainerVariant, IconBlueprint, ButtonBlueprint } from "@omnia/fx-models/internal-do-not-import-from-here/shared/models";
-import { VelcroncomponentArrayType, VelcronPrimitiveType } from "./VelcronTypes";
+import { VelcronComponentArrayType, VelcronPrimitiveType } from "./VelcronTypes";
 import { AssignOperators, VelcronHorizontalAlignments, VelcronIconTypes, VelcronActionTypes, VelcronVerticalAlignments } from "./Enums";
 import { DynamicState, VelcronDefinition, VelcronEffects, useVelcronThemingStore } from "..";
 import { guid, PropertyConfiguration, PropertyValue, PropertyDefinition, PropertySetupBase } from "@omnia/fx/models";
@@ -65,7 +65,7 @@ export interface VelcronRenderContext {
     };
     components?: Array<VelcronCustomComponentDefinition>;
     properties?: {
-        [name: string]: VelcronPrimitiveType | VelcroncomponentArrayType;
+        [name: string]: VelcronPrimitiveType | VelcronComponentArrayType;
     };
     computed?: {
         [name: string]: Array<string>;
@@ -314,6 +314,7 @@ export interface VelcronLottieDefinition extends VelcronDefinition {
 export interface VelcronSlidePanelDefinition extends VelcronDefinition {
     type: "slide-panel";
     slidesPerView?: VelcronBindableProp<number>;
+    delay?: VelcronBindableProp<number>;
     pagination?: VelcronBindableProp<boolean>;
     navigation?: VelcronBindableProp<boolean>;
     scrollbar?: VelcronBindableProp<boolean>;

package/internal-do-not-import-from-here/velcron/core/models/VelcronTypes.d.ts

@@ -2,4 +2,4 @@ import { VelcronDefinition } from "@omnia/fx-models";
 export type VelcronPrimitiveType = string | number | boolean;
 export type VelcronArrayType<T> = Array<T>;
 export type VelcronObjectType<T extends Object> = T;
-export type VelcroncomponentArrayType = Array<VelcronDefinition>;
+export type VelcronComponentArrayType = Array<VelcronDefinition>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/fx-models",
   "license": "MIT",
-  "version": "8.0.285-dev",
+  "version": "8.0.287-dev",
   "description": "Provide Omnia Fx Models Stuffs.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"