@tamagui/web 3.0.5 → 3.0.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/cjs/_withNativeStyle.cjs +37 -20
- package/dist/cjs/_withNativeStyle.native.cjs +37 -20
- package/dist/cjs/_withNativeStyle.native.js +37 -20
- package/dist/cjs/_withNativeStyle.native.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.cjs +2 -1
- package/dist/cjs/helpers/getSplitStyles.native.cjs +2 -1
- package/dist/cjs/helpers/getSplitStyles.native.js +2 -1
- package/dist/cjs/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/cjs/helpers/nativeStyleEngine.cjs +67 -121
- package/dist/cjs/helpers/nativeStyleEngine.native.cjs +66 -161
- package/dist/cjs/helpers/nativeStyleEngine.native.js +66 -161
- package/dist/cjs/helpers/nativeStyleEngine.native.js.map +1 -1
- package/dist/esm/_withNativeStyle.mjs +38 -21
- package/dist/esm/_withNativeStyle.mjs.map +1 -1
- package/dist/esm/_withNativeStyle.native.js +38 -21
- package/dist/esm/_withNativeStyle.native.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +2 -1
- package/dist/esm/helpers/getSplitStyles.mjs.map +1 -1
- package/dist/esm/helpers/getSplitStyles.native.js +2 -1
- package/dist/esm/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/esm/helpers/nativeStyleEngine.mjs +66 -121
- package/dist/esm/helpers/nativeStyleEngine.mjs.map +1 -1
- package/dist/esm/helpers/nativeStyleEngine.native.js +65 -161
- package/dist/esm/helpers/nativeStyleEngine.native.js.map +1 -1
- package/package.json +17 -17
- package/src/_withNativeStyle.tsx +67 -31
- package/src/helpers/getSplitStyles.tsx +3 -0
- package/src/helpers/nativeStyleEngine.ts +95 -162
- package/types/_withNativeStyle.d.ts +4 -3
- package/types/_withNativeStyle.d.ts.map +1 -1
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/nativeStyleEngine.d.ts +19 -6
- package/types/helpers/nativeStyleEngine.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 { getNativeStyleEngine,
|
|
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 { createNativeStyleLinkState, getNativeStyleEngine, linkNativeStyleHost, 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(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 Map();\n var createEntry = function() {\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(node) {\n if (node) linkHost(node, entry.state);\n }\n };\n return entry;\n };\n var ScopeContext = ThemeStateContext;\n var engineOf = getNativeStyleEngine;\n var scopeState = getThemeState;\n var resolve = resolveNativeStyleMapping;\n var linkState = createNativeStyleLinkState;\n var linkHost = linkNativeStyleHost;\n var assignRef = setRef;\n var render = function(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 resetsText = inText && host === \"view\";\n if (!themeState) {\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(scopeId);\n if (!entry) {\n entry = createEntry();\n entries.set(scopeId, entry);\n }\n if (entry.stateName !== name || entry.theme !== theme) {\n var themed = resolve(themeStyleKeys, name, theme);\n entry.style[1] = themed;\n entry.hostTextStyle[1] = themed;\n entry.stateName = name;\n entry.theme = theme;\n entry.state = linkState(themeStyleKeys, scopeId, name, theme);\n }\n var style = asHostText ? entry.hostTextStyle : entry.style;\n var wrapped = resetsText || asHostText && mayRenderText(rest.children);\n var state = entry.state;\n var hostRef = ref == null ? entry.ref : function(node) {\n if (!node) return assignRef(ref, null);\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 ...rest,\n ref: hostRef,\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(props) {\n return render(props);\n };\n NativeStyleView.inline = function(element) {\n return render(element.props, element.key);\n };\n return NativeStyleView;\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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"}
|
|
@@ -1263,6 +1263,7 @@ const shadowRecipeProperties = /* @__PURE__ */ new Set([
|
|
|
1263
1263
|
"textShadow",
|
|
1264
1264
|
"filter"
|
|
1265
1265
|
]);
|
|
1266
|
+
const shadowRecipeKeywords = /* @__PURE__ */ new Set(["inset", "none"]);
|
|
1266
1267
|
function configuredValue(state, property, raw, embedded = false, nativeColors) {
|
|
1267
1268
|
const grammar = getConfigRevisionState(state.conf);
|
|
1268
1269
|
let name = raw;
|
|
@@ -1410,7 +1411,7 @@ function configuredValue(state, property, raw, embedded = false, nativeColors) {
|
|
|
1410
1411
|
const usedSafeArea = state.flatUsesSafeArea;
|
|
1411
1412
|
out = grammar.embeddedTokens(raw, (word) => {
|
|
1412
1413
|
const resolved = configuredValue(state, property, word, false, nativeColors);
|
|
1413
|
-
if (resolved !== word || !shadowRecipeProperties.has(property) || !/^[a-z][\w-]*$/i.test(word)) return resolved;
|
|
1414
|
+
if (resolved !== word || !shadowRecipeProperties.has(property) || shadowRecipeKeywords.has(word) || !/^[a-z][\w-]*$/i.test(word)) return resolved;
|
|
1414
1415
|
return configuredValue(state, "color", word, false, nativeColors);
|
|
1415
1416
|
});
|
|
1416
1417
|
if (!usedSafeArea && state.flatUsesSafeArea) return out;
|