@omnia/fx-models 8.0.551-dev → 8.0.553-dev

package/Layout.d.ts

@@ -118,7 +118,8 @@ export declare enum SectionTypes {
     Tab = 2,
     Accordion = 3,
     Stepper = 4,
-    Slider = 5
+    Slider = 5,
+    Container = 6
 }
 export interface Section<T extends SectionSettings = SectionSettings> extends LayoutItem {
     name?: string;
@@ -145,6 +146,8 @@ export interface SectionSettings extends LayoutItemSettings {
     minHeight: string;
     spacingBlock: SpacingValue;
     spacingColumn: SpacingValue;
+    spacingBlockV2: SpacingValue;
+    spacingColumnV2: SpacingValue;
     minWidthBlock: string;
     margin?: Spacing;
     marginSectionLeft?: SpacingValue;
@@ -162,6 +165,7 @@ export interface SectionSettings extends LayoutItemSettings {
     /** End This section replaces the old title settings */
     useFullSpace: boolean;
     useWidthFromTheme?: boolean;
+    useLayoutMargin?: boolean;
     useCustomTheme: boolean;
     themeDefinition: LegacyThemeDefinition;
     hidden?: boolean;

package/Layout.js

@@ -8,6 +8,7 @@ var SectionTypes;
     SectionTypes[SectionTypes["Accordion"] = 3] = "Accordion";
     SectionTypes[SectionTypes["Stepper"] = 4] = "Stepper";
     SectionTypes[SectionTypes["Slider"] = 5] = "Slider";
+    SectionTypes[SectionTypes["Container"] = 6] = "Container";
 })(SectionTypes || (exports.SectionTypes = SectionTypes = {}));
 var JsonNullValueHandling;
 (function (JsonNullValueHandling) {

package/internal-do-not-import-from-here/shared/aurora/stores/SpacingBlueprintStore.d.ts

@@ -1,4 +1,4 @@
-import { BlueprintVariant, guid } from "internal/fx/shared/models";
+import { BlueprintVariant, guid, SpacingPreset } from "internal/fx/shared/models";
 import { useThemeStore } from "./ThemeStore";
 export declare const useSpacingBlueprintStore: () => {
     state: {
@@ -35,6 +35,7 @@ export declare const useSpacingBlueprintStore: () => {
                 scaling: (value: import("internal/fx/shared").SpacingValue) => boolean;
             };
         };
+        presetValue(preset: SpacingPreset): void;
     };
     deactivated(): void;
 } & {

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

@@ -3,6 +3,7 @@ import { guid } from "./Guid";
 import { TenantIdentifier } from "./Tenant";
 import { OmniaBackendRuntimes, OmniaClientRuntimes } from "./Enums";
 import { ActorId } from "./activity-hub";
+import { ThemeBoot } from "./theme";
 export interface OmniaSharedBootstrapData {
     uiThreadId: guid;
     workerThreadId: guid;
@@ -32,6 +33,7 @@ export interface OmniaSharedBootstrapData {
      * Don't use it, only for test perf
      */
     location: typeof window.location;
+    theming?: ThemeBoot;
 }
 export interface OmniaAnalytics {
     paq: any[];

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

@@ -6,6 +6,7 @@ export type Spacing = {
     left?: SpacingValue;
 };
 export type SpacingScale = "l" | "s";
+export type SpacingPreset = "preset-layout" | "preset-section" | "preset-column" | "preset-block";
 export interface SpacingDefinition {
     name?: string;
     xs?: number;
@@ -14,7 +15,7 @@ export interface SpacingDefinition {
     l?: number;
     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 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 | SpacingPreset;
 export declare enum SpacingTypes {
     xs = "xs",
     s = "s",

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

@@ -4,6 +4,7 @@ import { Id } from "../Id";
 import { BlueprintVariant, BoxDimensions, ButtonBlueprint, ComponentBlueprints, ContainerFillBlueprints, MediaResources, SpacingBlueprint, TextFillBlueprints } from "./Blueprints";
 import { Color } from "./Color";
 import { LegacyBorderDefinition, LegacyThemeDefinition } from "./LegacyThemeDefinition";
+import { Spacing, SpacingValue } from "./Spacing";
 import { ThemeBase } from "./ThemeBase";
 import { TypographyBlueprint } from "./Typography";
 export type ThemeContextType = "default" | "admin" | "designer" | "preview";
@@ -76,8 +77,18 @@ export interface ThemeDefinitionReference {
 export interface ThemeSettings {
     layoutWrapper?: {
         width?: number;
+        margin?: SpacingValue;
+    };
+    blockSpacing?: SpacingValue;
+    sectionMargin?: Spacing;
+    columnSpacing?: SpacingValue;
+    iconStyling?: {
+        style?: ThemeIconStyle;
+        pack?: ThemeIconPack;
     };
 }
+export type ThemeIconStyle = "solid" | "regular" | "light" | "thin";
+export type ThemeIconPack = "classic" | "duotone" | "sharp" | "sharp-duotone";
 export interface ResolvedThemeDefinition extends ThemeDefinition<ColorSchemas> {
     typography?: TypographyBlueprint;
     spacing?: SpacingBlueprint;

package/package.json

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

package/shared-mobile/Icon.d.ts

@@ -1,19 +1,21 @@
-import { IconTypes, IFabricIcon, IFlagIcon, IFontAwesomeIcon, IIcon, IMaterialIcon, ISvgIcon, MediaPickerImage, OButtonAffix, OTooltipPosition } from "@omnia/fx-models/internal-do-not-import-from-here/shared/models";
+import { IconTypes, IFabricIcon, IFlagIcon, IFontAwesomeIcon, IIcon, IMaterialIcon, ISvgIcon, MediaPickerImage, OButtonAffix, OTooltipPosition, ThemeIconPack, ThemeIconStyle } from "@omnia/fx-models/internal-do-not-import-from-here/shared/models";
 import { IconSources } from "../Enums";
 export interface ICustomIcon extends IIcon {
     customValue: string | MediaPickerImage;
 }
-/**
- * Class to create a guid
- */
 export declare class FontAwesomeIcon implements IFontAwesomeIcon {
     faClass: string;
+    private style;
+    private pack;
     iconType: IconTypes;
-    constructor(faClass: string);
+    private defaultIconPrefix;
+    constructor(faClass: string, style?: ThemeIconStyle, pack?: ThemeIconPack);
     toString(): string;
-    setStyle(style: "solid" | "regular" | "light" | "duotone" | "thin", force?: boolean): this;
+    setStyle(style?: ThemeIconStyle, force?: boolean): this;
+    setPack(pack?: ThemeIconPack, force?: boolean): this;
+    private applyStyleAndPack;
+    private getPrefixFor;
     private setDefaultIconStyle;
-    private setIconStyle;
 }
 export declare class MaterialIcon implements IMaterialIcon {
     maClass: string;

package/shared-mobile/Icon.js

@@ -5,57 +5,101 @@ const models_1 = require("@omnia/fx-models/internal-do-not-import-from-here/shar
 /**
  * Class to create a guid
  */
+const defaultIconStyle = "solid";
+const defaultIconPack = "classic";
 class FontAwesomeIcon {
-    constructor(faClass) {
+    constructor(faClass, style = defaultIconStyle, pack = defaultIconPack) {
+        // if (typeof omnia !== "undefined") {
+        //     const currentThemeIconDef = omnia.theming.defaultTheme?.settings?.iconStyling;
+        //     if (currentThemeIconDef) {
+        //         const currentPack = currentThemeIconDef?.pack;
+        //         const currentStyle = currentThemeIconDef?.style;
+        //         this.pack = currentPack || pack;
+        //         this.style = currentStyle || style;
+        //     }
+        // }
         this.faClass = faClass;
+        this.style = style;
+        this.pack = pack;
         this.iconType = models_1.IconTypes.FontAwesome;
+        this.defaultIconPrefix = "fa-solid";
         this.setDefaultIconStyle();
     }
     toString() {
         return this.faClass;
     }
-    //
-    setStyle(style, force) {
-        if (!force && this.faClass.indexOf(" ") === -1) {
+    setStyle(style = defaultIconStyle, force) {
+        this.style = style;
+        this.applyStyleAndPack(force);
+        return this;
+    }
+    setPack(pack = defaultIconPack, force) {
+        this.pack = pack;
+        this.applyStyleAndPack(force);
+        return this;
+    }
+    applyStyleAndPack(force) {
+        if (!this.faClass)
             return;
-        }
-        /**Brand icons cannot have different styles */
-        if (this.faClass.indexOf("fa-brands") > -1) {
+        if (!force && this.faClass.indexOf(" ") === -1)
             return;
+        // Brand icons should not be modified
+        if (this.faClass.indexOf("fa-brands") > -1)
+            return;
+        const split = this.faClass.split(" ");
+        const end = split[split.length - 1];
+        const prefix = this.getPrefixFor(this.pack, this.style);
+        this.faClass = prefix + " " + end;
+    }
+    getPrefixFor(pack, style) {
+        switch (pack) {
+            case "classic":
+                if (style === "solid")
+                    return "fa-solid";
+                if (style === "light")
+                    return "fa-light";
+                if (style === "regular")
+                    return "fa-regular";
+                if (style === "thin")
+                    return "fa-thin";
+            case "duotone":
+                if (style === "light")
+                    return "fa-duotone fa-light";
+                if (style === "regular")
+                    return "fa-duotone fa-regular";
+                if (style === "solid")
+                    return "fa-duotone fa-solid";
+                if (style === "thin")
+                    return "fa-duotone fa-thin";
+            case "sharp":
+                if (style === "light")
+                    return "fa-sharp fa-light";
+                if (style === "regular")
+                    return "fa-sharp fa-regular";
+                if (style === "solid")
+                    return "fa-sharp fa-solid";
+                if (style === "thin")
+                    return "fa-sharp fa-thin";
+            case "sharp-duotone":
+                if (style === "light")
+                    return "fa-sharp-duotone fa-light";
+                if (style === "regular")
+                    return "fa-sharp-duotone fa-regular";
+                if (style === "solid")
+                    return "fa-sharp-duotone fa-solid";
+                if (style === "thin")
+                    return "fa-sharp-duotone fa-thin";
         }
-        if (style === "solid") {
-            this.setIconStyle("fas");
-        }
-        else if (style === "regular") {
-            this.setIconStyle("fa");
-        }
-        else if (style === "light") {
-            this.setIconStyle("fal");
-        }
-        else if (style === "duotone") {
-            this.setIconStyle("fa-duotone");
-        }
-        else if (style === "thin") {
-            this.setIconStyle("fat");
-        }
-        return this;
+        return this.defaultIconPrefix;
     }
     setDefaultIconStyle() {
         if (this.faClass) {
             const split = this.faClass.split(" ");
             if (split.length === 1) {
-                this.setIconStyle("fa-duotone");
+                this.applyStyleAndPack(true);
             }
         }
     }
-    setIconStyle(style) {
-        if (!this.faClass) {
-            return;
-        }
-        const split = this.faClass.split(" ");
-        const end = split[split.length - 1];
-        this.faClass = style + " " + end;
-    }
 }
 exports.FontAwesomeIcon = FontAwesomeIcon;
 class MaterialIcon {