@tamagui/web 1.5.21 → 1.5.22
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/createComponent.js +13 -16
- package/dist/cjs/createComponent.js.map +2 -2
- package/dist/cjs/views/Theme.js +23 -31
- package/dist/cjs/views/Theme.js.map +2 -2
- package/dist/esm/createComponent.js +13 -16
- package/dist/esm/createComponent.js.map +2 -2
- package/dist/esm/createComponent.mjs +13 -16
- package/dist/esm/createComponent.mjs.map +2 -2
- package/dist/esm/views/Theme.js +24 -32
- package/dist/esm/views/Theme.js.map +2 -2
- package/dist/esm/views/Theme.mjs +24 -32
- package/dist/esm/views/Theme.mjs.map +2 -2
- package/package.json +9 -9
- package/src/createComponent.tsx +3 -4
- package/src/views/Theme.tsx +62 -41
- package/types/createComponent.d.ts.map +1 -1
- package/types/views/Theme.d.ts +1 -0
- package/types/views/Theme.d.ts.map +1 -1
- package/dist/cjs/helpers/mergeTransform.js +0 -47
- package/dist/cjs/helpers/mergeTransform.js.map +0 -7
- package/dist/esm/helpers/mergeTransform.js +0 -21
- package/dist/esm/helpers/mergeTransform.js.map +0 -7
- package/dist/esm/helpers/mergeTransform.mjs +0 -21
- package/dist/esm/helpers/mergeTransform.mjs.map +0 -7
- package/types/helpers/mergeTransform.d.ts.map +0 -1
package/dist/esm/views/Theme.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx } from "react/jsx-runtime";
|
|
2
2
|
import { isWeb } from "@tamagui/constants";
|
|
3
|
-
import { Children, cloneElement } from "react";
|
|
3
|
+
import { Children, cloneElement, isValidElement } from "react";
|
|
4
4
|
import { variableToString } from "../createVariable.js";
|
|
5
5
|
import { ThemeManagerContext } from "../helpers/ThemeManagerContext.js";
|
|
6
6
|
import { useServerRef } from "../hooks/useServerHooks.js";
|
|
@@ -23,38 +23,30 @@ function useThemedChildren(themeState, children, options) {
|
|
|
23
23
|
if (isNewTheme) {
|
|
24
24
|
hasEverThemed.current = true;
|
|
25
25
|
}
|
|
26
|
-
if (
|
|
27
|
-
|
|
26
|
+
if (isNewTheme || hasEverThemed.current || forceClassName) {
|
|
27
|
+
let next = Children.toArray(children);
|
|
28
|
+
if (shallow && themeManager) {
|
|
29
|
+
next = next.map((child) => {
|
|
30
|
+
return isValidElement(child) ? cloneElement(
|
|
31
|
+
child,
|
|
32
|
+
void 0,
|
|
33
|
+
/* @__PURE__ */ jsx(Theme, { name: themeManager.state.parentName, children: child.props.children })
|
|
34
|
+
) : child;
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
const wrapped = /* @__PURE__ */ jsx(ThemeManagerContext.Provider, { value: themeManager, children: next });
|
|
38
|
+
if (forceClassName === false) {
|
|
39
|
+
return wrapped;
|
|
40
|
+
}
|
|
41
|
+
if (isWeb && !options.passPropsToChildren) {
|
|
42
|
+
const themeColor = theme && isNewTheme ? variableToString(theme.color) : "";
|
|
43
|
+
const colorStyle = {
|
|
44
|
+
color: themeColor
|
|
45
|
+
};
|
|
46
|
+
return /* @__PURE__ */ jsx("span", { className: `${className || ""} _dsp_contents`, style: colorStyle, children: wrapped });
|
|
47
|
+
}
|
|
28
48
|
}
|
|
29
|
-
|
|
30
|
-
if (shallow && themeManager) {
|
|
31
|
-
next = Children.map(next, (child) => {
|
|
32
|
-
return cloneElement(
|
|
33
|
-
child,
|
|
34
|
-
void 0,
|
|
35
|
-
/* @__PURE__ */ jsx(Theme, { name: themeManager.state.parentName, children: child.props.children })
|
|
36
|
-
);
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
next = /* @__PURE__ */ jsx(ThemeManagerContext.Provider, { value: themeManager, children: next });
|
|
40
|
-
if (isWeb) {
|
|
41
|
-
const enableClassName = forceClassName ?? (forceClassName !== false && isNewTheme);
|
|
42
|
-
return /* @__PURE__ */ jsx(
|
|
43
|
-
"span",
|
|
44
|
-
{
|
|
45
|
-
className: "_dsp_contents",
|
|
46
|
-
...theme && enableClassName && {
|
|
47
|
-
className: `${className} _dsp_contents`,
|
|
48
|
-
style: {
|
|
49
|
-
// in order to provide currentColor, set color by default
|
|
50
|
-
color: variableToString(theme.color)
|
|
51
|
-
}
|
|
52
|
-
},
|
|
53
|
-
children: next
|
|
54
|
-
}
|
|
55
|
-
);
|
|
56
|
-
}
|
|
57
|
-
return next;
|
|
49
|
+
return children;
|
|
58
50
|
}
|
|
59
51
|
export {
|
|
60
52
|
Theme,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Theme.tsx"],
|
|
4
|
-
"sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n // @ts-expect-error only for internal views\n if (props.disable) return props.children\n const isRoot = !!props['_isRoot']\n const themeState = useChangeThemeEffect(props, isRoot)\n const children = props['data-themeable']\n ? Children.map(props.children, (child) =>\n cloneElement(child, { ['data-themeable']: true })\n )\n : props.children\n\n return useThemedChildren(themeState, children, props)\n}\n\nexport function useThemedChildren(\n themeState: ChangedThemeResponse,\n children: any,\n options: {
|
|
5
|
-
"mappings": "
|
|
4
|
+
"sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement, isValidElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n // @ts-expect-error only for internal views\n if (props.disable) return props.children\n const isRoot = !!props['_isRoot']\n const themeState = useChangeThemeEffect(props, isRoot)\n const children = props['data-themeable']\n ? Children.map(props.children, (child) =>\n cloneElement(child, { ['data-themeable']: true })\n )\n : props.children\n\n return useThemedChildren(themeState, children, props)\n}\n\nexport function useThemedChildren(\n themeState: ChangedThemeResponse,\n children: any,\n options: {\n forceClassName?: boolean\n shallow?: boolean\n passPropsToChildren?: boolean\n }\n) {\n const { themeManager, isNewTheme, className, theme } = themeState\n const { shallow, forceClassName } = options\n const hasEverThemed = useServerRef(false)\n if (isNewTheme) {\n hasEverThemed.current = true\n }\n\n if (isNewTheme || hasEverThemed.current || forceClassName) {\n // be sure to memoize shouldReset to avoid reparenting\n let next = Children.toArray(children)\n\n // each children of these children wont get the theme\n if (shallow && themeManager) {\n next = next.map((child) => {\n return isValidElement(child)\n ? cloneElement(\n child,\n undefined,\n <Theme name={themeManager.state.parentName}>\n {(child as any).props.children}\n </Theme>\n )\n : child\n })\n }\n\n // tried this but themes css doesn't fully like it\n // if (shouldAttachClassName && options.passPropsToChildren) {\n // next = next.map((child: any) => {\n // const childStyle = child.props?.style\n // console.log('pass it down', className, child.props.className || '')\n // const newProps = {\n // className: (child.props.className || '') + ' ' + className,\n // style: Array.isArray(childStyle)\n // ? [colorStyle, ...childStyle]\n // : {\n // ...colorStyle,\n // ...childStyle,\n // },\n // }\n // return isValidElement(child) ? cloneElement(child as any, newProps) : child\n // })\n // }\n\n const wrapped = (\n <ThemeManagerContext.Provider value={themeManager}>\n {next}\n </ThemeManagerContext.Provider>\n )\n\n if (forceClassName === false) {\n return wrapped\n }\n\n if (isWeb && !options.passPropsToChildren) {\n // in order to provide currentColor, set color by default\n const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''\n const colorStyle = {\n color: themeColor,\n }\n\n return (\n <span className={`${className || ''} _dsp_contents`} style={colorStyle}>\n {wrapped}\n </span>\n )\n }\n }\n\n return children\n}\n"],
|
|
5
|
+
"mappings": "AAkDc;AAlDd,SAAS,aAAa;AACtB,SAAS,UAAU,cAAc,sBAAsB;AAEvD,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAAS,oBAAoB;AAC7B,SAA+B,4BAA4B;AAGpD,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM;AAAS,WAAO,MAAM;AAChC,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,aAAa,qBAAqB,OAAO,MAAM;AACrD,QAAM,WAAW,MAAM,gBAAgB,IACnC,SAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,UAC5B,aAAa,OAAO,EAAE,CAAC,gBAAgB,GAAG,KAAK,CAAC;AAAA,EAClD,IACA,MAAM;AAEV,SAAO,kBAAkB,YAAY,UAAU,KAAK;AACtD;AAEO,SAAS,kBACd,YACA,UACA,SAKA;AACA,QAAM,EAAE,cAAc,YAAY,WAAW,MAAM,IAAI;AACvD,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,gBAAgB,aAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,MAAI,cAAc,cAAc,WAAW,gBAAgB;AAEzD,QAAI,OAAO,SAAS,QAAQ,QAAQ;AAGpC,QAAI,WAAW,cAAc;AAC3B,aAAO,KAAK,IAAI,CAAC,UAAU;AACzB,eAAO,eAAe,KAAK,IACvB;AAAA,UACE;AAAA,UACA;AAAA,UACA,oBAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,QACF,IACA;AAAA,MACN,CAAC;AAAA,IACH;AAoBA,UAAM,UACJ,oBAAC,oBAAoB,UAApB,EAA6B,OAAO,cAClC,gBACH;AAGF,QAAI,mBAAmB,OAAO;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,SAAS,CAAC,QAAQ,qBAAqB;AAEzC,YAAM,aAAa,SAAS,aAAa,iBAAiB,MAAM,KAAK,IAAI;AACzE,YAAM,aAAa;AAAA,QACjB,OAAO;AAAA,MACT;AAEA,aACE,oBAAC,UAAK,WAAW,GAAG,aAAa,oBAAoB,OAAO,YACzD,mBACH;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO;AACT;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/esm/views/Theme.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx } from "react/jsx-runtime";
|
|
2
2
|
import { isWeb } from "@tamagui/constants";
|
|
3
|
-
import { Children, cloneElement } from "react";
|
|
3
|
+
import { Children, cloneElement, isValidElement } from "react";
|
|
4
4
|
import { variableToString } from "../createVariable.js";
|
|
5
5
|
import { ThemeManagerContext } from "../helpers/ThemeManagerContext.js";
|
|
6
6
|
import { useServerRef } from "../hooks/useServerHooks.js";
|
|
@@ -23,38 +23,30 @@ function useThemedChildren(themeState, children, options) {
|
|
|
23
23
|
if (isNewTheme) {
|
|
24
24
|
hasEverThemed.current = true;
|
|
25
25
|
}
|
|
26
|
-
if (
|
|
27
|
-
|
|
26
|
+
if (isNewTheme || hasEverThemed.current || forceClassName) {
|
|
27
|
+
let next = Children.toArray(children);
|
|
28
|
+
if (shallow && themeManager) {
|
|
29
|
+
next = next.map((child) => {
|
|
30
|
+
return isValidElement(child) ? cloneElement(
|
|
31
|
+
child,
|
|
32
|
+
void 0,
|
|
33
|
+
/* @__PURE__ */ jsx(Theme, { name: themeManager.state.parentName, children: child.props.children })
|
|
34
|
+
) : child;
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
const wrapped = /* @__PURE__ */ jsx(ThemeManagerContext.Provider, { value: themeManager, children: next });
|
|
38
|
+
if (forceClassName === false) {
|
|
39
|
+
return wrapped;
|
|
40
|
+
}
|
|
41
|
+
if (isWeb && !options.passPropsToChildren) {
|
|
42
|
+
const themeColor = theme && isNewTheme ? variableToString(theme.color) : "";
|
|
43
|
+
const colorStyle = {
|
|
44
|
+
color: themeColor
|
|
45
|
+
};
|
|
46
|
+
return /* @__PURE__ */ jsx("span", { className: `${className || ""} _dsp_contents`, style: colorStyle, children: wrapped });
|
|
47
|
+
}
|
|
28
48
|
}
|
|
29
|
-
|
|
30
|
-
if (shallow && themeManager) {
|
|
31
|
-
next = Children.map(next, (child) => {
|
|
32
|
-
return cloneElement(
|
|
33
|
-
child,
|
|
34
|
-
void 0,
|
|
35
|
-
/* @__PURE__ */ jsx(Theme, { name: themeManager.state.parentName, children: child.props.children })
|
|
36
|
-
);
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
next = /* @__PURE__ */ jsx(ThemeManagerContext.Provider, { value: themeManager, children: next });
|
|
40
|
-
if (isWeb) {
|
|
41
|
-
const enableClassName = forceClassName ?? (forceClassName !== false && isNewTheme);
|
|
42
|
-
return /* @__PURE__ */ jsx(
|
|
43
|
-
"span",
|
|
44
|
-
{
|
|
45
|
-
className: "_dsp_contents",
|
|
46
|
-
...theme && enableClassName && {
|
|
47
|
-
className: `${className} _dsp_contents`,
|
|
48
|
-
style: {
|
|
49
|
-
// in order to provide currentColor, set color by default
|
|
50
|
-
color: variableToString(theme.color)
|
|
51
|
-
}
|
|
52
|
-
},
|
|
53
|
-
children: next
|
|
54
|
-
}
|
|
55
|
-
);
|
|
56
|
-
}
|
|
57
|
-
return next;
|
|
49
|
+
return children;
|
|
58
50
|
}
|
|
59
51
|
export {
|
|
60
52
|
Theme,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Theme.tsx"],
|
|
4
|
-
"sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n // @ts-expect-error only for internal views\n if (props.disable) return props.children\n const isRoot = !!props['_isRoot']\n const themeState = useChangeThemeEffect(props, isRoot)\n const children = props['data-themeable']\n ? Children.map(props.children, (child) =>\n cloneElement(child, { ['data-themeable']: true })\n )\n : props.children\n\n return useThemedChildren(themeState, children, props)\n}\n\nexport function useThemedChildren(\n themeState: ChangedThemeResponse,\n children: any,\n options: {
|
|
5
|
-
"mappings": "
|
|
4
|
+
"sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement, isValidElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n // @ts-expect-error only for internal views\n if (props.disable) return props.children\n const isRoot = !!props['_isRoot']\n const themeState = useChangeThemeEffect(props, isRoot)\n const children = props['data-themeable']\n ? Children.map(props.children, (child) =>\n cloneElement(child, { ['data-themeable']: true })\n )\n : props.children\n\n return useThemedChildren(themeState, children, props)\n}\n\nexport function useThemedChildren(\n themeState: ChangedThemeResponse,\n children: any,\n options: {\n forceClassName?: boolean\n shallow?: boolean\n passPropsToChildren?: boolean\n }\n) {\n const { themeManager, isNewTheme, className, theme } = themeState\n const { shallow, forceClassName } = options\n const hasEverThemed = useServerRef(false)\n if (isNewTheme) {\n hasEverThemed.current = true\n }\n\n if (isNewTheme || hasEverThemed.current || forceClassName) {\n // be sure to memoize shouldReset to avoid reparenting\n let next = Children.toArray(children)\n\n // each children of these children wont get the theme\n if (shallow && themeManager) {\n next = next.map((child) => {\n return isValidElement(child)\n ? cloneElement(\n child,\n undefined,\n <Theme name={themeManager.state.parentName}>\n {(child as any).props.children}\n </Theme>\n )\n : child\n })\n }\n\n // tried this but themes css doesn't fully like it\n // if (shouldAttachClassName && options.passPropsToChildren) {\n // next = next.map((child: any) => {\n // const childStyle = child.props?.style\n // console.log('pass it down', className, child.props.className || '')\n // const newProps = {\n // className: (child.props.className || '') + ' ' + className,\n // style: Array.isArray(childStyle)\n // ? [colorStyle, ...childStyle]\n // : {\n // ...colorStyle,\n // ...childStyle,\n // },\n // }\n // return isValidElement(child) ? cloneElement(child as any, newProps) : child\n // })\n // }\n\n const wrapped = (\n <ThemeManagerContext.Provider value={themeManager}>\n {next}\n </ThemeManagerContext.Provider>\n )\n\n if (forceClassName === false) {\n return wrapped\n }\n\n if (isWeb && !options.passPropsToChildren) {\n // in order to provide currentColor, set color by default\n const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''\n const colorStyle = {\n color: themeColor,\n }\n\n return (\n <span className={`${className || ''} _dsp_contents`} style={colorStyle}>\n {wrapped}\n </span>\n )\n }\n }\n\n return children\n}\n"],
|
|
5
|
+
"mappings": "AAkDc;AAlDd,SAAS,aAAa;AACtB,SAAS,UAAU,cAAc,sBAAsB;AAEvD,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAAS,oBAAoB;AAC7B,SAA+B,4BAA4B;AAGpD,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM;AAAS,WAAO,MAAM;AAChC,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,aAAa,qBAAqB,OAAO,MAAM;AACrD,QAAM,WAAW,MAAM,gBAAgB,IACnC,SAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,UAC5B,aAAa,OAAO,EAAE,CAAC,gBAAgB,GAAG,KAAK,CAAC;AAAA,EAClD,IACA,MAAM;AAEV,SAAO,kBAAkB,YAAY,UAAU,KAAK;AACtD;AAEO,SAAS,kBACd,YACA,UACA,SAKA;AACA,QAAM,EAAE,cAAc,YAAY,WAAW,MAAM,IAAI;AACvD,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,gBAAgB,aAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,MAAI,cAAc,cAAc,WAAW,gBAAgB;AAEzD,QAAI,OAAO,SAAS,QAAQ,QAAQ;AAGpC,QAAI,WAAW,cAAc;AAC3B,aAAO,KAAK,IAAI,CAAC,UAAU;AACzB,eAAO,eAAe,KAAK,IACvB;AAAA,UACE;AAAA,UACA;AAAA,UACA,oBAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,QACF,IACA;AAAA,MACN,CAAC;AAAA,IACH;AAoBA,UAAM,UACJ,oBAAC,oBAAoB,UAApB,EAA6B,OAAO,cAClC,gBACH;AAGF,QAAI,mBAAmB,OAAO;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,SAAS,CAAC,QAAQ,qBAAqB;AAEzC,YAAM,aAAa,SAAS,aAAa,iBAAiB,MAAM,KAAK,IAAI;AACzE,YAAM,aAAa;AAAA,QACjB,OAAO;AAAA,MACT;AAEA,aACE,oBAAC,UAAK,WAAW,GAAG,aAAa,oBAAoB,OAAO,YACzD,mBACH;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO;AACT;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.22",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,19 +27,19 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "^1.5.
|
|
31
|
-
"@tamagui/constants": "^1.5.
|
|
32
|
-
"@tamagui/helpers": "^1.5.
|
|
33
|
-
"@tamagui/normalize-css-color": "^1.5.
|
|
34
|
-
"@tamagui/use-did-finish-ssr": "^1.5.
|
|
35
|
-
"@tamagui/use-event": "^1.5.
|
|
36
|
-
"@tamagui/use-force-update": "^1.5.
|
|
30
|
+
"@tamagui/compose-refs": "^1.5.22",
|
|
31
|
+
"@tamagui/constants": "^1.5.22",
|
|
32
|
+
"@tamagui/helpers": "^1.5.22",
|
|
33
|
+
"@tamagui/normalize-css-color": "^1.5.22",
|
|
34
|
+
"@tamagui/use-did-finish-ssr": "^1.5.22",
|
|
35
|
+
"@tamagui/use-event": "^1.5.22",
|
|
36
|
+
"@tamagui/use-force-update": "^1.5.22"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"react": "*"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "^1.5.
|
|
42
|
+
"@tamagui/build": "^1.5.22",
|
|
43
43
|
"@testing-library/react": "^13.4.0",
|
|
44
44
|
"csstype": "^3.0.10",
|
|
45
45
|
"react": "^18.2.0",
|
package/src/createComponent.tsx
CHANGED
|
@@ -720,6 +720,7 @@ export function createComponent<
|
|
|
720
720
|
|
|
721
721
|
content = useThemedChildren(themeState, content, {
|
|
722
722
|
shallow: stateRef.current.themeShallow,
|
|
723
|
+
// passPropsToChildren: true,
|
|
723
724
|
})
|
|
724
725
|
|
|
725
726
|
if (process.env.TAMAGUI_TARGET === 'web') {
|
|
@@ -1066,7 +1067,6 @@ type CreateSpacerProps = SpacedChildrenProps & { key: string }
|
|
|
1066
1067
|
|
|
1067
1068
|
function createSpacer({ key, direction, space, spaceFlex }: CreateSpacerProps) {
|
|
1068
1069
|
return (
|
|
1069
|
-
// @ts-ignore this one blew up but the types seem better
|
|
1070
1070
|
<Spacer
|
|
1071
1071
|
key={key}
|
|
1072
1072
|
size={space}
|
|
@@ -1079,8 +1079,8 @@ function createSpacer({ key, direction, space, spaceFlex }: CreateSpacerProps) {
|
|
|
1079
1079
|
}
|
|
1080
1080
|
|
|
1081
1081
|
function isUnspaced(child: React.ReactNode) {
|
|
1082
|
-
|
|
1083
|
-
return
|
|
1082
|
+
const t = child?.['type']
|
|
1083
|
+
return t?.['isVisuallyHidden'] || t?.['isUnspaced']
|
|
1084
1084
|
}
|
|
1085
1085
|
|
|
1086
1086
|
const DefaultProps = new Map()
|
|
@@ -1122,7 +1122,6 @@ function mergeConfigDefaultProps(
|
|
|
1122
1122
|
}
|
|
1123
1123
|
|
|
1124
1124
|
const AbsoluteFill: any = createComponent({
|
|
1125
|
-
componentName: 'AbsoluteFill',
|
|
1126
1125
|
defaultProps: {
|
|
1127
1126
|
...stackDefaultStyles,
|
|
1128
1127
|
flexDirection: 'column',
|
package/src/views/Theme.tsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isWeb } from '@tamagui/constants'
|
|
2
|
-
import { Children, cloneElement } from 'react'
|
|
2
|
+
import { Children, cloneElement, isValidElement } from 'react'
|
|
3
3
|
|
|
4
4
|
import { variableToString } from '../createVariable.js'
|
|
5
5
|
import { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'
|
|
@@ -24,59 +24,80 @@ export function Theme(props: ThemeProps) {
|
|
|
24
24
|
export function useThemedChildren(
|
|
25
25
|
themeState: ChangedThemeResponse,
|
|
26
26
|
children: any,
|
|
27
|
-
options: {
|
|
27
|
+
options: {
|
|
28
|
+
forceClassName?: boolean
|
|
29
|
+
shallow?: boolean
|
|
30
|
+
passPropsToChildren?: boolean
|
|
31
|
+
}
|
|
28
32
|
) {
|
|
29
33
|
const { themeManager, isNewTheme, className, theme } = themeState
|
|
30
34
|
const { shallow, forceClassName } = options
|
|
31
|
-
|
|
32
35
|
const hasEverThemed = useServerRef(false)
|
|
33
36
|
if (isNewTheme) {
|
|
34
37
|
hasEverThemed.current = true
|
|
35
38
|
}
|
|
36
39
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
return children
|
|
41
|
-
}
|
|
40
|
+
if (isNewTheme || hasEverThemed.current || forceClassName) {
|
|
41
|
+
// be sure to memoize shouldReset to avoid reparenting
|
|
42
|
+
let next = Children.toArray(children)
|
|
42
43
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
44
|
+
// each children of these children wont get the theme
|
|
45
|
+
if (shallow && themeManager) {
|
|
46
|
+
next = next.map((child) => {
|
|
47
|
+
return isValidElement(child)
|
|
48
|
+
? cloneElement(
|
|
49
|
+
child,
|
|
50
|
+
undefined,
|
|
51
|
+
<Theme name={themeManager.state.parentName}>
|
|
52
|
+
{(child as any).props.children}
|
|
53
|
+
</Theme>
|
|
54
|
+
)
|
|
55
|
+
: child
|
|
56
|
+
})
|
|
57
|
+
}
|
|
55
58
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
59
|
+
// tried this but themes css doesn't fully like it
|
|
60
|
+
// if (shouldAttachClassName && options.passPropsToChildren) {
|
|
61
|
+
// next = next.map((child: any) => {
|
|
62
|
+
// const childStyle = child.props?.style
|
|
63
|
+
// console.log('pass it down', className, child.props.className || '')
|
|
64
|
+
// const newProps = {
|
|
65
|
+
// className: (child.props.className || '') + ' ' + className,
|
|
66
|
+
// style: Array.isArray(childStyle)
|
|
67
|
+
// ? [colorStyle, ...childStyle]
|
|
68
|
+
// : {
|
|
69
|
+
// ...colorStyle,
|
|
70
|
+
// ...childStyle,
|
|
71
|
+
// },
|
|
72
|
+
// }
|
|
73
|
+
// return isValidElement(child) ? cloneElement(child as any, newProps) : child
|
|
74
|
+
// })
|
|
75
|
+
// }
|
|
61
76
|
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
return (
|
|
65
|
-
<span
|
|
66
|
-
className="_dsp_contents"
|
|
67
|
-
{...(theme &&
|
|
68
|
-
enableClassName && {
|
|
69
|
-
className: `${className} _dsp_contents`,
|
|
70
|
-
style: {
|
|
71
|
-
// in order to provide currentColor, set color by default
|
|
72
|
-
color: variableToString(theme.color),
|
|
73
|
-
},
|
|
74
|
-
})}
|
|
75
|
-
>
|
|
77
|
+
const wrapped = (
|
|
78
|
+
<ThemeManagerContext.Provider value={themeManager}>
|
|
76
79
|
{next}
|
|
77
|
-
</
|
|
80
|
+
</ThemeManagerContext.Provider>
|
|
78
81
|
)
|
|
82
|
+
|
|
83
|
+
if (forceClassName === false) {
|
|
84
|
+
return wrapped
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (isWeb && !options.passPropsToChildren) {
|
|
88
|
+
// in order to provide currentColor, set color by default
|
|
89
|
+
const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''
|
|
90
|
+
const colorStyle = {
|
|
91
|
+
color: themeColor,
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
return (
|
|
95
|
+
<span className={`${className || ''} _dsp_contents`} style={colorStyle}>
|
|
96
|
+
{wrapped}
|
|
97
|
+
</span>
|
|
98
|
+
)
|
|
99
|
+
}
|
|
79
100
|
}
|
|
80
101
|
|
|
81
|
-
return
|
|
102
|
+
return children
|
|
82
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,KAUN,MAAM,OAAO,CAAA;AAiBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EAErB,cAAc,EAIf,MAAM,SAAS,CAAA;AAmBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAeD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA8B3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EACpD,eAAe,CAAC,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,KAUN,MAAM,OAAO,CAAA;AAiBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EAErB,cAAc,EAIf,MAAM,SAAS,CAAA;AAmBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAeD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AA8B3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EACpD,eAAe,CAAC,EAAE,iBAAiB,4DAuwBpC;AAGD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAEjD,CAAA;AAMD,eAAO,MAAM,MAAM,0DA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD"}
|
package/types/views/Theme.d.ts
CHANGED
|
@@ -4,5 +4,6 @@ export declare function Theme(props: ThemeProps): any;
|
|
|
4
4
|
export declare function useThemedChildren(themeState: ChangedThemeResponse, children: any, options: {
|
|
5
5
|
forceClassName?: boolean;
|
|
6
6
|
shallow?: boolean;
|
|
7
|
+
passPropsToChildren?: boolean;
|
|
7
8
|
}): any;
|
|
8
9
|
//# sourceMappingURL=Theme.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../src/views/Theme.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAwB,MAAM,sBAAsB,CAAA;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,OAYtC;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../src/views/Theme.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAwB,MAAM,sBAAsB,CAAA;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,OAYtC;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE;IACP,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,OAwEF"}
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __defProp = Object.defineProperty;
|
|
3
|
-
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
-
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
-
var __export = (target, all) => {
|
|
7
|
-
for (var name in all)
|
|
8
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
-
};
|
|
10
|
-
var __copyProps = (to, from, except, desc) => {
|
|
11
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
-
for (let key of __getOwnPropNames(from))
|
|
13
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
-
}
|
|
16
|
-
return to;
|
|
17
|
-
};
|
|
18
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
-
var mergeTransform_exports = {};
|
|
20
|
-
__export(mergeTransform_exports, {
|
|
21
|
-
mapTransformKeys: () => mapTransformKeys,
|
|
22
|
-
mergeTransform: () => mergeTransform,
|
|
23
|
-
mergeTransforms: () => mergeTransforms
|
|
24
|
-
});
|
|
25
|
-
module.exports = __toCommonJS(mergeTransform_exports);
|
|
26
|
-
const mergeTransform = (obj, key, val, backwards = false) => {
|
|
27
|
-
obj.transform || (obj.transform = []);
|
|
28
|
-
obj.transform[backwards ? "unshift" : "push"]({
|
|
29
|
-
[mapTransformKeys[key] || key]: val
|
|
30
|
-
});
|
|
31
|
-
};
|
|
32
|
-
const mergeTransforms = (obj, flatTransforms, backwards = false) => {
|
|
33
|
-
Object.entries(flatTransforms).forEach(([key, val]) => {
|
|
34
|
-
mergeTransform(obj, key, val, backwards);
|
|
35
|
-
});
|
|
36
|
-
};
|
|
37
|
-
const mapTransformKeys = {
|
|
38
|
-
x: "translateX",
|
|
39
|
-
y: "translateY"
|
|
40
|
-
};
|
|
41
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
42
|
-
0 && (module.exports = {
|
|
43
|
-
mapTransformKeys,
|
|
44
|
-
mergeTransform,
|
|
45
|
-
mergeTransforms
|
|
46
|
-
});
|
|
47
|
-
//# sourceMappingURL=mergeTransform.js.map
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"version": 3,
|
|
3
|
-
"sources": ["../../../src/helpers/mergeTransform.ts"],
|
|
4
|
-
"sourcesContent": ["import type { ViewStyle } from 'react-native'\n\nexport type FlatTransforms = Record<string, any>\n\nexport const mergeTransform = (\n obj: ViewStyle,\n key: string,\n val: any,\n backwards = false\n) => {\n obj.transform ||= []\n obj.transform[backwards ? 'unshift' : 'push']({\n [mapTransformKeys[key] || key]: val,\n } as any)\n}\n\nexport const mergeTransforms = (\n obj: ViewStyle,\n flatTransforms: FlatTransforms,\n backwards = false\n) => {\n Object.entries(flatTransforms).forEach(([key, val]) => {\n mergeTransform(obj, key, val, backwards)\n })\n}\n\nexport const mapTransformKeys = {\n x: 'translateX',\n y: 'translateY',\n}\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIO,MAAM,iBAAiB,CAC5B,KACA,KACA,KACA,YAAY,UACT;AACH,MAAI,cAAJ,IAAI,YAAc,CAAC;AACnB,MAAI,UAAU,YAAY,YAAY,MAAM,EAAE;AAAA,IAC5C,CAAC,iBAAiB,GAAG,KAAK,GAAG,GAAG;AAAA,EAClC,CAAQ;AACV;AAEO,MAAM,kBAAkB,CAC7B,KACA,gBACA,YAAY,UACT;AACH,SAAO,QAAQ,cAAc,EAAE,QAAQ,CAAC,CAAC,KAAK,GAAG,MAAM;AACrD,mBAAe,KAAK,KAAK,KAAK,SAAS;AAAA,EACzC,CAAC;AACH;AAEO,MAAM,mBAAmB;AAAA,EAC9B,GAAG;AAAA,EACH,GAAG;AACL;",
|
|
6
|
-
"names": []
|
|
7
|
-
}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
const mergeTransform = (obj, key, val, backwards = false) => {
|
|
2
|
-
obj.transform ||= [];
|
|
3
|
-
obj.transform[backwards ? "unshift" : "push"]({
|
|
4
|
-
[mapTransformKeys[key] || key]: val
|
|
5
|
-
});
|
|
6
|
-
};
|
|
7
|
-
const mergeTransforms = (obj, flatTransforms, backwards = false) => {
|
|
8
|
-
Object.entries(flatTransforms).forEach(([key, val]) => {
|
|
9
|
-
mergeTransform(obj, key, val, backwards);
|
|
10
|
-
});
|
|
11
|
-
};
|
|
12
|
-
const mapTransformKeys = {
|
|
13
|
-
x: "translateX",
|
|
14
|
-
y: "translateY"
|
|
15
|
-
};
|
|
16
|
-
export {
|
|
17
|
-
mapTransformKeys,
|
|
18
|
-
mergeTransform,
|
|
19
|
-
mergeTransforms
|
|
20
|
-
};
|
|
21
|
-
//# sourceMappingURL=mergeTransform.js.map
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"version": 3,
|
|
3
|
-
"sources": ["../../../src/helpers/mergeTransform.ts"],
|
|
4
|
-
"sourcesContent": ["import type { ViewStyle } from 'react-native'\n\nexport type FlatTransforms = Record<string, any>\n\nexport const mergeTransform = (\n obj: ViewStyle,\n key: string,\n val: any,\n backwards = false\n) => {\n obj.transform ||= []\n obj.transform[backwards ? 'unshift' : 'push']({\n [mapTransformKeys[key] || key]: val,\n } as any)\n}\n\nexport const mergeTransforms = (\n obj: ViewStyle,\n flatTransforms: FlatTransforms,\n backwards = false\n) => {\n Object.entries(flatTransforms).forEach(([key, val]) => {\n mergeTransform(obj, key, val, backwards)\n })\n}\n\nexport const mapTransformKeys = {\n x: 'translateX',\n y: 'translateY',\n}\n"],
|
|
5
|
-
"mappings": "AAIO,MAAM,iBAAiB,CAC5B,KACA,KACA,KACA,YAAY,UACT;AACH,MAAI,cAAc,CAAC;AACnB,MAAI,UAAU,YAAY,YAAY,MAAM,EAAE;AAAA,IAC5C,CAAC,iBAAiB,GAAG,KAAK,GAAG,GAAG;AAAA,EAClC,CAAQ;AACV;AAEO,MAAM,kBAAkB,CAC7B,KACA,gBACA,YAAY,UACT;AACH,SAAO,QAAQ,cAAc,EAAE,QAAQ,CAAC,CAAC,KAAK,GAAG,MAAM;AACrD,mBAAe,KAAK,KAAK,KAAK,SAAS;AAAA,EACzC,CAAC;AACH;AAEO,MAAM,mBAAmB;AAAA,EAC9B,GAAG;AAAA,EACH,GAAG;AACL;",
|
|
6
|
-
"names": []
|
|
7
|
-
}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
const mergeTransform = (obj, key, val, backwards = false) => {
|
|
2
|
-
obj.transform ||= [];
|
|
3
|
-
obj.transform[backwards ? "unshift" : "push"]({
|
|
4
|
-
[mapTransformKeys[key] || key]: val
|
|
5
|
-
});
|
|
6
|
-
};
|
|
7
|
-
const mergeTransforms = (obj, flatTransforms, backwards = false) => {
|
|
8
|
-
Object.entries(flatTransforms).forEach(([key, val]) => {
|
|
9
|
-
mergeTransform(obj, key, val, backwards);
|
|
10
|
-
});
|
|
11
|
-
};
|
|
12
|
-
const mapTransformKeys = {
|
|
13
|
-
x: "translateX",
|
|
14
|
-
y: "translateY"
|
|
15
|
-
};
|
|
16
|
-
export {
|
|
17
|
-
mapTransformKeys,
|
|
18
|
-
mergeTransform,
|
|
19
|
-
mergeTransforms
|
|
20
|
-
};
|
|
21
|
-
//# sourceMappingURL=mergeTransform.mjs.map
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"version": 3,
|
|
3
|
-
"sources": ["../../../src/helpers/mergeTransform.ts"],
|
|
4
|
-
"sourcesContent": ["import type { ViewStyle } from 'react-native'\n\nexport type FlatTransforms = Record<string, any>\n\nexport const mergeTransform = (\n obj: ViewStyle,\n key: string,\n val: any,\n backwards = false\n) => {\n obj.transform ||= []\n obj.transform[backwards ? 'unshift' : 'push']({\n [mapTransformKeys[key] || key]: val,\n } as any)\n}\n\nexport const mergeTransforms = (\n obj: ViewStyle,\n flatTransforms: FlatTransforms,\n backwards = false\n) => {\n Object.entries(flatTransforms).forEach(([key, val]) => {\n mergeTransform(obj, key, val, backwards)\n })\n}\n\nexport const mapTransformKeys = {\n x: 'translateX',\n y: 'translateY',\n}\n"],
|
|
5
|
-
"mappings": "AAIO,MAAM,iBAAiB,CAC5B,KACA,KACA,KACA,YAAY,UACT;AACH,MAAI,cAAc,CAAC;AACnB,MAAI,UAAU,YAAY,YAAY,MAAM,EAAE;AAAA,IAC5C,CAAC,iBAAiB,GAAG,KAAK,GAAG,GAAG;AAAA,EAClC,CAAQ;AACV;AAEO,MAAM,kBAAkB,CAC7B,KACA,gBACA,YAAY,UACT;AACH,SAAO,QAAQ,cAAc,EAAE,QAAQ,CAAC,CAAC,KAAK,GAAG,MAAM;AACrD,mBAAe,KAAK,KAAK,KAAK,SAAS;AAAA,EACzC,CAAC;AACH;AAEO,MAAM,mBAAmB;AAAA,EAC9B,GAAG;AAAA,EACH,GAAG;AACL;",
|
|
6
|
-
"names": []
|
|
7
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"mergeTransform.d.ts","sourceRoot":"","sources":["../../src/helpers/mergeTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAEhD,eAAO,MAAM,cAAc,QACpB,SAAS,OACT,MAAM,OACN,GAAG,8BAOT,CAAA;AAED,eAAO,MAAM,eAAe,QACrB,SAAS,kBACE,cAAc,8BAM/B,CAAA;AAED,eAAO,MAAM,gBAAgB;;;CAG5B,CAAA"}
|