@tamagui/core 1.109.5 → 1.109.7

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.
Files changed (5) hide show
  1. package/dist/native.js +2 -2
  2. package/dist/native.js.map +1 -1
  3. package/dist/test.native.js +2 -2
  4. package/dist/test.native.js.map +1 -1
  5. package/package.json +6 -6
package/dist/native.js CHANGED
@@ -7130,10 +7130,10 @@ var require_getVariantExtras_native = __commonJS({
7130
7130
  tokens: conf.tokensParsed,
7131
7131
  theme,
7132
7132
  get fontFamily() {
7133
- return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont);
7133
+ return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
7134
7134
  },
7135
7135
  get font() {
7136
- return fonts[this.fontFamily] || fonts[styleState.conf.defaultFont];
7136
+ return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
7137
7137
  },
7138
7138
  // TODO do this in splitstlye
7139
7139
  // we avoid passing in default props for media queries because that would confuse things like SizableText.size: