@gem-sdk/core 1.48.0-dev.45 → 1.48.0-dev.47
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -132,7 +132,7 @@ const composeTypographyStyle = (typo, typography, disableAttr)=>{
|
|
|
132
132
|
const customTypo = {
|
|
133
133
|
...typo.custom,
|
|
134
134
|
fallbackFontFamily: fallbackFontFamily,
|
|
135
|
-
isCustom:
|
|
135
|
+
isCustom: isCustomTypo(typo.custom)
|
|
136
136
|
};
|
|
137
137
|
return {
|
|
138
138
|
...composeTypographyV2(customTypo, typo.attrs),
|
|
@@ -143,8 +143,8 @@ const composeTypographyStyle = (typo, typography, disableAttr)=>{
|
|
|
143
143
|
...!typography?.type ? composeTypography(typography?.custom) : {}
|
|
144
144
|
};
|
|
145
145
|
};
|
|
146
|
-
const isCustomTypo = (
|
|
147
|
-
return
|
|
146
|
+
const isCustomTypo = (customTypo)=>{
|
|
147
|
+
return customTypo && Object.keys(customTypo).length > 1 || customTypo && Object.keys(customTypo).length === 1 && !customTypo.fontSize;
|
|
148
148
|
};
|
|
149
149
|
|
|
150
150
|
exports.composeFallbackTypographyStyle = composeFallbackTypographyStyle;
|
|
@@ -130,7 +130,7 @@ const composeTypographyStyle = (typo, typography, disableAttr)=>{
|
|
|
130
130
|
const customTypo = {
|
|
131
131
|
...typo.custom,
|
|
132
132
|
fallbackFontFamily: fallbackFontFamily,
|
|
133
|
-
isCustom:
|
|
133
|
+
isCustom: isCustomTypo(typo.custom)
|
|
134
134
|
};
|
|
135
135
|
return {
|
|
136
136
|
...composeTypographyV2(customTypo, typo.attrs),
|
|
@@ -141,8 +141,8 @@ const composeTypographyStyle = (typo, typography, disableAttr)=>{
|
|
|
141
141
|
...!typography?.type ? composeTypography(typography?.custom) : {}
|
|
142
142
|
};
|
|
143
143
|
};
|
|
144
|
-
const isCustomTypo = (
|
|
145
|
-
return
|
|
144
|
+
const isCustomTypo = (customTypo)=>{
|
|
145
|
+
return customTypo && Object.keys(customTypo).length > 1 || customTypo && Object.keys(customTypo).length === 1 && !customTypo.fontSize;
|
|
146
146
|
};
|
|
147
147
|
|
|
148
148
|
export { composeFallbackTypographyStyle, composeFontFamilyTypographyV2, composeTypography, composeTypographyAttr, composeTypographyClassName, composeTypographyCss, composeTypographyStyle, composeTypographyV2, composeTypographyV2Css, genTypoClass };
|