@tamagui/core 1.109.4 → 1.109.6
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.
- package/dist/native.js +2 -2
- package/dist/native.js.map +1 -1
- package/dist/test.native.js +2 -2
- package/dist/test.native.js.map +1 -1
- package/package.json +6 -6
package/dist/test.native.js
CHANGED
|
@@ -6782,10 +6782,10 @@ var require_getVariantExtras_native = __commonJS({
|
|
|
6782
6782
|
tokens: conf.tokensParsed,
|
|
6783
6783
|
theme,
|
|
6784
6784
|
get fontFamily() {
|
|
6785
|
-
return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont);
|
|
6785
|
+
return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
|
|
6786
6786
|
},
|
|
6787
6787
|
get font() {
|
|
6788
|
-
return fonts[this.fontFamily] ||
|
|
6788
|
+
return fonts[this.fontFamily] || (props.fontFamily ? void 0 : styleState.conf.defaultFont);
|
|
6789
6789
|
},
|
|
6790
6790
|
// TODO do this in splitstlye
|
|
6791
6791
|
// we avoid passing in default props for media queries because that would confuse things like SizableText.size:
|