@tamagui/web 3.0.13 → 3.0.14
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/cjs/_withNativeStyle.cjs +7 -5
- package/dist/cjs/_withNativeStyle.native.cjs +8 -5
- package/dist/cjs/_withNativeStyle.native.js +8 -5
- package/dist/cjs/_withNativeStyle.native.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.cjs +3 -2
- package/dist/cjs/helpers/getSplitStyles.native.cjs +5 -3
- package/dist/cjs/helpers/getSplitStyles.native.js +5 -3
- package/dist/cjs/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/cjs/helpers/styledDynamic.cjs +1 -4
- package/dist/cjs/helpers/styledDynamic.native.cjs +2 -4
- package/dist/cjs/helpers/styledDynamic.native.js +2 -4
- package/dist/cjs/helpers/styledDynamic.native.js.map +1 -1
- package/dist/cjs/hooks/useThemeState.cjs +12 -5
- package/dist/cjs/hooks/useThemeState.native.cjs +16 -5
- package/dist/cjs/hooks/useThemeState.native.js +16 -5
- package/dist/cjs/hooks/useThemeState.native.js.map +1 -1
- package/dist/esm/_withNativeStyle.mjs +8 -6
- package/dist/esm/_withNativeStyle.mjs.map +1 -1
- package/dist/esm/_withNativeStyle.native.js +9 -6
- package/dist/esm/_withNativeStyle.native.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +3 -2
- package/dist/esm/helpers/getSplitStyles.mjs.map +1 -1
- package/dist/esm/helpers/getSplitStyles.native.js +5 -3
- package/dist/esm/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/esm/helpers/styledDynamic.mjs +1 -4
- package/dist/esm/helpers/styledDynamic.mjs.map +1 -1
- package/dist/esm/helpers/styledDynamic.native.js +2 -4
- package/dist/esm/helpers/styledDynamic.native.js.map +1 -1
- package/dist/esm/hooks/useThemeState.mjs +12 -6
- package/dist/esm/hooks/useThemeState.mjs.map +1 -1
- package/dist/esm/hooks/useThemeState.native.js +16 -6
- package/dist/esm/hooks/useThemeState.native.js.map +1 -1
- package/package.json +17 -17
- package/src/_withNativeStyle.tsx +14 -7
- package/src/helpers/getSplitStyles.tsx +8 -3
- package/src/helpers/styledDynamic.ts +3 -5
- package/src/hooks/useThemeState.ts +17 -6
- package/types/_withNativeStyle.d.ts.map +1 -1
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/styledDynamic.d.ts +3 -1
- package/types/helpers/styledDynamic.d.ts.map +1 -1
- package/types/hooks/useThemeState.d.ts +1 -0
- package/types/hooks/useThemeState.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_withNativeStyle.native.js","names":[],"sources":["esm/_withNativeStyle.native.js"],"sourcesContent":["import { jsx as _jsx } from \"react/jsx-runtime\";\nimport { setRef } from \"@tamagui/compose-refs\";\nimport { isAndroid, isIos } from \"@tamagui/constants\";\nimport React, { use } from \"react\";\nimport { _withStableStyle } from \"./_withStableStyle\";\nimport { captureNativeStyleRoot, createNativeStyleLinkState, getNativeStyleEngine, linkNativeStyleHost, nativeStyleMountMode, registerNativeStyle, resolveNativeStyleMapping } from \"./helpers/nativeStyleEngine\";\nimport { getThemeState, ThemeStateContext } from \"./hooks/useThemeState\";\nimport { hooks } from \"./setupHooks\";\nvar hostTextProps = {\n accessible: isAndroid ? false : isIos ? true : void 0,\n allowFontScaling: true,\n ellipsizeMode: \"tail\"\n};\nvar _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeStyleKeys, host) {\n var _hooks_getBaseViews;\n var Fallback = _withStableStyle(Component, function(theme) {\n var themedStyle = {};\n for (var styleKey in themeStyleKeys) {\n var _theme_themeStyleKeys_styleKey;\n themedStyle[styleKey] = (_theme_themeStyleKeys_styleKey = theme[themeStyleKeys[styleKey]]) === null || _theme_themeStyleKeys_styleKey === void 0 ? void 0 : _theme_themeStyleKeys_styleKey.get();\n }\n return [\n baseStyle,\n themedStyle\n ];\n }, true, false);\n var baseViews = host ? (_hooks_getBaseViews = hooks.getBaseViews) === null || _hooks_getBaseViews === void 0 ? void 0 : _hooks_getBaseViews.call(hooks) : void 0;\n var TextAncestor = baseViews === null || baseViews === void 0 ? void 0 : baseViews.TextAncestor;\n var TextAncestorProvider = TextAncestor === null || TextAncestor === void 0 ? void 0 : TextAncestor.Provider;\n var HostText = host === \"text\" && !(\"userSelect\" in baseStyle) && !(\"verticalAlign\" in baseStyle) ? baseViews === null || baseViews === void 0 ? void 0 : baseViews.NativeText : void 0;\n var hostTextBase = HostText ? {\n overflow: \"hidden\",\n ...baseStyle,\n ...typeof baseStyle.fontWeight === \"number\" && {\n fontWeight: String(baseStyle.fontWeight)\n }\n } : baseStyle;\n var entries = /* @__PURE__ */ new
|
|
1
|
+
{"version":3,"file":"_withNativeStyle.native.js","names":[],"sources":["esm/_withNativeStyle.native.js"],"sourcesContent":["import { jsx as _jsx } from \"react/jsx-runtime\";\nimport { setRef } from \"@tamagui/compose-refs\";\nimport { isAndroid, isIos } from \"@tamagui/constants\";\nimport React, { use } from \"react\";\nimport { _withStableStyle } from \"./_withStableStyle\";\nimport { captureNativeStyleRoot, createNativeStyleLinkState, getNativeStyleEngine, linkNativeStyleHost, nativeStyleMountMode, registerNativeStyle, resolveNativeStyleMapping } from \"./helpers/nativeStyleEngine\";\nimport { getThemeProviderScope, getThemeState, ThemeStateContext } from \"./hooks/useThemeState\";\nimport { hooks } from \"./setupHooks\";\nvar hostTextProps = {\n accessible: isAndroid ? false : isIos ? true : void 0,\n allowFontScaling: true,\n ellipsizeMode: \"tail\"\n};\nvar _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeStyleKeys, host) {\n var _hooks_getBaseViews;\n var Fallback = _withStableStyle(Component, function(theme) {\n var themedStyle = {};\n for (var styleKey in themeStyleKeys) {\n var _theme_themeStyleKeys_styleKey;\n themedStyle[styleKey] = (_theme_themeStyleKeys_styleKey = theme[themeStyleKeys[styleKey]]) === null || _theme_themeStyleKeys_styleKey === void 0 ? void 0 : _theme_themeStyleKeys_styleKey.get();\n }\n return [\n baseStyle,\n themedStyle\n ];\n }, true, false);\n var baseViews = host ? (_hooks_getBaseViews = hooks.getBaseViews) === null || _hooks_getBaseViews === void 0 ? void 0 : _hooks_getBaseViews.call(hooks) : void 0;\n var TextAncestor = baseViews === null || baseViews === void 0 ? void 0 : baseViews.TextAncestor;\n var TextAncestorProvider = TextAncestor === null || TextAncestor === void 0 ? void 0 : TextAncestor.Provider;\n var HostText = host === \"text\" && !(\"userSelect\" in baseStyle) && !(\"verticalAlign\" in baseStyle) ? baseViews === null || baseViews === void 0 ? void 0 : baseViews.NativeText : void 0;\n var hostTextBase = HostText ? {\n overflow: \"hidden\",\n ...baseStyle,\n ...typeof baseStyle.fontWeight === \"number\" && {\n fontWeight: String(baseStyle.fontWeight)\n }\n } : baseStyle;\n var entries = /* @__PURE__ */ new WeakMap();\n var createEntry = function createEntry2() {\n var entry = {\n style: [\n baseStyle,\n null\n ],\n hostTextStyle: [\n hostTextBase,\n null\n ],\n stateName: \"\",\n theme: null,\n state: null,\n ref: function ref(node) {\n if (!node) return;\n captureRoot(node);\n linkHost(node, entry.state);\n }\n };\n return entry;\n };\n var ScopeContext = ThemeStateContext;\n var engineOf = getNativeStyleEngine;\n var scopeState = getThemeState;\n var scopeOwner = getThemeProviderScope;\n var resolve = resolveNativeStyleMapping;\n var linkState = createNativeStyleLinkState;\n var linkHost = linkNativeStyleHost;\n var registerStyle = registerNativeStyle;\n var mountMode = nativeStyleMountMode;\n var captureRoot = captureNativeStyleRoot;\n var assignRef = setRef;\n var render = function render2(props, key) {\n var scopeId = use(ScopeContext);\n var inText = TextAncestor ? use(TextAncestor) : false;\n var themeState = scopeId && engineOf() ? scopeState(scopeId) : void 0;\n var owner = scopeOwner(scopeId);\n var resetsText = inText && host === \"view\";\n if (!themeState || !owner) {\n return resetsText ? /* @__PURE__ */ _jsx(TextAncestorProvider, {\n value: false,\n children: /* @__PURE__ */ _jsx(Fallback, {\n ...props\n })\n }, key) : /* @__PURE__ */ _jsx(Fallback, {\n ...props\n }, key);\n }\n var rest = props;\n if (props._expressions !== void 0) {\n var { _expressions: _ignoredExpressions, ...withoutExpressions } = props;\n rest = withoutExpressions;\n }\n var ref = props.ref;\n var { name, theme } = themeState;\n var asHostText = HostText && !inText;\n var Rendered = asHostText ? HostText : Component;\n var entry = entries.get(owner);\n if (!entry) {\n entry = createEntry();\n entries.set(owner, entry);\n }\n if (entry.stateName !== name || entry.theme !== theme) {\n var themed = resolve(themeStyleKeys, name, theme);\n entry.style = [\n baseStyle,\n themed\n ];\n entry.hostTextStyle = [\n hostTextBase,\n themed\n ];\n entry.stateName = name;\n entry.theme = theme;\n entry.state = linkState(themeStyleKeys, scopeId, name, theme);\n registerStyle(entry.style, entry.state);\n registerStyle(entry.hostTextStyle, entry.state);\n }\n var style = asHostText ? entry.hostTextStyle : entry.style;\n var wrapped = resetsText || asHostText && mayRenderText(rest.children);\n var state = entry.state;\n var discover = mountMode() === \"discover\";\n var passedRef = discover ? ref !== null && ref !== void 0 ? ref : null : ref == null ? entry.ref : function(node) {\n if (!node) return assignRef(ref, null);\n captureRoot(node);\n linkHost(node, state);\n if (typeof ref === \"function\") return ref(node);\n assignRef(ref, node);\n };\n var element = /* @__PURE__ */ _jsx(Rendered, {\n ...asHostText && hostTextProps,\n ...passedRef == null ? omitRef(rest) : rest,\n ...passedRef != null ? {\n ref: passedRef\n } : null,\n style\n }, wrapped ? void 0 : key);\n if (!wrapped) return element;\n return /* @__PURE__ */ _jsx(TextAncestorProvider, {\n value: !resetsText,\n children: element\n }, key);\n };\n var NativeStyleView = function NativeStyleView2(props) {\n return render(props);\n };\n NativeStyleView.inline = function(element) {\n var _element_key;\n return render(element.props, (_element_key = element.key) !== null && _element_key !== void 0 ? _element_key : void 0);\n };\n return NativeStyleView;\n};\nfunction omitRef(props) {\n if (!Object.prototype.hasOwnProperty.call(props, \"ref\")) return props;\n var { ref: _ref, ...rest } = props;\n return rest;\n}\nfunction mayRenderText(children) {\n if (children == null) return false;\n if (Array.isArray(children) && children.length <= 3) {\n return children.some(function(child) {\n return child != null && typeof child === \"object\";\n });\n }\n return typeof children === \"object\";\n}\nexport {\n _withNativeStyle\n};\n//# sourceMappingURL=_withNativeStyle.js.map\n"],"mappings":"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"}
|
|
@@ -1313,10 +1313,11 @@ function configuredValue(state, property, raw, embedded = false, nativeColors) {
|
|
|
1313
1313
|
let lookupName = name.charCodeAt(0) === 36 ? name.slice(1) : name;
|
|
1314
1314
|
let value;
|
|
1315
1315
|
let fromTheme = false;
|
|
1316
|
-
|
|
1316
|
+
const fonts = fontProperty && state.context?.language ? getDynamicEnv(state).fonts : state.conf.fontsParsed;
|
|
1317
|
+
if (property === "fontFamily") value = fonts[lookupName]?.family;
|
|
1317
1318
|
else {
|
|
1318
1319
|
const fontKey = property === "fontSize" ? "size" : property === "fontWeight" ? "weight" : property === "lineHeight" || property === "letterSpacing" ? property : "";
|
|
1319
|
-
if (fontKey) value = (
|
|
1320
|
+
if (fontKey) value = (fonts[state.fontFamily || state.conf.defaultFontToken] || fonts[state.conf.defaultFontToken])?.[fontKey]?.[lookupName];
|
|
1320
1321
|
else {
|
|
1321
1322
|
const category = grammar.tokenCategory(property);
|
|
1322
1323
|
const dot = lookupName.indexOf(".");
|