@omnia/fx-models 8.0.54-vnext → 8.0.55-vnext

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

@@ -13,13 +13,14 @@ export interface BluePrintDefinitions {
     variant2: BlueprintDefinition;
     variant3: BlueprintDefinition;
 }
-export type WebBlueprintDefintionType = "button" | "block" | "typography" | "searchbox" | "layout-spacing";
+export type WebBlueprintDefintionType = "button" | "block" | "typography" | "searchbox" | "layout-spacing" | "inner-spacing";
 export declare enum WebBlueprintDefintionTypes {
     button = "button",
     block = "block",
     typography = "typography",
     searchbox = "searchbox",
-    layoutspacing = "layout-spacing"
+    layoutspacing = "layout-spacing",
+    innerspacing = "inner-spacing"
 }
 export type VelcronBlueprintDefintionType = "button" | "typography" | "inner-spacing";
 export declare enum VelcronBlueprintDefintionTypes {

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

@@ -8,6 +8,7 @@ var WebBlueprintDefintionTypes;
     WebBlueprintDefintionTypes["typography"] = "typography";
     WebBlueprintDefintionTypes["searchbox"] = "searchbox";
     WebBlueprintDefintionTypes["layoutspacing"] = "layout-spacing";
+    WebBlueprintDefintionTypes["innerspacing"] = "inner-spacing";
 })(WebBlueprintDefintionTypes = exports.WebBlueprintDefintionTypes || (exports.WebBlueprintDefintionTypes = {}));
 var VelcronBlueprintDefintionTypes;
 (function (VelcronBlueprintDefintionTypes) {

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

@@ -0,0 +1,2 @@
+import { SpacingBlueprint } from "./BlueprintDefinition";
+export declare function getSpacingValueFromBlueprint(spacingValue: any, blueprint: SpacingBlueprint): number;

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

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSpacingValueFromBlueprint = void 0;
+const SpacingSetting_1 = require("./SpacingSetting");
+function getSpacingValueFromBlueprint(spacingValue, blueprint) {
+    if (!spacingValue) {
+        return 0;
+    }
+    let result = spacingValue;
+    if (isNaN(spacingValue) && blueprint?.definition) {
+        if (spacingValue === SpacingSetting_1.SpacingTypes.xs) {
+            result = blueprint.definition.xs;
+        }
+        else if (spacingValue === SpacingSetting_1.SpacingTypes.s) {
+            result = blueprint.definition.s;
+        }
+        else if (spacingValue === SpacingSetting_1.SpacingTypes.m) {
+            result = blueprint.definition.m;
+        }
+        else if (spacingValue === SpacingSetting_1.SpacingTypes.l) {
+            result = blueprint.definition.l;
+        }
+        else if (spacingValue === SpacingSetting_1.SpacingTypes.xl) {
+            result = blueprint.definition.xl;
+        }
+        else {
+            result = 0;
+        }
+    }
+    return result;
+}
+exports.getSpacingValueFromBlueprint = getSpacingValueFromBlueprint;

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

@@ -0,0 +1 @@
+export declare function setColorOpacity(color: any, opacity: any): any;

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

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setColorOpacity = void 0;
+function setColorOpacity(color, opacity) {
+    function getRGBValues(color) {
+        const tmpColor = color.replace("rgba", "rgb");
+        return tmpColor.substring(4, tmpColor.length - 1)
+            .replace(/ /g, "")
+            .split(",");
+    }
+    function getRGBValuesFromHex(color) {
+        const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(color);
+        if (result) {
+            return [
+                parseInt(result[1], 16),
+                parseInt(result[2], 16),
+                parseInt(result[3], 16)
+            ];
+        }
+    }
+    function isRGBColor(color) {
+        if (!color) {
+            return null;
+        }
+        if (color.indexOf("rgb") > -1) {
+            return true;
+        }
+        if (color.indexOf("rgba") > -1) {
+            return true;
+        }
+        return false;
+    }
+    let rgb = null;
+    if (!isRGBColor(color)) {
+        rgb = getRGBValuesFromHex(color);
+    }
+    else {
+        rgb = getRGBValues(color);
+    }
+    if (rgb) {
+        return `rgba(${rgb[0]},${rgb[1]},${rgb[2]},${opacity})`;
+    }
+    return color;
+}
+exports.setColorOpacity = setColorOpacity;

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

@@ -1,4 +1,4 @@
-import { Guid } from "@omnia/fx-models";
+import { Guid } from "../Guid";
 export interface SpacingSettings {
     top: number | SpacingType;
     right: number | SpacingType;

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

@@ -76,3 +76,7 @@ export declare enum ColorTypes {
     container = "container",
     onContainer = "onContainer"
 }
+export interface ColorGradient {
+    color: string;
+    stop?: number;
+}

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

@@ -1,12 +1,26 @@
 import { Guid } from "../Guid";
 export interface TypographyDefinition {
     id: Guid;
-    h1: TypographyTypeDefinition;
-    h2: TypographyTypeDefinition;
-    h3: TypographyTypeDefinition;
-    text: TypographyTypeDefinition;
-    caption: TypographyTypeDefinition;
-    link: TypographyTypeDefinition;
+    title: {
+        xl: TypographyTypeDefinition;
+        l: TypographyTypeDefinition;
+        m: TypographyTypeDefinition;
+        s: TypographyTypeDefinition;
+        xs: TypographyTypeDefinition;
+    };
+    text: {
+        l: TypographyTypeDefinition;
+        m: TypographyTypeDefinition;
+        s: TypographyTypeDefinition;
+        xs: TypographyTypeDefinition;
+    };
+    navigation: {
+        l: TypographyTypeDefinition;
+        m: TypographyTypeDefinition;
+    };
+    link: {
+        m: TypographyTypeDefinition;
+    };
 }
 export interface TypographyTypeDefinition {
     decoration?: string;
@@ -19,12 +33,18 @@ export interface TypographyTypeBreakPoint {
     size: number;
     lineHeight: number;
 }
-export type TypographyType = "h1" | "h2" | "h3" | "text" | "caption" | "link";
+export type TypographyType = "title" | "text" | "navigation" | "link";
 export declare enum TypographyTypes {
-    h1 = "h1",
-    h2 = "h2",
-    h3 = "h3",
+    title = "title",
     text = "text",
-    caption = "caption",
+    navigation = "navigation",
     link = "link"
 }
+export type TypographySize = "xl" | "l" | "m" | "s" | "xs";
+export declare enum TypographySizes {
+    xl = "xl",
+    l = "l",
+    m = "m",
+    s = "s",
+    xs = "xs"
+}

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

@@ -1,12 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypographyTypes = void 0;
+exports.TypographySizes = exports.TypographyTypes = void 0;
 var TypographyTypes;
 (function (TypographyTypes) {
-    TypographyTypes["h1"] = "h1";
-    TypographyTypes["h2"] = "h2";
-    TypographyTypes["h3"] = "h3";
+    TypographyTypes["title"] = "title";
     TypographyTypes["text"] = "text";
-    TypographyTypes["caption"] = "caption";
+    TypographyTypes["navigation"] = "navigation";
     TypographyTypes["link"] = "link";
 })(TypographyTypes = exports.TypographyTypes || (exports.TypographyTypes = {}));
+var TypographySizes;
+(function (TypographySizes) {
+    TypographySizes["xl"] = "xl";
+    TypographySizes["l"] = "l";
+    TypographySizes["m"] = "m";
+    TypographySizes["s"] = "s";
+    TypographySizes["xs"] = "xs";
+})(TypographySizes = exports.TypographySizes || (exports.TypographySizes = {}));

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

@@ -1,10 +1,10 @@
-import { ThemeDefinitionInstance } from "@omnia/fx/ux";
-import { BlueprintType, BlueprintTypes, ColorDefinition, ColorSchemaType, ColorSchemaTypes, ColorType, ColorTypes } from "./ThemeDefinitionV2";
-import { TypographyType, TypographyTypeDefinition, TypographyTypes } from "./TypographyDefinition";
-export declare function useThemeMethods(getThemeDefinition: () => ThemeDefinitionInstance): {
-    colorSchema: (colorSchemaType: ColorSchemaTypes | ColorSchemaType) => import("./ThemeDefinitionV2").ColorSchema;
-    blueprint: (blueprintType: BlueprintTypes | BlueprintType) => import("./BlueprintDefinition").BlueprintDefinition;
-    typography: (blueprintType: BlueprintTypes | BlueprintType, typographyType: TypographyTypes | TypographyType) => TypographyTypeDefinition;
+import { BlueprintType, BlueprintTypes, ColorDefinition, ColorSchema, ColorSchemaType, ColorSchemaTypes, ColorType, ColorTypes } from "./ThemeDefinitionV2";
+import { TypographySize, TypographySizes, TypographyType, TypographyTypeDefinition, TypographyTypes } from "./TypographyDefinition";
+import { BlueprintDefinition } from "./BlueprintDefinition";
+export declare function useThemeMethods(getThemeDefinition: () => any): {
+    colorSchema: (colorSchemaType: ColorSchemaTypes | ColorSchemaType) => ColorSchema;
+    blueprint: (blueprintType: BlueprintTypes | BlueprintType) => BlueprintDefinition;
+    typography: (blueprintType: BlueprintTypes | BlueprintType, typographyType: TypographyTypes | TypographyType, size: TypographySize | TypographySizes) => TypographyTypeDefinition;
     color: (colorSchemaType: ColorSchemaTypes | ColorSchemaType, colorType: ColorTypes | ColorType) => string;
     colorDefinition: (colorSchemaType: ColorSchemaTypes | ColorSchemaType, colorType: ColorTypes | ColorType) => ColorDefinition;
     complementaryColorType: (colorType: ColorTypes | ColorType) => ColorTypes;

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

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useThemeMethods = void 0;
+//import { ThemeDefinitionInstance } from "@omnia/fx/ux";
 const ThemeDefinitionV2_1 = require("./ThemeDefinitionV2");
 const TypographyDefinition_1 = require("./TypographyDefinition");
+// temp change ThemeDefinitionInstance to any because fx/shared can't reference higher level fx/ux
 function useThemeMethods(getThemeDefinition) {
     function colorSchema(colorSchemaType) {
         if (colorSchemaType === ThemeDefinitionV2_1.ColorSchemaTypes.primary) {
@@ -46,27 +48,20 @@ function useThemeMethods(getThemeDefinition) {
         }
         return getThemeDefinition().blueprints.default;
     }
-    function typography(blueprintType, typographyType) {
+    function typography(blueprintType, typographyType, size) {
         const typographyBlueprint = getThemeDefinition().blueprints[blueprintType].definitions.find(d => d.type === "typography");
-        if (typographyType === TypographyDefinition_1.TypographyTypes.h1) {
-            return typographyBlueprint.definition.h1;
+        if (typographyType === TypographyDefinition_1.TypographyTypes.text) {
+            return typographyBlueprint.definition.text[size];
         }
-        else if (typographyType === TypographyDefinition_1.TypographyTypes.h2) {
-            return typographyBlueprint.definition.h2;
+        else if (typographyType === TypographyDefinition_1.TypographyTypes.title) {
+            return typographyBlueprint.definition.title[size];
         }
-        else if (typographyType === TypographyDefinition_1.TypographyTypes.h3) {
-            return typographyBlueprint.definition.h3;
-        }
-        else if (typographyType === TypographyDefinition_1.TypographyTypes.caption) {
-            return typographyBlueprint.definition.caption;
+        else if (typographyType === TypographyDefinition_1.TypographyTypes.navigation) {
+            return typographyBlueprint.definition[size];
         }
         else if (typographyType === TypographyDefinition_1.TypographyTypes.link) {
-            return typographyBlueprint.definition.link;
-        }
-        else if (typographyType === TypographyDefinition_1.TypographyTypes.text) {
-            return typographyBlueprint.definition.text;
+            return typographyBlueprint.definition.link[TypographyDefinition_1.TypographySizes.m];
         }
-        return typographyBlueprint.definition.text;
     }
     function color(colorSchemaType, colorType) {
         const mappedColorSchema = colorSchema(colorSchemaType);

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

@@ -4,3 +4,5 @@ export * from "./OmniaThemes";
 export * from "./UseThemeMethods";
 export * from "./BlueprintDefinition";
 export * from "./SpacingSetting";
+export * from "./SharedBlueprintMethods";
+export * from "./SharedColorMethods";

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

@@ -7,3 +7,5 @@ tslib_1.__exportStar(require("./OmniaThemes"), exports);
 tslib_1.__exportStar(require("./UseThemeMethods"), exports);
 tslib_1.__exportStar(require("./BlueprintDefinition"), exports);
 tslib_1.__exportStar(require("./SpacingSetting"), exports);
+tslib_1.__exportStar(require("./SharedBlueprintMethods"), exports);
+tslib_1.__exportStar(require("./SharedColorMethods"), exports);

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

@@ -17,14 +17,14 @@ export declare enum VelcronIconTypes {
     fontAwesome = "fa"
 }
 export declare enum VelcronHorizontalAlignments {
-    left = 0,
-    center = 1,
-    right = 2
+    left = "left",
+    center = "center",
+    right = "right"
 }
 export declare enum VelcronVerticalAlignments {
-    top = 0,
-    center = 1,
-    bottom = 2
+    top = "top",
+    center = "center",
+    bottom = "bottom"
 }
 export declare enum VelcronDataTypes {
     unknown = "unknown",

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

@@ -24,15 +24,15 @@ var VelcronIconTypes;
 })(VelcronIconTypes = exports.VelcronIconTypes || (exports.VelcronIconTypes = {}));
 var VelcronHorizontalAlignments;
 (function (VelcronHorizontalAlignments) {
-    VelcronHorizontalAlignments[VelcronHorizontalAlignments["left"] = 0] = "left";
-    VelcronHorizontalAlignments[VelcronHorizontalAlignments["center"] = 1] = "center";
-    VelcronHorizontalAlignments[VelcronHorizontalAlignments["right"] = 2] = "right";
+    VelcronHorizontalAlignments["left"] = "left";
+    VelcronHorizontalAlignments["center"] = "center";
+    VelcronHorizontalAlignments["right"] = "right";
 })(VelcronHorizontalAlignments = exports.VelcronHorizontalAlignments || (exports.VelcronHorizontalAlignments = {}));
 var VelcronVerticalAlignments;
 (function (VelcronVerticalAlignments) {
-    VelcronVerticalAlignments[VelcronVerticalAlignments["top"] = 0] = "top";
-    VelcronVerticalAlignments[VelcronVerticalAlignments["center"] = 1] = "center";
-    VelcronVerticalAlignments[VelcronVerticalAlignments["bottom"] = 2] = "bottom";
+    VelcronVerticalAlignments["top"] = "top";
+    VelcronVerticalAlignments["center"] = "center";
+    VelcronVerticalAlignments["bottom"] = "bottom";
 })(VelcronVerticalAlignments = exports.VelcronVerticalAlignments || (exports.VelcronVerticalAlignments = {}));
 var VelcronDataTypes;
 (function (VelcronDataTypes) {

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

@@ -107,7 +107,7 @@ export interface VelcronDefinitionBase {
      */
     key?: string;
 }
-export interface VelcronDefinition extends VelcronDefinitionBase {
+export interface VelcronDefinition extends VelcronDefinitionBase, VelcronDimensionStyling {
     body?: Array<VelcronDefinition>;
     style?: VelcronStyling;
     foreach?: string;
@@ -119,12 +119,15 @@ export interface VelcronDefinitionWithEditMode extends VelcronDefinition {
     edit?: VelcronBindableProp<boolean>;
     bind?: VelcronBindableProp;
 }
+interface VelcronDimensionStyling {
+    padding?: VelcronSpacing;
+}
 export interface VelcronColorStyling {
     colorSchemaType?: string;
-    color?: string;
+    colorType?: string;
     filled?: boolean;
-    container?: boolean;
     toned?: boolean;
+    color?: string;
 }
 export interface VelcronStyling {
     margin?: number;
@@ -144,10 +147,10 @@ export interface VelcronCardStyling extends VelcronStyling {
     elevation: number;
 }
 export interface VelcronSpacing {
-    top: number;
-    right: number;
-    bottom: number;
-    left: number;
+    top: number | string;
+    right: number | string;
+    bottom: number | string;
+    left: number | string;
 }
 export interface VelcronIcon {
     type: VelcronIconTypes;
@@ -175,11 +178,10 @@ export interface VelcronComponentDefinition extends VelcronDefinition {
     icon: any;
 }
 /*** Built-in Components *********************************************************************/
-export interface VelcronViewDefinition extends VelcronDefinition {
+export interface VelcronViewDefinition extends VelcronDefinition, VelcronColorStyling {
     type: "View";
-    color?: VelcronColorStyling;
     events?: VelcronOnPressEvent;
-    column?: boolean;
+    direction?: "row" | "column";
     columnStyle?: object;
     horizontalAlignment?: VelcronHorizontalAlignments;
     verticalAlignment?: VelcronVerticalAlignments;
@@ -188,21 +190,20 @@ export interface VelcronViewDefinition extends VelcronDefinition {
     borderRadius?: VelcronDimensions;
     width?: number;
 }
-export interface VelcronCardDefinition extends VelcronDefinition {
+export interface VelcronCardDefinition extends VelcronDefinition, VelcronColorStyling {
     type: "Card";
-    color?: VelcronColorStyling;
     style?: VelcronCardStyling;
     footer?: Array<VelcronDefinition>;
     events?: VelcronOnPressEvent;
 }
-export interface VelcronTextDefinition extends VelcronDefinitionWithEditMode {
+export interface VelcronTextDefinition extends VelcronDefinitionWithEditMode, VelcronColorStyling {
     type: "Text";
     text: string;
     editLabel?: VelcronBindableProp;
-    color?: string;
     lineClamp?: number;
     noWrap?: boolean;
     typography?: string;
+    size?: string;
     events?: VelcronOnPressEvent & VelcronOnUpdatedEvent;
 }
 export declare enum VelcronImageRatios {
@@ -278,3 +279,4 @@ export type VelcronRenderProps<TDefinition> = {
     definition: TDefinition;
     renderContext: VelcronRenderContext;
 };
+export {};

package/oxide/OxideTypeDefinitions.d.ts

@@ -22,7 +22,7 @@ export declare const AppBarTypeDefinitions: readonly ["default", "app"];
 export type AppBarTypes = typeof AppBarTypeDefinitions[number];
 export declare const AppBarTypesName = "AppBarTypes";
 /**Button */
-export declare const ButtonPresetDefinitions: readonly ["create", "delete", "ok", "cancel", "save", "close", "settings", "icon-add", "icon-delete", "icon-edit", "icon-drag-handle", "icon-copy", "icon-code", "icon-close", "icon-back", "icon-navigate", "icon-settings"];
+export declare const ButtonPresetDefinitions: readonly ["create", "delete", "ok", "cancel", "save", "close", "settings", "icon-add", "icon-delete", "icon-edit", "icon-drag-handle", "icon-copy", "icon-code", "icon-close", "icon-back", "icon-more", "icon-navigate", "icon-settings"];
 export type OxideButtonPresets = typeof ButtonPresetDefinitions[number];
 export declare const ButtonPresetsName = "OxideButtonPresets";
 export declare const ButtonVariantDefinitions: readonly ["default", "prominent", "toolbar", "opacity", "dial"];
@@ -107,7 +107,7 @@ export declare const TabVariantDefinitions: readonly ["default", "navigation", "
 export type TabVariants = typeof TabVariantDefinitions[number];
 export declare const TabVariantsName = "TabVariants";
 /** Text Box */
-export declare const TextBoxVariantTypeDefinitions: readonly ["default", "filter-menu", "search", "find-slim", "numberselector", "numberselector-prepend", "link", "media"];
+export declare const TextBoxVariantTypeDefinitions: readonly ["default", "filter-menu", "search", "find-slim", "link", "media"];
 export type TextBoxVariantTypes = typeof TextBoxVariantTypeDefinitions[number];
 export declare const TextBoxVariantTypesName = "TextBoxVariantTypes";
 export declare const TextBoxTypeDefinitions: readonly ["number"];

package/oxide/OxideTypeDefinitions.js

@@ -18,7 +18,7 @@ exports.ProgressTypesName = "ProgressTypes";
 exports.AppBarTypeDefinitions = ["default", "app"];
 exports.AppBarTypesName = "AppBarTypes";
 /**Button */
-exports.ButtonPresetDefinitions = ["create", "delete", "ok", "cancel", "save", "close", "settings", "icon-add", "icon-delete", "icon-edit", "icon-drag-handle", "icon-copy", "icon-code", "icon-close", "icon-back", "icon-navigate", "icon-settings"];
+exports.ButtonPresetDefinitions = ["create", "delete", "ok", "cancel", "save", "close", "settings", "icon-add", "icon-delete", "icon-edit", "icon-drag-handle", "icon-copy", "icon-code", "icon-close", "icon-back", "icon-more", "icon-navigate", "icon-settings"];
 exports.ButtonPresetsName = "OxideButtonPresets";
 exports.ButtonVariantDefinitions = ["default", "prominent", "toolbar", "opacity", "dial"];
 exports.ButtonVariantsName = "ButtonVariants";
@@ -81,7 +81,8 @@ exports.ScrollOffsetTypesName = "ScrollOffsetTypes";
 exports.TabVariantDefinitions = ["default", "navigation", "settings"];
 exports.TabVariantsName = "TabVariants";
 /** Text Box */
-exports.TextBoxVariantTypeDefinitions = ["default", "filter-menu", "search", "find-slim", "numberselector", "numberselector-prepend", "link", "media"];
+//export const TextBoxVariantTypeDefinitions = ["default", "filter-menu", "search", "find-slim", "numberselector", "numberselector-prepend", "link", "media"] as const;
+exports.TextBoxVariantTypeDefinitions = ["default", "filter-menu", "search", "find-slim", "link", "media"];
 exports.TextBoxVariantTypesName = "TextBoxVariantTypes";
 exports.TextBoxTypeDefinitions = ["number"];
 exports.TextBoxTypesName = "TextBoxTypes";

package/package.json

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