@tamagui/button 1.88.21 → 1.88.23
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/esm/Button.native.js +32 -45
- package/dist/esm/Button.native.js.map +1 -1
- package/dist/esm/Button.test.native.js +7 -6
- package/dist/esm/Button.test.native.js.map +1 -1
- package/dist/esm/index.native.js +1 -19
- package/dist/esm/index.native.js.map +1 -1
- package/dist/jsx/Button.native.js +32 -45
- package/dist/jsx/Button.native.js.map +1 -1
- package/dist/jsx/Button.test.native.js +7 -6
- package/dist/jsx/Button.test.native.js.map +1 -1
- package/dist/jsx/index.native.js +1 -19
- package/dist/jsx/index.native.js.map +1 -1
- package/package.json +9 -9
|
@@ -1,31 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
};
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
__export(Button_exports, {
|
|
18
|
-
Button: () => Button2,
|
|
19
|
-
ButtonContext: () => ButtonContext,
|
|
20
|
-
ButtonFrame: () => ButtonFrame,
|
|
21
|
-
ButtonIcon: () => ButtonIcon,
|
|
22
|
-
ButtonText: () => ButtonText,
|
|
23
|
-
buttonStaticConfig: () => buttonStaticConfig,
|
|
24
|
-
useButton: () => useButton
|
|
25
|
-
});
|
|
26
|
-
module.exports = __toCommonJS(Button_exports);
|
|
27
|
-
var import_font_size = require("@tamagui/font-size"), import_get_button_sized = require("@tamagui/get-button-sized"), import_helpers = require("@tamagui/helpers"), import_helpers_tamagui = require("@tamagui/helpers-tamagui"), import_stacks = require("@tamagui/stacks"), import_text = require("@tamagui/text"), import_web = require("@tamagui/web"), import_react = require("react"), import_jsx_runtime = require("react/jsx-runtime");
|
|
28
|
-
const ButtonContext = (0, import_web.createStyledContext)({
|
|
1
|
+
import { getFontSize } from "@tamagui/font-size";
|
|
2
|
+
import { getButtonSized } from "@tamagui/get-button-sized";
|
|
3
|
+
import { withStaticProperties } from "@tamagui/helpers";
|
|
4
|
+
import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
|
|
5
|
+
import { ButtonNestingContext, ThemeableStack } from "@tamagui/stacks";
|
|
6
|
+
import { SizableText, wrapChildrenInText } from "@tamagui/text";
|
|
7
|
+
import {
|
|
8
|
+
createStyledContext,
|
|
9
|
+
getVariableValue,
|
|
10
|
+
spacedChildren,
|
|
11
|
+
styled,
|
|
12
|
+
useProps
|
|
13
|
+
} from "@tamagui/web";
|
|
14
|
+
import { useContext } from "react";
|
|
15
|
+
import { jsx } from "react/jsx-runtime";
|
|
16
|
+
const ButtonContext = createStyledContext({
|
|
29
17
|
// keeping these here means they work with styled() passing down color to text
|
|
30
18
|
color: void 0,
|
|
31
19
|
ellipse: void 0,
|
|
@@ -38,7 +26,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
38
26
|
size: void 0,
|
|
39
27
|
textAlign: void 0,
|
|
40
28
|
variant: void 0
|
|
41
|
-
}), BUTTON_NAME = "Button", ButtonFrame =
|
|
29
|
+
}), BUTTON_NAME = "Button", ButtonFrame = styled(ThemeableStack, {
|
|
42
30
|
name: BUTTON_NAME,
|
|
43
31
|
tag: "button",
|
|
44
32
|
context: ButtonContext,
|
|
@@ -85,7 +73,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
85
73
|
}
|
|
86
74
|
},
|
|
87
75
|
size: {
|
|
88
|
-
"...size":
|
|
76
|
+
"...size": getButtonSized
|
|
89
77
|
},
|
|
90
78
|
disabled: {
|
|
91
79
|
true: {
|
|
@@ -96,7 +84,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
96
84
|
defaultVariants: {
|
|
97
85
|
unstyled: process.env.TAMAGUI_HEADLESS === "1"
|
|
98
86
|
}
|
|
99
|
-
}), ButtonText =
|
|
87
|
+
}), ButtonText = styled(SizableText, {
|
|
100
88
|
name: "Button",
|
|
101
89
|
context: ButtonContext,
|
|
102
90
|
variants: {
|
|
@@ -116,12 +104,12 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
116
104
|
unstyled: process.env.TAMAGUI_HEADLESS === "1"
|
|
117
105
|
}
|
|
118
106
|
}), ButtonIcon = (props) => {
|
|
119
|
-
const { children, scaleIcon = 1 } = props, { size, color } =
|
|
120
|
-
return
|
|
107
|
+
const { children, scaleIcon = 1 } = props, { size, color } = useContext(ButtonContext), iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon;
|
|
108
|
+
return useGetThemedIcon({ size: iconSize, color })(children);
|
|
121
109
|
}, ButtonComponent = ButtonFrame.styleable(
|
|
122
110
|
function(props, ref) {
|
|
123
111
|
const { props: buttonProps } = useButton(props);
|
|
124
|
-
return /* @__PURE__ */
|
|
112
|
+
return /* @__PURE__ */ jsx(ButtonFrame, { ...buttonProps, ref });
|
|
125
113
|
}
|
|
126
114
|
), buttonStaticConfig = {
|
|
127
115
|
inlineProps: /* @__PURE__ */ new Set([
|
|
@@ -136,12 +124,12 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
136
124
|
"textAlign",
|
|
137
125
|
"unstyled"
|
|
138
126
|
])
|
|
139
|
-
}, Button2 =
|
|
127
|
+
}, Button2 = withStaticProperties(ButtonComponent, {
|
|
140
128
|
Text: ButtonText,
|
|
141
129
|
Icon: ButtonIcon
|
|
142
130
|
});
|
|
143
131
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
144
|
-
const isNested =
|
|
132
|
+
const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
|
|
145
133
|
icon,
|
|
146
134
|
iconAfter,
|
|
147
135
|
space,
|
|
@@ -159,12 +147,12 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
159
147
|
ellipse,
|
|
160
148
|
maxFontSizeMultiplier,
|
|
161
149
|
...restProps
|
|
162
|
-
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 :
|
|
150
|
+
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size, {
|
|
163
151
|
font: (fontFamily == null ? void 0 : fontFamily[0]) === "$" ? fontFamily : void 0
|
|
164
|
-
})) * scaleIcon, getThemedIcon =
|
|
152
|
+
})) * scaleIcon, getThemedIcon = useGetThemedIcon({
|
|
165
153
|
size: iconSize,
|
|
166
154
|
color
|
|
167
|
-
}), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ??
|
|
155
|
+
}), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [propsIn.children] : wrapChildrenInText(
|
|
168
156
|
Text,
|
|
169
157
|
{
|
|
170
158
|
children: propsIn.children,
|
|
@@ -181,7 +169,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
181
169
|
unstyled: process.env.TAMAGUI_HEADLESS === "1",
|
|
182
170
|
size
|
|
183
171
|
} : void 0
|
|
184
|
-
), inner =
|
|
172
|
+
), inner = spacedChildren({
|
|
185
173
|
// a bit arbitrary but scaling to font size is necessary so long as button does
|
|
186
174
|
space: spaceSize,
|
|
187
175
|
spaceFlex,
|
|
@@ -205,7 +193,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
205
193
|
propsActive.accessibilityRole === "link" || propsActive.role === "link" ? "a" : "button"
|
|
206
194
|
)),
|
|
207
195
|
...restProps,
|
|
208
|
-
children: /* @__PURE__ */
|
|
196
|
+
children: /* @__PURE__ */ jsx(ButtonNestingContext.Provider, { value: !0, children: inner }),
|
|
209
197
|
// forces it to be a runtime pressStyle so it passes through context text colors
|
|
210
198
|
disableClassName: !0
|
|
211
199
|
};
|
|
@@ -215,14 +203,13 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
215
203
|
props
|
|
216
204
|
};
|
|
217
205
|
}
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
Button,
|
|
206
|
+
export {
|
|
207
|
+
Button2 as Button,
|
|
221
208
|
ButtonContext,
|
|
222
209
|
ButtonFrame,
|
|
223
210
|
ButtonIcon,
|
|
224
211
|
ButtonText,
|
|
225
212
|
buttonStaticConfig,
|
|
226
213
|
useButton
|
|
227
|
-
}
|
|
214
|
+
};
|
|
228
215
|
//# sourceMappingURL=Button.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import { getDefaultTamaguiConfig } from "@tamagui/config-default";
|
|
2
|
+
import { createTamagui } from "@tamagui/core";
|
|
3
|
+
import { describe, expect, test } from "vitest";
|
|
4
|
+
const conf = createTamagui(getDefaultTamaguiConfig());
|
|
5
|
+
describe("Button", () => {
|
|
6
|
+
test("123", () => {
|
|
7
|
+
expect(!0).toBeTruthy();
|
|
7
8
|
});
|
|
8
9
|
});
|
|
9
10
|
//# sourceMappingURL=Button.test.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.test.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "AAAA,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAC9B,SAAS,UAAU,QAAQ,YAAY;AAEvC,MAAM,OAAO,cAAc,wBAAwB,CAAC;AAEpD,SAAS,UAAU,MAAM;AACvB,OAAK,OAAO,MAAM;AAChB,WAAO,EAAI,EAAE,WAAW;AAAA,EAC1B,CAAC;AAWH,CAAC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/index.native.js
CHANGED
|
@@ -1,20 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
var __defProp = Object.defineProperty;
|
|
3
|
-
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
-
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
-
var __copyProps = (to, from, except, desc) => {
|
|
7
|
-
if (from && typeof from == "object" || typeof from == "function")
|
|
8
|
-
for (let key of __getOwnPropNames(from))
|
|
9
|
-
!__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
10
|
-
return to;
|
|
11
|
-
}, __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
|
|
12
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
13
|
-
var src_exports = {};
|
|
14
|
-
module.exports = __toCommonJS(src_exports);
|
|
15
|
-
__reExport(src_exports, require("./Button"), module.exports);
|
|
16
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
17
|
-
0 && (module.exports = {
|
|
18
|
-
...require("./Button")
|
|
19
|
-
});
|
|
1
|
+
export * from "./Button";
|
|
20
2
|
//# sourceMappingURL=index.js.map
|
|
@@ -1,31 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
};
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
__export(Button_exports, {
|
|
18
|
-
Button: () => Button2,
|
|
19
|
-
ButtonContext: () => ButtonContext,
|
|
20
|
-
ButtonFrame: () => ButtonFrame,
|
|
21
|
-
ButtonIcon: () => ButtonIcon,
|
|
22
|
-
ButtonText: () => ButtonText,
|
|
23
|
-
buttonStaticConfig: () => buttonStaticConfig,
|
|
24
|
-
useButton: () => useButton
|
|
25
|
-
});
|
|
26
|
-
module.exports = __toCommonJS(Button_exports);
|
|
27
|
-
var import_font_size = require("@tamagui/font-size"), import_get_button_sized = require("@tamagui/get-button-sized"), import_helpers = require("@tamagui/helpers"), import_helpers_tamagui = require("@tamagui/helpers-tamagui"), import_stacks = require("@tamagui/stacks"), import_text = require("@tamagui/text"), import_web = require("@tamagui/web"), import_react = require("react"), import_jsx_runtime = require("react/jsx-runtime");
|
|
28
|
-
const ButtonContext = (0, import_web.createStyledContext)({
|
|
1
|
+
import { getFontSize } from "@tamagui/font-size";
|
|
2
|
+
import { getButtonSized } from "@tamagui/get-button-sized";
|
|
3
|
+
import { withStaticProperties } from "@tamagui/helpers";
|
|
4
|
+
import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
|
|
5
|
+
import { ButtonNestingContext, ThemeableStack } from "@tamagui/stacks";
|
|
6
|
+
import { SizableText, wrapChildrenInText } from "@tamagui/text";
|
|
7
|
+
import {
|
|
8
|
+
createStyledContext,
|
|
9
|
+
getVariableValue,
|
|
10
|
+
spacedChildren,
|
|
11
|
+
styled,
|
|
12
|
+
useProps
|
|
13
|
+
} from "@tamagui/web";
|
|
14
|
+
import { useContext } from "react";
|
|
15
|
+
import { jsx } from "react/jsx-runtime";
|
|
16
|
+
const ButtonContext = createStyledContext({
|
|
29
17
|
// keeping these here means they work with styled() passing down color to text
|
|
30
18
|
color: void 0,
|
|
31
19
|
ellipse: void 0,
|
|
@@ -38,7 +26,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
38
26
|
size: void 0,
|
|
39
27
|
textAlign: void 0,
|
|
40
28
|
variant: void 0
|
|
41
|
-
}), BUTTON_NAME = "Button", ButtonFrame =
|
|
29
|
+
}), BUTTON_NAME = "Button", ButtonFrame = styled(ThemeableStack, {
|
|
42
30
|
name: BUTTON_NAME,
|
|
43
31
|
tag: "button",
|
|
44
32
|
context: ButtonContext,
|
|
@@ -85,7 +73,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
85
73
|
}
|
|
86
74
|
},
|
|
87
75
|
size: {
|
|
88
|
-
"...size":
|
|
76
|
+
"...size": getButtonSized
|
|
89
77
|
},
|
|
90
78
|
disabled: {
|
|
91
79
|
true: {
|
|
@@ -96,7 +84,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
96
84
|
defaultVariants: {
|
|
97
85
|
unstyled: process.env.TAMAGUI_HEADLESS === "1"
|
|
98
86
|
}
|
|
99
|
-
}), ButtonText =
|
|
87
|
+
}), ButtonText = styled(SizableText, {
|
|
100
88
|
name: "Button",
|
|
101
89
|
context: ButtonContext,
|
|
102
90
|
variants: {
|
|
@@ -116,12 +104,12 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
116
104
|
unstyled: process.env.TAMAGUI_HEADLESS === "1"
|
|
117
105
|
}
|
|
118
106
|
}), ButtonIcon = (props) => {
|
|
119
|
-
const { children, scaleIcon = 1 } = props, { size, color } =
|
|
120
|
-
return
|
|
107
|
+
const { children, scaleIcon = 1 } = props, { size, color } = useContext(ButtonContext), iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon;
|
|
108
|
+
return useGetThemedIcon({ size: iconSize, color })(children);
|
|
121
109
|
}, ButtonComponent = ButtonFrame.styleable(
|
|
122
110
|
function(props, ref) {
|
|
123
111
|
const { props: buttonProps } = useButton(props);
|
|
124
|
-
return /* @__PURE__ */
|
|
112
|
+
return /* @__PURE__ */ jsx(ButtonFrame, { ...buttonProps, ref });
|
|
125
113
|
}
|
|
126
114
|
), buttonStaticConfig = {
|
|
127
115
|
inlineProps: /* @__PURE__ */ new Set([
|
|
@@ -136,12 +124,12 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
136
124
|
"textAlign",
|
|
137
125
|
"unstyled"
|
|
138
126
|
])
|
|
139
|
-
}, Button2 =
|
|
127
|
+
}, Button2 = withStaticProperties(ButtonComponent, {
|
|
140
128
|
Text: ButtonText,
|
|
141
129
|
Icon: ButtonIcon
|
|
142
130
|
});
|
|
143
131
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
144
|
-
const isNested =
|
|
132
|
+
const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
|
|
145
133
|
icon,
|
|
146
134
|
iconAfter,
|
|
147
135
|
space,
|
|
@@ -159,12 +147,12 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
159
147
|
ellipse,
|
|
160
148
|
maxFontSizeMultiplier,
|
|
161
149
|
...restProps
|
|
162
|
-
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 :
|
|
150
|
+
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size, {
|
|
163
151
|
font: (fontFamily == null ? void 0 : fontFamily[0]) === "$" ? fontFamily : void 0
|
|
164
|
-
})) * scaleIcon, getThemedIcon =
|
|
152
|
+
})) * scaleIcon, getThemedIcon = useGetThemedIcon({
|
|
165
153
|
size: iconSize,
|
|
166
154
|
color
|
|
167
|
-
}), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ??
|
|
155
|
+
}), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [propsIn.children] : wrapChildrenInText(
|
|
168
156
|
Text,
|
|
169
157
|
{
|
|
170
158
|
children: propsIn.children,
|
|
@@ -181,7 +169,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
181
169
|
unstyled: process.env.TAMAGUI_HEADLESS === "1",
|
|
182
170
|
size
|
|
183
171
|
} : void 0
|
|
184
|
-
), inner =
|
|
172
|
+
), inner = spacedChildren({
|
|
185
173
|
// a bit arbitrary but scaling to font size is necessary so long as button does
|
|
186
174
|
space: spaceSize,
|
|
187
175
|
spaceFlex,
|
|
@@ -205,7 +193,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
205
193
|
propsActive.accessibilityRole === "link" || propsActive.role === "link" ? "a" : "button"
|
|
206
194
|
)),
|
|
207
195
|
...restProps,
|
|
208
|
-
children: /* @__PURE__ */
|
|
196
|
+
children: /* @__PURE__ */ jsx(ButtonNestingContext.Provider, { value: !0, children: inner }),
|
|
209
197
|
// forces it to be a runtime pressStyle so it passes through context text colors
|
|
210
198
|
disableClassName: !0
|
|
211
199
|
};
|
|
@@ -215,14 +203,13 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
215
203
|
props
|
|
216
204
|
};
|
|
217
205
|
}
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
Button,
|
|
206
|
+
export {
|
|
207
|
+
Button2 as Button,
|
|
221
208
|
ButtonContext,
|
|
222
209
|
ButtonFrame,
|
|
223
210
|
ButtonIcon,
|
|
224
211
|
ButtonText,
|
|
225
212
|
buttonStaticConfig,
|
|
226
213
|
useButton
|
|
227
|
-
}
|
|
214
|
+
};
|
|
228
215
|
//# sourceMappingURL=Button.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import { getDefaultTamaguiConfig } from "@tamagui/config-default";
|
|
2
|
+
import { createTamagui } from "@tamagui/core";
|
|
3
|
+
import { describe, expect, test } from "vitest";
|
|
4
|
+
const conf = createTamagui(getDefaultTamaguiConfig());
|
|
5
|
+
describe("Button", () => {
|
|
6
|
+
test("123", () => {
|
|
7
|
+
expect(!0).toBeTruthy();
|
|
7
8
|
});
|
|
8
9
|
});
|
|
9
10
|
//# sourceMappingURL=Button.test.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.test.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "AAAA,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAC9B,SAAS,UAAU,QAAQ,YAAY;AAEvC,MAAM,OAAO,cAAc,wBAAwB,CAAC;AAEpD,SAAS,UAAU,MAAM;AACvB,OAAK,OAAO,MAAM;AAChB,WAAO,EAAI,EAAE,WAAW;AAAA,EAC1B,CAAC;AAWH,CAAC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/jsx/index.native.js
CHANGED
|
@@ -1,20 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
var __defProp = Object.defineProperty;
|
|
3
|
-
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
-
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
-
var __copyProps = (to, from, except, desc) => {
|
|
7
|
-
if (from && typeof from == "object" || typeof from == "function")
|
|
8
|
-
for (let key of __getOwnPropNames(from))
|
|
9
|
-
!__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
10
|
-
return to;
|
|
11
|
-
}, __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
|
|
12
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
13
|
-
var src_exports = {};
|
|
14
|
-
module.exports = __toCommonJS(src_exports);
|
|
15
|
-
__reExport(src_exports, require("./Button"), module.exports);
|
|
16
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
17
|
-
0 && (module.exports = {
|
|
18
|
-
...require("./Button")
|
|
19
|
-
});
|
|
1
|
+
export * from "./Button";
|
|
20
2
|
//# sourceMappingURL=index.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/button",
|
|
3
|
-
"version": "1.88.
|
|
3
|
+
"version": "1.88.23",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -32,19 +32,19 @@
|
|
|
32
32
|
}
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@tamagui/font-size": "1.88.
|
|
36
|
-
"@tamagui/get-button-sized": "1.88.
|
|
37
|
-
"@tamagui/helpers": "1.88.
|
|
38
|
-
"@tamagui/helpers-tamagui": "1.88.
|
|
39
|
-
"@tamagui/stacks": "1.88.
|
|
40
|
-
"@tamagui/text": "1.88.
|
|
41
|
-
"@tamagui/web": "1.88.
|
|
35
|
+
"@tamagui/font-size": "1.88.23",
|
|
36
|
+
"@tamagui/get-button-sized": "1.88.23",
|
|
37
|
+
"@tamagui/helpers": "1.88.23",
|
|
38
|
+
"@tamagui/helpers-tamagui": "1.88.23",
|
|
39
|
+
"@tamagui/stacks": "1.88.23",
|
|
40
|
+
"@tamagui/text": "1.88.23",
|
|
41
|
+
"@tamagui/web": "1.88.23"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"react": "*"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@tamagui/build": "1.88.
|
|
47
|
+
"@tamagui/build": "1.88.23",
|
|
48
48
|
"react": "^18.2.0",
|
|
49
49
|
"vitest": "^0.34.3"
|
|
50
50
|
},
|