@gem-sdk/core 1.48.0-dev.43 → 1.48.0-dev.47

package/dist/cjs/helpers/typography.js

@@ -76,9 +76,9 @@ const composeTypographyV2 = (value, attrs)=>{
     });
 };
 const composeFontFamilyTypographyV2 = (value)=>{
-    const fontFamily = value?.fontFamily;
+    const { fontFamily, isCustom, fallbackFontFamily } = value || {};
     if (!fontFamily) {
-        return value?.fallbackFontFamily;
+        return isCustom ? fallbackFontFamily : undefined;
     }
     if (typeof fontFamily === 'string') {
         return getFontUsedByTypographyV2({
@@ -121,15 +121,7 @@ const composeTypographyClassName = (typo, typography)=>{
     return typo ? typo?.type && !isCustomTypo(typo.custom) ? genTypoClass(typo.type) : '' : typography?.type && genTypoClass(typography?.type);
 };
 const composeFallbackTypographyStyle = (tag)=>{
-    if ([
-        'heading',
-        'heading-1',
-        'heading-2',
-        'heading-3',
-        'heading-4',
-        'heading-5',
-        'heading-6'
-    ].includes(tag)) {
+    if (tag.toLocaleLowerCase().includes('heading')) {
         return 'var(--g-font-heading, heading)';
     }
     return 'var(--g-font-body, body)';
@@ -139,7 +131,8 @@ const composeTypographyStyle = (typo, typography, disableAttr)=>{
         const fallbackFontFamily = composeFallbackTypographyStyle(typo.type ?? 'heading');
         const customTypo = {
             ...typo.custom,
-            fallbackFontFamily: fallbackFontFamily
+            fallbackFontFamily: fallbackFontFamily,
+            isCustom: isCustomTypo(typo.custom)
         };
         return {
             ...composeTypographyV2(customTypo, typo.attrs),
@@ -150,8 +143,8 @@ const composeTypographyStyle = (typo, typography, disableAttr)=>{
         ...!typography?.type ? composeTypography(typography?.custom) : {}
     };
 };
-const isCustomTypo = (typoProps)=>{
-    return typoProps && Object.keys(typoProps).length > 1 || typoProps && Object.keys(typoProps).length === 1 && !typoProps.fontSize;
+const isCustomTypo = (customTypo)=>{
+    return customTypo && Object.keys(customTypo).length > 1 || customTypo && Object.keys(customTypo).length === 1 && !customTypo.fontSize;
 };
 
 exports.composeFallbackTypographyStyle = composeFallbackTypographyStyle;

package/dist/esm/helpers/typography.js

@@ -74,9 +74,9 @@ const composeTypographyV2 = (value, attrs)=>{
     });
 };
 const composeFontFamilyTypographyV2 = (value)=>{
-    const fontFamily = value?.fontFamily;
+    const { fontFamily, isCustom, fallbackFontFamily } = value || {};
     if (!fontFamily) {
-        return value?.fallbackFontFamily;
+        return isCustom ? fallbackFontFamily : undefined;
     }
     if (typeof fontFamily === 'string') {
         return getFontUsedByTypographyV2({
@@ -119,15 +119,7 @@ const composeTypographyClassName = (typo, typography)=>{
     return typo ? typo?.type && !isCustomTypo(typo.custom) ? genTypoClass(typo.type) : '' : typography?.type && genTypoClass(typography?.type);
 };
 const composeFallbackTypographyStyle = (tag)=>{
-    if ([
-        'heading',
-        'heading-1',
-        'heading-2',
-        'heading-3',
-        'heading-4',
-        'heading-5',
-        'heading-6'
-    ].includes(tag)) {
+    if (tag.toLocaleLowerCase().includes('heading')) {
         return 'var(--g-font-heading, heading)';
     }
     return 'var(--g-font-body, body)';
@@ -137,7 +129,8 @@ const composeTypographyStyle = (typo, typography, disableAttr)=>{
         const fallbackFontFamily = composeFallbackTypographyStyle(typo.type ?? 'heading');
         const customTypo = {
             ...typo.custom,
-            fallbackFontFamily: fallbackFontFamily
+            fallbackFontFamily: fallbackFontFamily,
+            isCustom: isCustomTypo(typo.custom)
         };
         return {
             ...composeTypographyV2(customTypo, typo.attrs),
@@ -148,8 +141,8 @@ const composeTypographyStyle = (typo, typography, disableAttr)=>{
         ...!typography?.type ? composeTypography(typography?.custom) : {}
     };
 };
-const isCustomTypo = (typoProps)=>{
-    return typoProps && Object.keys(typoProps).length > 1 || typoProps && Object.keys(typoProps).length === 1 && !typoProps.fontSize;
+const isCustomTypo = (customTypo)=>{
+    return customTypo && Object.keys(customTypo).length > 1 || customTypo && Object.keys(customTypo).length === 1 && !customTypo.fontSize;
 };
 
 export { composeFallbackTypographyStyle, composeFontFamilyTypographyV2, composeTypography, composeTypographyAttr, composeTypographyClassName, composeTypographyCss, composeTypographyStyle, composeTypographyV2, composeTypographyV2Css, genTypoClass };

package/dist/types/index.d.ts

@@ -8033,8 +8033,79 @@ type ShapeSelectorControlType<T> = SharedControlType<T> & {
     type: 'shape-selector';
 };
 
+declare enum CompareType {
+    EXACT = "exact",
+    ABOVE = "above",
+    BELOW = "below",
+    EXACT_OR_ABOVE = "exact_or_above",
+    EXACT_OR_BELOW = "exact_or_below",
+    BETWEEN = "between"
+}
+declare enum TriggerType {
+    INVENTORY_STATUS = "inventory_status",
+    DISCOUNT_PRICE = "discount_price",
+    PRICE_RANGE = "price_range",
+    PRODUCT_TAGS = "product_tags",
+    CREATION_DATE = "creation_date"
+}
+declare enum InventoryStatus {
+    IN_STOCK = "in_stock",
+    OUT_OF_STOCK = "out_of_stock"
+}
+declare enum CreationDateType {
+    DURATION = "duration",
+    EXACT_DATE = "exact_date",
+    BETWEEN_DATES = "between_dates"
+}
+declare enum DiscountType {
+    PERCENT = "percent",
+    FIXED = "fixed"
+}
+type InventoryStatusTrigger = {
+    triggerEvent: TriggerType.INVENTORY_STATUS;
+    type: InventoryStatus;
+    quantityType: CompareType;
+    from: string;
+    to?: string;
+    priority: number;
+    conditionType?: CompareType;
+};
+type DiscountPriceTrigger = {
+    triggerEvent: TriggerType.DISCOUNT_PRICE;
+    type: CompareType;
+    amount?: string;
+    from?: string;
+    to?: string;
+    priority: number;
+    conditionType?: CompareType;
+    discountType?: DiscountType;
+};
+type PriceRangeTrigger = {
+    triggerEvent: TriggerType.PRICE_RANGE;
+    from: string;
+    to: string;
+    priority: number;
+    conditionType?: CompareType;
+};
+type CreationDateTrigger = {
+    triggerEvent: TriggerType.CREATION_DATE;
+    type: CreationDateType;
+    days: string;
+    from: string;
+    to: string;
+    priority: number;
+    conditionType?: CompareType;
+};
+type ProductTagTrigger = {
+    triggerEvent: TriggerType.PRODUCT_TAGS;
+    searchTag: string[];
+    priority: number;
+    conditionType?: CompareType;
+};
+type TDisplayTrigger = InventoryStatusTrigger | DiscountPriceTrigger | PriceRangeTrigger | ProductTagTrigger | CreationDateTrigger;
 type DisplayTriggerControlType<T> = SharedControlType<T> & {
     type: 'display-trigger-badge';
+    default: TDisplayTrigger[];
 };
 
 type CustomPositionControlType<T> = SharedControlType<T> & {
@@ -28498,6 +28569,7 @@ type TypographyProps = {
     fallbackFontFamily?: string;
     textShadow?: ShadowProps;
     hasShadowText?: boolean;
+    isCustom?: boolean;
 };
 type TypographyV2Props = Omit<TypographyProps, 'fontSize' | 'lineHeight'> & {
     fontSize?: ObjectDevices<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gem-sdk/core",
-  "version": "1.48.0-dev.43",
+  "version": "1.48.0-dev.47",
   "license": "MIT",
   "sideEffects": false,
   "main": "dist/cjs/index.js",