@tamagui/web 1.113.0 → 1.113.2
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/helpers/getSplitStyles.js +2 -2
- package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.native.js +2 -2
- package/dist/cjs/helpers/getSplitStyles.native.js.map +2 -2
- package/dist/cjs/helpers/propMapper.js +5 -2
- package/dist/cjs/helpers/propMapper.js.map +1 -1
- package/dist/cjs/helpers/propMapper.native.js +8 -8
- package/dist/cjs/helpers/propMapper.native.js.map +2 -2
- package/dist/cjs/hooks/useTheme.js +7 -8
- package/dist/cjs/hooks/useTheme.js.map +1 -1
- package/dist/cjs/hooks/useTheme.native.js +13 -8
- package/dist/cjs/hooks/useTheme.native.js.map +2 -2
- package/dist/esm/Tamagui.native.js +50 -41
- package/dist/esm/Tamagui.native.js.map +6 -1
- package/dist/esm/_withStableStyle.native.js +9 -11
- package/dist/esm/_withStableStyle.native.js.map +6 -1
- package/dist/esm/config.native.js +74 -75
- package/dist/esm/config.native.js.map +6 -1
- package/dist/esm/constants/accessibilityDirectMap.native.js +8 -6
- package/dist/esm/constants/accessibilityDirectMap.native.js.map +6 -1
- package/dist/esm/constants/constants.native.js +19 -17
- package/dist/esm/constants/constants.native.js.map +6 -1
- package/dist/esm/constants/isDevTools.native.js +10 -6
- package/dist/esm/constants/isDevTools.native.js.map +6 -1
- package/dist/esm/constants/webToNativeProps.native.js +162 -84
- package/dist/esm/constants/webToNativeProps.native.js.map +6 -1
- package/dist/esm/contexts/ComponentContext.native.js +5 -3
- package/dist/esm/contexts/ComponentContext.native.js.map +6 -1
- package/dist/esm/createComponent.native.js +300 -405
- package/dist/esm/createComponent.native.js.map +6 -1
- package/dist/esm/createFont.native.js +41 -24
- package/dist/esm/createFont.native.js.map +6 -1
- package/dist/esm/createShorthands.native.js +4 -2
- package/dist/esm/createShorthands.native.js.map +6 -1
- package/dist/esm/createTamagui.native.js +158 -177
- package/dist/esm/createTamagui.native.js.map +6 -1
- package/dist/esm/createTheme.native.js +5 -3
- package/dist/esm/createTheme.native.js.map +6 -1
- package/dist/esm/createTokens.native.js +5 -3
- package/dist/esm/createTokens.native.js.map +6 -1
- package/dist/esm/createVariable.native.js +35 -29
- package/dist/esm/createVariable.native.js.map +6 -1
- package/dist/esm/createVariables.native.js +29 -34
- package/dist/esm/createVariables.native.js.map +6 -1
- package/dist/esm/defaultComponentState.native.js +20 -18
- package/dist/esm/defaultComponentState.native.js.map +6 -1
- package/dist/esm/helpers/ThemeManager.native.js +101 -95
- package/dist/esm/helpers/ThemeManager.native.js.map +6 -1
- package/dist/esm/helpers/ThemeManagerContext.native.js +5 -3
- package/dist/esm/helpers/ThemeManagerContext.native.js.map +6 -1
- package/dist/esm/helpers/createMediaStyle.native.js +49 -64
- package/dist/esm/helpers/createMediaStyle.native.js.map +6 -1
- package/dist/esm/helpers/createShallowSetState.native.js +17 -9
- package/dist/esm/helpers/createShallowSetState.native.js.map +6 -1
- package/dist/esm/helpers/createStyledContext.native.js +25 -31
- package/dist/esm/helpers/createStyledContext.native.js.map +6 -1
- package/dist/esm/helpers/defaultOffset.native.js +4 -2
- package/dist/esm/helpers/defaultOffset.native.js.map +6 -1
- package/dist/esm/helpers/expandStyle.native.js +84 -39
- package/dist/esm/helpers/expandStyle.native.js.map +6 -1
- package/dist/esm/helpers/expandStyles.native.js +17 -15
- package/dist/esm/helpers/expandStyles.native.js.map +6 -1
- package/dist/esm/helpers/getExpandedShorthands.native.js +7 -4
- package/dist/esm/helpers/getExpandedShorthands.native.js.map +6 -1
- package/dist/esm/helpers/getFontLanguage.native.js +5 -3
- package/dist/esm/helpers/getFontLanguage.native.js.map +6 -1
- package/dist/esm/helpers/getGroupPropParts.native.js +6 -7
- package/dist/esm/helpers/getGroupPropParts.native.js.map +6 -1
- package/dist/esm/helpers/getSplitStyles.js +2 -2
- package/dist/esm/helpers/getSplitStyles.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +2 -2
- package/dist/esm/helpers/getSplitStyles.mjs.map +1 -1
- package/dist/esm/helpers/getSplitStyles.native.js +400 -438
- package/dist/esm/helpers/getSplitStyles.native.js.map +6 -1
- package/dist/esm/helpers/getStylesAtomic.native.js +8 -7
- package/dist/esm/helpers/getStylesAtomic.native.js.map +6 -1
- package/dist/esm/helpers/getThemeCSSRules.native.js +3 -1
- package/dist/esm/helpers/getThemeCSSRules.native.js.map +6 -1
- package/dist/esm/helpers/getVariantExtras.native.js +34 -33
- package/dist/esm/helpers/getVariantExtras.native.js.map +6 -1
- package/dist/esm/helpers/insertStyleRule.native.js +111 -123
- package/dist/esm/helpers/insertStyleRule.native.js.map +6 -1
- package/dist/esm/helpers/isActivePlatform.native.js +5 -4
- package/dist/esm/helpers/isActivePlatform.native.js.map +6 -1
- package/dist/esm/helpers/isObj.native.js +5 -3
- package/dist/esm/helpers/isObj.native.js.map +6 -1
- package/dist/esm/helpers/isTamaguiComponent.native.js +4 -2
- package/dist/esm/helpers/isTamaguiComponent.native.js.map +6 -1
- package/dist/esm/helpers/isTamaguiElement.native.js +7 -5
- package/dist/esm/helpers/isTamaguiElement.native.js.map +6 -1
- package/dist/esm/helpers/log.native.js +7 -4
- package/dist/esm/helpers/log.native.js.map +6 -1
- package/dist/esm/helpers/matchMedia.native.js +14 -9
- package/dist/esm/helpers/matchMedia.native.js.map +6 -1
- package/dist/esm/helpers/mergeProps.native.js +13 -9
- package/dist/esm/helpers/mergeProps.native.js.map +6 -1
- package/dist/esm/helpers/mergeVariants.native.js +7 -7
- package/dist/esm/helpers/mergeVariants.native.js.map +6 -1
- package/dist/esm/helpers/normalizeColor.native.js +24 -20
- package/dist/esm/helpers/normalizeColor.native.js.map +6 -1
- package/dist/esm/helpers/normalizeShadow.native.js +7 -15
- package/dist/esm/helpers/normalizeShadow.native.js.map +6 -1
- package/dist/esm/helpers/normalizeStyle.native.js +12 -13
- package/dist/esm/helpers/normalizeStyle.native.js.map +6 -1
- package/dist/esm/helpers/normalizeStylePropKeys.native.js +3 -1
- package/dist/esm/helpers/normalizeStylePropKeys.native.js.map +6 -1
- package/dist/esm/helpers/normalizeValueWithProperty.native.js +12 -9
- package/dist/esm/helpers/normalizeValueWithProperty.native.js.map +6 -1
- package/dist/esm/helpers/objectIdentityKey.native.js +11 -6
- package/dist/esm/helpers/objectIdentityKey.native.js.map +6 -1
- package/dist/esm/helpers/propMapper.js +5 -2
- package/dist/esm/helpers/propMapper.js.map +1 -1
- package/dist/esm/helpers/propMapper.mjs +2 -2
- package/dist/esm/helpers/propMapper.mjs.map +1 -1
- package/dist/esm/helpers/propMapper.native.js +211 -232
- package/dist/esm/helpers/propMapper.native.js.map +6 -1
- package/dist/esm/helpers/proxyThemeToParents.native.js +27 -39
- package/dist/esm/helpers/proxyThemeToParents.native.js.map +6 -1
- package/dist/esm/helpers/proxyThemeVariables.native.js +5 -3
- package/dist/esm/helpers/proxyThemeVariables.native.js.map +6 -1
- package/dist/esm/helpers/pseudoDescriptors.native.js +46 -44
- package/dist/esm/helpers/pseudoDescriptors.native.js.map +6 -1
- package/dist/esm/helpers/registerCSSVariable.native.js +13 -11
- package/dist/esm/helpers/registerCSSVariable.native.js.map +6 -1
- package/dist/esm/helpers/setElementProps.native.js +6 -3
- package/dist/esm/helpers/setElementProps.native.js.map +6 -1
- package/dist/esm/helpers/skipProps.native.js +5 -3
- package/dist/esm/helpers/skipProps.native.js.map +6 -1
- package/dist/esm/helpers/sortString.native.js +5 -3
- package/dist/esm/helpers/sortString.native.js.map +6 -1
- package/dist/esm/helpers/subscribeToContextGroup.native.js +18 -27
- package/dist/esm/helpers/subscribeToContextGroup.native.js.map +6 -1
- package/dist/esm/helpers/themeable.native.js +24 -31
- package/dist/esm/helpers/themeable.native.js.map +6 -1
- package/dist/esm/helpers/themes.native.js +5 -3
- package/dist/esm/helpers/themes.native.js.map +6 -1
- package/dist/esm/helpers/timer.native.js +5 -3
- package/dist/esm/helpers/timer.native.js.map +6 -1
- package/dist/esm/helpers/transformsToString.native.js +13 -11
- package/dist/esm/helpers/transformsToString.native.js.map +6 -1
- package/dist/esm/helpers/webPropsToSkip.native.js +3 -1
- package/dist/esm/helpers/webPropsToSkip.native.js.map +6 -1
- package/dist/esm/hooks/useComponentState.native.js +32 -66
- package/dist/esm/hooks/useComponentState.native.js.map +6 -1
- package/dist/esm/hooks/useConfiguration.native.js +8 -14
- package/dist/esm/hooks/useConfiguration.native.js.map +6 -1
- package/dist/esm/hooks/useDidHydrateOnce.native.js +15 -14
- package/dist/esm/hooks/useDidHydrateOnce.native.js.map +6 -1
- package/dist/esm/hooks/useDisableSSR.native.js +5 -3
- package/dist/esm/hooks/useDisableSSR.native.js.map +6 -1
- package/dist/esm/hooks/useIsTouchDevice.native.js +5 -3
- package/dist/esm/hooks/useIsTouchDevice.native.js.map +6 -1
- package/dist/esm/hooks/useMedia.native.js +104 -106
- package/dist/esm/hooks/useMedia.native.js.map +6 -1
- package/dist/esm/hooks/useProps.native.js +42 -41
- package/dist/esm/hooks/useProps.native.js.map +6 -1
- package/dist/esm/hooks/useTheme.js +7 -8
- package/dist/esm/hooks/useTheme.js.map +1 -1
- package/dist/esm/hooks/useTheme.mjs +3 -6
- package/dist/esm/hooks/useTheme.mjs.map +1 -1
- package/dist/esm/hooks/useTheme.native.js +237 -252
- package/dist/esm/hooks/useTheme.native.js.map +6 -1
- package/dist/esm/hooks/useThemeName.native.js +16 -12
- package/dist/esm/hooks/useThemeName.native.js.map +6 -1
- package/dist/esm/index.native.js +78 -61
- package/dist/esm/index.native.js.map +6 -1
- package/dist/esm/inject-styles.native.js +12 -15
- package/dist/esm/inject-styles.native.js.map +6 -1
- package/dist/esm/insertFont.native.js +32 -24
- package/dist/esm/insertFont.native.js.map +6 -1
- package/dist/esm/interfaces/CSSColorNames.native.js +1 -2
- package/dist/esm/interfaces/CSSColorNames.native.js.map +6 -1
- package/dist/esm/interfaces/GetRef.native.js +1 -2
- package/dist/esm/interfaces/GetRef.native.js.map +6 -1
- package/dist/esm/interfaces/KeyTypes.native.js +1 -2
- package/dist/esm/interfaces/KeyTypes.native.js.map +6 -1
- package/dist/esm/interfaces/RNExclusiveTypes.native.js +1 -2
- package/dist/esm/interfaces/RNExclusiveTypes.native.js.map +6 -1
- package/dist/esm/interfaces/Role.native.js +1 -2
- package/dist/esm/interfaces/Role.native.js.map +6 -1
- package/dist/esm/interfaces/TamaguiComponentEvents.native.js +1 -2
- package/dist/esm/interfaces/TamaguiComponentEvents.native.js.map +6 -1
- package/dist/esm/interfaces/TamaguiComponentPropsBaseBase.native.js +1 -2
- package/dist/esm/interfaces/TamaguiComponentPropsBaseBase.native.js.map +6 -1
- package/dist/esm/interfaces/TamaguiComponentState.native.js +1 -2
- package/dist/esm/interfaces/TamaguiComponentState.native.js.map +6 -1
- package/dist/esm/interfaces/WebOnlyPressEvents.native.js +1 -2
- package/dist/esm/interfaces/WebOnlyPressEvents.native.js.map +6 -1
- package/dist/esm/setupHooks.native.js +5 -2
- package/dist/esm/setupHooks.native.js.map +6 -1
- package/dist/esm/setupReactNative.native.js +13 -5
- package/dist/esm/setupReactNative.native.js.map +6 -1
- package/dist/esm/styled.native.js +50 -66
- package/dist/esm/styled.native.js.map +6 -1
- package/dist/esm/type-utils.native.js +1 -2
- package/dist/esm/type-utils.native.js.map +6 -1
- package/dist/esm/types.native.js +3 -3
- package/dist/esm/types.native.js.map +6 -1
- package/dist/esm/views/Configuration.native.js +7 -5
- package/dist/esm/views/Configuration.native.js.map +6 -1
- package/dist/esm/views/FontLanguage.native.js +11 -11
- package/dist/esm/views/FontLanguage.native.js.map +6 -1
- package/dist/esm/views/FontLanguage.types.native.js +1 -2
- package/dist/esm/views/FontLanguage.types.native.js.map +6 -1
- package/dist/esm/views/Slot.native.js +31 -33
- package/dist/esm/views/Slot.native.js.map +6 -1
- package/dist/esm/views/Stack.native.js +6 -4
- package/dist/esm/views/Stack.native.js.map +6 -1
- package/dist/esm/views/TamaguiProvider.native.js +39 -40
- package/dist/esm/views/TamaguiProvider.native.js.map +6 -1
- package/dist/esm/views/Text.native.js +30 -27
- package/dist/esm/views/Text.native.js.map +6 -1
- package/dist/esm/views/Theme.native.js +54 -76
- package/dist/esm/views/Theme.native.js.map +6 -1
- package/dist/esm/views/ThemeDebug.native.js +4 -6
- package/dist/esm/views/ThemeDebug.native.js.map +6 -1
- package/dist/esm/views/ThemeProvider.native.js +16 -12
- package/dist/esm/views/ThemeProvider.native.js.map +6 -1
- package/dist/esm/views/View.native.js +6 -4
- package/dist/esm/views/View.native.js.map +6 -1
- package/package.json +11 -11
- package/src/helpers/getSplitStyles.tsx +2 -0
- package/src/helpers/propMapper.ts +15 -3
- package/src/hooks/useTheme.tsx +30 -10
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/propMapper.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts.map +1 -1
|
@@ -1,31 +1,28 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { isWeb } from "@tamagui/constants";
|
|
3
3
|
import React, { Children, cloneElement, forwardRef, isValidElement, useRef } from "react";
|
|
4
|
-
import { variableToString } from "../createVariable
|
|
5
|
-
import { ThemeManagerIDContext } from "../helpers/ThemeManagerContext
|
|
6
|
-
import { useChangeThemeEffect } from "../hooks/useTheme
|
|
7
|
-
import { ThemeDebug } from "./ThemeDebug
|
|
8
|
-
import { log } from "../helpers/log
|
|
9
|
-
var Theme = /* @__PURE__ */forwardRef(function
|
|
10
|
-
var {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
themeState = useChangeThemeEffect(props, isRoot),
|
|
17
|
-
disableDirectChildTheme = props["disable-child-theme"],
|
|
18
|
-
finalChildren = disableDirectChildTheme ? Children.map(children, function (child) {
|
|
19
|
-
return /* @__PURE__ */cloneElement(child, {
|
|
20
|
-
"data-disable-theme": !0
|
|
21
|
-
});
|
|
22
|
-
}) : children;
|
|
23
|
-
if (ref) try {
|
|
24
|
-
React.Children.only(finalChildren), finalChildren = /* @__PURE__ */cloneElement(finalChildren, {
|
|
25
|
-
ref
|
|
4
|
+
import { variableToString } from "../createVariable";
|
|
5
|
+
import { ThemeManagerIDContext } from "../helpers/ThemeManagerContext";
|
|
6
|
+
import { useChangeThemeEffect } from "../hooks/useTheme";
|
|
7
|
+
import { ThemeDebug } from "./ThemeDebug";
|
|
8
|
+
import { log } from "../helpers/log";
|
|
9
|
+
var Theme = /* @__PURE__ */ forwardRef(function(param, ref) {
|
|
10
|
+
var { children, ...props } = param;
|
|
11
|
+
if (props.disable)
|
|
12
|
+
return children;
|
|
13
|
+
var isRoot = !!props._isRoot, themeState = useChangeThemeEffect(props, isRoot), disableDirectChildTheme = props["disable-child-theme"], finalChildren = disableDirectChildTheme ? Children.map(children, function(child) {
|
|
14
|
+
return /* @__PURE__ */ cloneElement(child, {
|
|
15
|
+
"data-disable-theme": !0
|
|
26
16
|
});
|
|
27
|
-
}
|
|
28
|
-
|
|
17
|
+
}) : children;
|
|
18
|
+
if (ref)
|
|
19
|
+
try {
|
|
20
|
+
React.Children.only(finalChildren), finalChildren = /* @__PURE__ */ cloneElement(finalChildren, {
|
|
21
|
+
ref
|
|
22
|
+
});
|
|
23
|
+
} catch {
|
|
24
|
+
}
|
|
25
|
+
process.env.NODE_ENV === "development" && props.debug === "visualize" && (finalChildren = /* @__PURE__ */ _jsx(ThemeDebug, {
|
|
29
26
|
themeState,
|
|
30
27
|
themeProps: props,
|
|
31
28
|
children: finalChildren
|
|
@@ -38,28 +35,21 @@ var Theme = /* @__PURE__ */forwardRef(function (param, ref) {
|
|
|
38
35
|
Theme.displayName = "Theme";
|
|
39
36
|
Theme.avoidForwardRef = !0;
|
|
40
37
|
function getThemedChildren(themeState, children, props) {
|
|
41
|
-
var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1,
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
if (!themeManager) return children;
|
|
48
|
-
var {
|
|
49
|
-
shallow,
|
|
50
|
-
forceClassName
|
|
51
|
-
} = props,
|
|
52
|
-
shouldRenderChildrenWithTheme = isNewTheme || isRoot || stateRef.current.hasEverThemed || typeof props.inverse == "boolean";
|
|
53
|
-
if (shouldRenderChildrenWithTheme && (stateRef.current.hasEverThemed = !0), !shouldRenderChildrenWithTheme) return children;
|
|
38
|
+
var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, stateRef = arguments.length > 4 ? arguments[4] : void 0, { themeManager, isNewTheme } = themeState;
|
|
39
|
+
if (!themeManager)
|
|
40
|
+
return children;
|
|
41
|
+
var { shallow, forceClassName } = props, shouldRenderChildrenWithTheme = isNewTheme || isRoot || stateRef.current.hasEverThemed || typeof props.inverse == "boolean";
|
|
42
|
+
if (shouldRenderChildrenWithTheme && (stateRef.current.hasEverThemed = !0), !shouldRenderChildrenWithTheme)
|
|
43
|
+
return children;
|
|
54
44
|
process.env.NODE_ENV === "development" && shouldRenderChildrenWithTheme && props.debug === "verbose" && log(`adding theme: isRoot ${isRoot}, inverse ${"inverse" in props}, isNewTheme ${isNewTheme}, hasEver ${stateRef.current.hasEverThemed}`, props);
|
|
55
45
|
var next = children;
|
|
56
|
-
shallow && (next = Children.toArray(children).map(function
|
|
57
|
-
return /* @__PURE__ */isValidElement(child) ? /* @__PURE__ */cloneElement(child, void 0, /* @__PURE__ */_jsx(Theme, {
|
|
46
|
+
shallow && (next = Children.toArray(children).map(function(child) {
|
|
47
|
+
return /* @__PURE__ */ isValidElement(child) ? /* @__PURE__ */ cloneElement(child, void 0, /* @__PURE__ */ _jsx(Theme, {
|
|
58
48
|
name: themeManager.state.parentName,
|
|
59
49
|
children: child.props.children
|
|
60
50
|
})) : child;
|
|
61
51
|
}));
|
|
62
|
-
var elementsWithContext = /* @__PURE__ */_jsx(ThemeManagerIDContext.Provider, {
|
|
52
|
+
var elementsWithContext = /* @__PURE__ */ _jsx(ThemeManagerIDContext.Provider, {
|
|
63
53
|
value: themeManager.id,
|
|
64
54
|
children: next
|
|
65
55
|
});
|
|
@@ -71,29 +61,17 @@ function getThemedChildren(themeState, children, props) {
|
|
|
71
61
|
}) : elementsWithContext;
|
|
72
62
|
}
|
|
73
63
|
function wrapThemeElements(param) {
|
|
74
|
-
var {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
requiresExtraWrapper = inverse != null || forceClassName,
|
|
83
|
-
{
|
|
84
|
-
className,
|
|
85
|
-
style
|
|
86
|
-
} = getThemeClassNameAndStyle(themeState, isRoot),
|
|
87
|
-
themedChildren = /* @__PURE__ */_jsx("span", {
|
|
88
|
-
className: `${className} _dsp_contents is_Theme`,
|
|
89
|
-
style,
|
|
90
|
-
children
|
|
91
|
-
});
|
|
64
|
+
var { children, themeState, forceClassName, isRoot } = param;
|
|
65
|
+
if (isRoot && forceClassName === !1)
|
|
66
|
+
return children;
|
|
67
|
+
var inverse = themeState.inversed, requiresExtraWrapper = inverse != null || forceClassName, { className, style } = getThemeClassNameAndStyle(themeState, isRoot), themedChildren = /* @__PURE__ */ _jsx("span", {
|
|
68
|
+
className: `${className} _dsp_contents is_Theme`,
|
|
69
|
+
style,
|
|
70
|
+
children
|
|
71
|
+
});
|
|
92
72
|
if (requiresExtraWrapper) {
|
|
93
|
-
var _themeState_state,
|
|
94
|
-
|
|
95
|
-
inverseClassName = name.startsWith("light") ? "t_light is_inversed" : name.startsWith("dark") ? "t_dark is_inversed" : "";
|
|
96
|
-
themedChildren = /* @__PURE__ */_jsx("span", {
|
|
73
|
+
var _themeState_state, name = ((_themeState_state = themeState.state) === null || _themeState_state === void 0 ? void 0 : _themeState_state.name) || "", inverseClassName = name.startsWith("light") ? "t_light is_inversed" : name.startsWith("dark") ? "t_dark is_inversed" : "";
|
|
74
|
+
themedChildren = /* @__PURE__ */ _jsx("span", {
|
|
97
75
|
className: `${inverse ? inverseClassName : ""} _dsp_contents`,
|
|
98
76
|
children: themedChildren
|
|
99
77
|
});
|
|
@@ -102,22 +80,22 @@ function wrapThemeElements(param) {
|
|
|
102
80
|
}
|
|
103
81
|
var emptyObj = {};
|
|
104
82
|
function getThemeClassNameAndStyle(themeState) {
|
|
105
|
-
var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1,
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
color: themeColor
|
|
115
|
-
} : void 0,
|
|
116
|
-
className = ((_themeState_state1 = themeState.state) === null || _themeState_state1 === void 0 ? void 0 : _themeState_state1.className) || "";
|
|
83
|
+
var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1, _themeState_state, _themeState_state1;
|
|
84
|
+
if (!themeState.isNewTheme)
|
|
85
|
+
return {
|
|
86
|
+
className: "",
|
|
87
|
+
style: emptyObj
|
|
88
|
+
};
|
|
89
|
+
var themeColor = !((_themeState_state = themeState.state) === null || _themeState_state === void 0) && _themeState_state.theme && themeState.isNewTheme ? variableToString(themeState.state.theme.color) : "", style = themeColor ? {
|
|
90
|
+
color: themeColor
|
|
91
|
+
} : void 0, className = ((_themeState_state1 = themeState.state) === null || _themeState_state1 === void 0 ? void 0 : _themeState_state1.className) || "";
|
|
117
92
|
return isRoot && (className = className.replace("t_sub_theme", "")), {
|
|
118
93
|
style,
|
|
119
94
|
className
|
|
120
95
|
};
|
|
121
96
|
}
|
|
122
|
-
export {
|
|
123
|
-
|
|
97
|
+
export {
|
|
98
|
+
Theme,
|
|
99
|
+
getThemedChildren
|
|
100
|
+
};
|
|
101
|
+
//# sourceMappingURL=Theme.js.map
|
|
@@ -1 +1,6 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/Theme.tsx"],
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["isWeb", "React", "Children", "cloneElement", "forwardRef", "isValidElement", "useRef", "variableToString", "ThemeManagerIDContext", "useChangeThemeEffect", "ThemeDebug", "log", "Theme", "ref", "children", "props", "disable", "isRoot", "themeState", "disableDirectChildTheme", "finalChildren", "map", "child", "only", "process", "env", "NODE_ENV", "debug", "themeProps", "stateRef", "hasEverThemed", "getThemedChildren", "themeManager", "isNewTheme", "shallow", "forceClassName", "shouldRenderChildrenWithTheme", "current", "inverse", "next", "toArray", "undefined", "name", "state", "parentName", "elementsWithContext", "Provider", "value", "id", "wrapThemeElements", "inversed", "requiresExtraWrapper", "className", "style", "getThemeClassNameAndStyle", "themedChildren", "span", "inverseClassName", "startsWith", "emptyObj", "themeColor", "theme", "color", "replace"]
|
|
6
|
+
}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
function ThemeDebug(param) {
|
|
2
|
-
var {
|
|
3
|
-
themeState,
|
|
4
|
-
themeProps,
|
|
5
|
-
children
|
|
6
|
-
} = param;
|
|
2
|
+
var { themeState, themeProps, children } = param;
|
|
7
3
|
return children;
|
|
8
4
|
}
|
|
9
5
|
ThemeDebug.displayName = "ThemeDebug";
|
|
10
|
-
export {
|
|
6
|
+
export {
|
|
7
|
+
ThemeDebug
|
|
8
|
+
};
|
|
11
9
|
//# sourceMappingURL=ThemeDebug.native.js.map
|
|
@@ -1 +1,6 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/ThemeDebug.native.tsx"],
|
|
4
|
+
"mappings": "AAGO,SAASA,WAAW,OAQ1B;MAR0B,EACzBC,YACAC,YACAC,SAAQ,IAHiB;AAWzB,SAAOA;AACT;AAEAH,WAAW,cAAiB;",
|
|
5
|
+
"names": ["ThemeDebug", "themeState", "themeProps", "children"]
|
|
6
|
+
}
|
|
@@ -1,20 +1,22 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import React from "react";
|
|
3
3
|
import { isClient } from "@tamagui/constants";
|
|
4
|
-
import { THEME_CLASSNAME_PREFIX } from "../constants/constants
|
|
5
|
-
import { Theme } from "./Theme
|
|
6
|
-
import { getSetting } from "../config
|
|
7
|
-
var ThemeProvider = function
|
|
8
|
-
return isClient && React.useLayoutEffect(function
|
|
4
|
+
import { THEME_CLASSNAME_PREFIX } from "../constants/constants";
|
|
5
|
+
import { Theme } from "./Theme";
|
|
6
|
+
import { getSetting } from "../config";
|
|
7
|
+
var ThemeProvider = function(props) {
|
|
8
|
+
return isClient && React.useLayoutEffect(function() {
|
|
9
9
|
if (!props.disableRootThemeClass) {
|
|
10
|
-
var cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`,
|
|
11
|
-
|
|
12
|
-
target = ((_props_themeClassNameOnRoot = props.themeClassNameOnRoot) !== null && _props_themeClassNameOnRoot !== void 0 ? _props_themeClassNameOnRoot : getSetting("themeClassNameOnRoot")) ? document.documentElement : document.body;
|
|
13
|
-
return target.classList.add(cn), function () {
|
|
10
|
+
var cn = `${THEME_CLASSNAME_PREFIX}${props.defaultTheme}`, _props_themeClassNameOnRoot, target = ((_props_themeClassNameOnRoot = props.themeClassNameOnRoot) !== null && _props_themeClassNameOnRoot !== void 0 ? _props_themeClassNameOnRoot : getSetting("themeClassNameOnRoot")) ? document.documentElement : document.body;
|
|
11
|
+
return target.classList.add(cn), function() {
|
|
14
12
|
target.classList.remove(cn);
|
|
15
13
|
};
|
|
16
14
|
}
|
|
17
|
-
}, [
|
|
15
|
+
}, [
|
|
16
|
+
props.defaultTheme,
|
|
17
|
+
props.disableRootThemeClass,
|
|
18
|
+
props.themeClassNameOnRoot
|
|
19
|
+
]), /* @__PURE__ */ _jsx(Theme, {
|
|
18
20
|
className: props.className,
|
|
19
21
|
name: props.defaultTheme,
|
|
20
22
|
// if root class disabled, force class here
|
|
@@ -24,5 +26,7 @@ var ThemeProvider = function (props) {
|
|
|
24
26
|
children: props.children
|
|
25
27
|
});
|
|
26
28
|
};
|
|
27
|
-
export {
|
|
28
|
-
|
|
29
|
+
export {
|
|
30
|
+
ThemeProvider
|
|
31
|
+
};
|
|
32
|
+
//# sourceMappingURL=ThemeProvider.js.map
|
|
@@ -1 +1,6 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/ThemeProvider.tsx"],
|
|
4
|
+
"mappings": ";AAAA,OAAOA,WAAW;AAClB,SAASC,gBAAgB;AAEzB,SAASC,8BAA8B;AACvC,SAASC,aAAa;AACtB,SAASC,kBAAkB;AAYpB,IAAMC,gBAAgB,SAACC,OAAAA;AAE5B,SAAIL,YACFD,MAAMO,gBAAgB,WAAA;AACpB,QAAID,OAAME,uBACV;UAAMC,KAAK,GAAGP,sBAAAA,GAAyBI,MAAMI,YAAY,IAEtDJ,6BADGK,WACHL,8BAAAA,MAAMM,0BAAoB,QAA1BN,gCAAAA,SAAAA,8BAA8BF,WAAW,sBAAA,KACtCS,SAASC,kBACTD,SAASE;AACfJ,oBAAOK,UAAUC,IAAIR,EAAAA,GACd,WAAA;AACLE,eAAOK,UAAUE,OAAOT,EAAAA;MAC1B;;EACF,GAAG;IAACH,MAAMI;IAAcJ,MAAME;IAAuBF,MAAMM;GAAqB,GAIhF,qBAACT,OAAAA;IACCgB,WAAWb,MAAMa;IACjBC,MAAMd,MAAMI;;IAEZW,gBAAgB,CAACf,MAAME;;IAEvBc,SAAO;cAENhB,MAAMiB;;AAGb;",
|
|
5
|
+
"names": ["React", "isClient", "THEME_CLASSNAME_PREFIX", "Theme", "getSetting", "ThemeProvider", "props", "useLayoutEffect", "disableRootThemeClass", "cn", "defaultTheme", "target", "themeClassNameOnRoot", "document", "documentElement", "body", "classList", "add", "remove", "className", "name", "forceClassName", "_isRoot", "children"]
|
|
6
|
+
}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { validStyles } from "@tamagui/helpers";
|
|
2
|
-
import { stackDefaultStyles } from "../constants/constants
|
|
3
|
-
import { createComponent } from "../createComponent
|
|
2
|
+
import { stackDefaultStyles } from "../constants/constants";
|
|
3
|
+
import { createComponent } from "../createComponent";
|
|
4
4
|
var View = createComponent({
|
|
5
5
|
acceptsClassName: !0,
|
|
6
6
|
defaultProps: stackDefaultStyles,
|
|
7
7
|
validStyles
|
|
8
8
|
});
|
|
9
|
-
export {
|
|
10
|
-
|
|
9
|
+
export {
|
|
10
|
+
View
|
|
11
|
+
};
|
|
12
|
+
//# sourceMappingURL=View.js.map
|
|
@@ -1 +1,6 @@
|
|
|
1
|
-
{
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/View.tsx"],
|
|
4
|
+
"mappings": "AAAA,SAASA,mBAAmB;AAE5B,SAASC,0BAA0B;AACnC,SAASC,uBAAuB;AAezB,IAAMC,OAAOD,gBAKlB;EACAE,kBAAkB;EAClBC,cAAcJ;EACdD;AACF,CAAA;",
|
|
5
|
+
"names": ["validStyles", "stackDefaultStyles", "createComponent", "View", "acceptsClassName", "defaultProps"]
|
|
6
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.113.
|
|
3
|
+
"version": "1.113.2",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,18 +27,18 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.113.
|
|
31
|
-
"@tamagui/constants": "1.113.
|
|
32
|
-
"@tamagui/helpers": "1.113.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.113.
|
|
34
|
-
"@tamagui/timer": "1.113.
|
|
35
|
-
"@tamagui/types": "1.113.
|
|
36
|
-
"@tamagui/use-did-finish-ssr": "1.113.
|
|
37
|
-
"@tamagui/use-event": "1.113.
|
|
38
|
-
"@tamagui/use-force-update": "1.113.
|
|
30
|
+
"@tamagui/compose-refs": "1.113.2",
|
|
31
|
+
"@tamagui/constants": "1.113.2",
|
|
32
|
+
"@tamagui/helpers": "1.113.2",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.113.2",
|
|
34
|
+
"@tamagui/timer": "1.113.2",
|
|
35
|
+
"@tamagui/types": "1.113.2",
|
|
36
|
+
"@tamagui/use-did-finish-ssr": "1.113.2",
|
|
37
|
+
"@tamagui/use-event": "1.113.2",
|
|
38
|
+
"@tamagui/use-force-update": "1.113.2"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@tamagui/build": "1.113.
|
|
41
|
+
"@tamagui/build": "1.113.2",
|
|
42
42
|
"@testing-library/react": "^16.0.1",
|
|
43
43
|
"csstype": "^3.0.10",
|
|
44
44
|
"typescript": "^5.5.2",
|
|
@@ -624,9 +624,11 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
624
624
|
isHOCShouldPassThrough,
|
|
625
625
|
usedKeys: { ...usedKeys },
|
|
626
626
|
})
|
|
627
|
+
globalThis.tamaguiAvoidTracking = true
|
|
627
628
|
log('expanded', expanded, '\nusedKeys', { ...usedKeys }, '\ncurrent', {
|
|
628
629
|
...styleState.style,
|
|
629
630
|
})
|
|
631
|
+
globalThis.tamaguiAvoidTracking = false
|
|
630
632
|
}
|
|
631
633
|
} catch {
|
|
632
634
|
// rn can run into PayloadTooLargeError: request entity too large
|
|
@@ -139,7 +139,11 @@ const resolveVariants: StyleResolver = (
|
|
|
139
139
|
const extras = getVariantExtras(styleState)
|
|
140
140
|
variantValue = fn(value, extras)
|
|
141
141
|
|
|
142
|
-
if (
|
|
142
|
+
if (
|
|
143
|
+
process.env.NODE_ENV === 'development' &&
|
|
144
|
+
debug === 'verbose' &&
|
|
145
|
+
process.env.TAMAGUI_TARGET !== 'native'
|
|
146
|
+
) {
|
|
143
147
|
console.groupCollapsed(' expanded functional variant', key)
|
|
144
148
|
console.info({ fn, variantValue, extras })
|
|
145
149
|
console.groupEnd()
|
|
@@ -388,7 +392,12 @@ export const getTokenForKey = (
|
|
|
388
392
|
if (theme && value in theme) {
|
|
389
393
|
valOrVar = theme[value]
|
|
390
394
|
if (process.env.NODE_ENV === 'development' && styleState.debug === 'verbose') {
|
|
391
|
-
|
|
395
|
+
globalThis.tamaguiAvoidTracking = true
|
|
396
|
+
console.info(
|
|
397
|
+
` - resolving ${key} to theme value ${value} resolveAs ${resolveAs}`,
|
|
398
|
+
valOrVar
|
|
399
|
+
)
|
|
400
|
+
globalThis.tamaguiAvoidTracking = false
|
|
392
401
|
}
|
|
393
402
|
hasSet = true
|
|
394
403
|
} else {
|
|
@@ -445,7 +454,9 @@ export const getTokenForKey = (
|
|
|
445
454
|
if (hasSet) {
|
|
446
455
|
const out = resolveVariableValue(key, valOrVar, resolveAs)
|
|
447
456
|
if (process.env.NODE_ENV === 'development' && styleState.debug === 'verbose') {
|
|
457
|
+
globalThis.tamaguiAvoidTracking = true
|
|
448
458
|
console.info(`resolved`, resolveAs, valOrVar, out)
|
|
459
|
+
globalThis.tamaguiAvoidTracking = false
|
|
449
460
|
}
|
|
450
461
|
return out
|
|
451
462
|
}
|
|
@@ -474,7 +485,8 @@ function resolveVariableValue(
|
|
|
474
485
|
// shadowColor doesn't support dynamic style
|
|
475
486
|
if (process.env.TAMAGUI_TARGET !== 'native' || key !== 'shadowColor') {
|
|
476
487
|
if (typeof get === 'function') {
|
|
477
|
-
|
|
488
|
+
const resolveDynamicFor = resolveValues === 'web' ? 'web' : undefined
|
|
489
|
+
return get(resolveDynamicFor)
|
|
478
490
|
}
|
|
479
491
|
}
|
|
480
492
|
|
package/src/hooks/useTheme.tsx
CHANGED
|
@@ -110,14 +110,8 @@ export const useThemeWithState = (
|
|
|
110
110
|
props.debug !== 'profile'
|
|
111
111
|
) {
|
|
112
112
|
console.info(
|
|
113
|
-
` 🎨 useTheme() shouldUpdate
|
|
114
|
-
next
|
|
115
|
-
isClient
|
|
116
|
-
? {
|
|
117
|
-
shouldUpdateProp: props.shouldUpdate?.(),
|
|
118
|
-
keys: [...keys.current],
|
|
119
|
-
}
|
|
120
|
-
: ''
|
|
113
|
+
` 🎨 useTheme() shouldUpdate? tracking keys ${keys.current.length} ${props.shouldUpdate?.()}`,
|
|
114
|
+
next
|
|
121
115
|
)
|
|
122
116
|
}
|
|
123
117
|
|
|
@@ -141,6 +135,9 @@ export const useThemeWithState = (
|
|
|
141
135
|
}
|
|
142
136
|
|
|
143
137
|
const themeProxied = React.useMemo(() => {
|
|
138
|
+
// reset keys on new theme
|
|
139
|
+
keys.current = []
|
|
140
|
+
|
|
144
141
|
if (!themeManager || !state?.theme) {
|
|
145
142
|
return {}
|
|
146
143
|
}
|
|
@@ -212,8 +209,16 @@ export function getThemeProxied(
|
|
|
212
209
|
// if its a variable (web), its ignored!
|
|
213
210
|
get(_, subkey) {
|
|
214
211
|
if (subkey === 'val') {
|
|
215
|
-
|
|
216
|
-
|
|
212
|
+
if (!globalThis.tamaguiAvoidTracking) {
|
|
213
|
+
if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
|
|
214
|
+
console.info(
|
|
215
|
+
` 🎨 useTheme() tracking new key because of .val access`,
|
|
216
|
+
new Error().stack
|
|
217
|
+
)
|
|
218
|
+
}
|
|
219
|
+
// always track .val
|
|
220
|
+
track(keyString)
|
|
221
|
+
}
|
|
217
222
|
} else if (subkey === 'get') {
|
|
218
223
|
return (platform?: 'web') => {
|
|
219
224
|
const outVal = getVariable(val)
|
|
@@ -247,6 +252,21 @@ export function getThemeProxied(
|
|
|
247
252
|
}
|
|
248
253
|
}
|
|
249
254
|
|
|
255
|
+
if (process.env.NODE_ENV === 'development' && debug) {
|
|
256
|
+
console.info(` 🎨 useTheme() tracking new key because of:
|
|
257
|
+
not web: ${platform !== 'web'}
|
|
258
|
+
isIOS: ${isIos}
|
|
259
|
+
deopt: ${deopt}
|
|
260
|
+
fastScheme: ${getSetting('fastSchemeChange')}
|
|
261
|
+
parent inversed: ${someParentIsInversed(themeManager)}
|
|
262
|
+
`)
|
|
263
|
+
if (someParentIsInversed(themeManager)) {
|
|
264
|
+
console.info(
|
|
265
|
+
` some parent is inversed: ${themeManager?.state.name} => ${themeManager?.parentManager?.state.name}`
|
|
266
|
+
)
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
|
|
250
270
|
track(keyString)
|
|
251
271
|
}
|
|
252
272
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,SAAS,EACT,WAAW,EAEZ,MAAM,UAAU,CAAA;AA0BjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA+B7B,eAAO,MAAM,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,SAAS,EACT,WAAW,EAEZ,MAAM,UAAU,CAAA;AA0BjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA+B7B,eAAO,MAAM,cAAc,EAAE,aA6wC5B,CAAA;AAgED,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,SAiCF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAa5B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"propMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/propMapper.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,iBAAiB,EAEjB,qBAAqB,EAEtB,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,UAAU,EAAE,UAyExB,CAAA;
|
|
1
|
+
{"version":3,"file":"propMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/propMapper.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,iBAAiB,EAEjB,qBAAqB,EAEtB,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,UAAU,EAAE,UAyExB,CAAA;AAmGD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBAkBtF;AAMD,eAAO,MAAM,uBAAuB,cAAe,GAAG,QAErD,CAAA;AAiJD,eAAO,MAAM,cAAc,QACpB,MAAM,SACJ,MAAM,aACF,iBAAiB,0BAChB,OAAO,CAAC,aAAa,CAAC,QAmGnC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,YAAY,EAA4B,MAAM,yBAAyB,CAAA;AAGhF,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,UAAU,EACV,MAAM,EACN,sBAAsB,EACtB,WAAW,EACX,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAEjB,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,SAAS,CAAC,EAAE,iBAAiB,CAAA;IAC7B,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IAGnB,QAAQ,CAAC,EAAE,IAAI,GAAG,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAcD,MAAM,MAAM,aAAa,CAAC,GAAG,IAAI,GAAG,GAAG;IACrC;;;;;;;;;OASG;IACH,GAAG,EAAE,CACH,QAAQ,CAAC,EAAE,KAAK,KAEd,MAAM,GACN,CAAC,GAAG,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAC1B,CAAC,SAAS,kBAAkB,GAC1B,GAAG,GACH,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GACtB,GAAG,SAAS,WAAW,GACrB,MAAM,GAAG,MAAM,GACf,OAAO,CAAC,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;KAC1B,GAAG,IAAI,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,aAAa,CAC/D,GAAG,SAAS,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CACjE;CACF,GAAG;KAED,GAAG,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;CACpD,CAAA;AAYD,eAAO,MAAM,QAAQ,WAAW,UAAU,KAG1B,cACf,CAAA;AAED,eAAO,MAAM,iBAAiB,UACrB,sBAAsB,KAC5B,CAAC,oBAAoB,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,YAAY,EAA4B,MAAM,yBAAyB,CAAA;AAGhF,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,UAAU,EACV,MAAM,EACN,sBAAsB,EACtB,WAAW,EACX,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAEjB,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,SAAS,CAAC,EAAE,iBAAiB,CAAA;IAC7B,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IAGnB,QAAQ,CAAC,EAAE,IAAI,GAAG,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAcD,MAAM,MAAM,aAAa,CAAC,GAAG,IAAI,GAAG,GAAG;IACrC;;;;;;;;;OASG;IACH,GAAG,EAAE,CACH,QAAQ,CAAC,EAAE,KAAK,KAEd,MAAM,GACN,CAAC,GAAG,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAC1B,CAAC,SAAS,kBAAkB,GAC1B,GAAG,GACH,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GACtB,GAAG,SAAS,WAAW,GACrB,MAAM,GAAG,MAAM,GACf,OAAO,CAAC,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;KAC1B,GAAG,IAAI,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,aAAa,CAC/D,GAAG,SAAS,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CACjE;CACF,GAAG;KAED,GAAG,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;CACpD,CAAA;AAYD,eAAO,MAAM,QAAQ,WAAW,UAAU,KAG1B,cACf,CAAA;AAED,eAAO,MAAM,iBAAiB,UACrB,sBAAsB,KAC5B,CAAC,oBAAoB,EAAE,WAAW,CA2DpC,CAAA;AAED,wBAAgB,eAAe,CAC7B,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,iBAAiB,EAC1C,KAAK,UAAQ,EACb,YAAY,CAAC,EAAE,YAAY,EAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,EACf,KAAK,CAAC,EAAE,SAAS,GAChB,cAAc,CAuIhB;AAoCD,eAAO,MAAM,mBAAmB,mBAA0B,CAAA;AAO1D,eAAO,MAAM,eAAe,OAAQ,MAAM,6BAEzC,CAAA;AAsBD,eAAO,MAAM,oBAAoB,UACxB,sBAAsB,2BAEtB,MAAM,EAAE,iBACA,MAAM,OAAO,GAAG,SAAS,KACvC,oBAuTF,CAAA"}
|