@tamagui/button 1.79.9 → 1.79.11
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/Button.js +6 -7
- package/dist/cjs/Button.js.map +1 -1
- package/dist/cjs/Button.native.js +6 -7
- package/dist/cjs/Button.native.js.map +1 -1
- package/dist/esm/Button.js +6 -6
- package/dist/esm/Button.js.map +1 -1
- package/dist/esm/Button.native.js +6 -6
- package/dist/esm/Button.native.js.map +1 -1
- package/dist/jsx/Button.js +6 -6
- package/dist/jsx/Button.js.map +1 -1
- package/dist/jsx/Button.native.js +6 -6
- package/dist/jsx/Button.native.js.map +1 -1
- package/package.json +8 -7
- package/src/Button.tsx +3 -7
- package/types/Button.d.ts +0 -1
- package/types/Button.d.ts.map +1 -1
- package/dist/cjs/base.js +0 -29
- package/dist/cjs/base.js.map +0 -6
- package/dist/cjs/themed.js +0 -252
- package/dist/cjs/themed.js.map +0 -6
- package/dist/esm/Button.mjs +0 -191
- package/dist/esm/Button.mjs.map +0 -6
- package/dist/esm/Button.test.mjs +0 -10
- package/dist/esm/Button.test.mjs.map +0 -6
- package/dist/esm/base.js +0 -5
- package/dist/esm/base.js.map +0 -6
- package/dist/esm/index.mjs +0 -2
- package/dist/esm/index.mjs.map +0 -6
- package/dist/esm/themed.js +0 -237
- package/dist/esm/themed.js.map +0 -6
- package/dist/jsx/Button.mjs +0 -200
- package/dist/jsx/Button.mjs.map +0 -6
- package/dist/jsx/Button.test.mjs +0 -11
- package/dist/jsx/Button.test.mjs.map +0 -6
- package/dist/jsx/base.js +0 -5
- package/dist/jsx/base.js.map +0 -6
- package/dist/jsx/base.mjs.map +0 -6
- package/dist/jsx/index.mjs +0 -2
- package/dist/jsx/index.mjs.map +0 -6
- package/dist/jsx/themed.js +0 -232
- package/dist/jsx/themed.js.map +0 -6
- package/dist/jsx/themed.mjs.map +0 -6
package/dist/cjs/Button.js
CHANGED
|
@@ -18,7 +18,6 @@ __export(Button_exports, {
|
|
|
18
18
|
ButtonContext: () => ButtonContext,
|
|
19
19
|
ButtonFrame: () => ButtonFrame,
|
|
20
20
|
ButtonIcon: () => ButtonIcon,
|
|
21
|
-
ButtonNestingContext: () => ButtonNestingContext,
|
|
22
21
|
ButtonText: () => ButtonText,
|
|
23
22
|
buttonStaticConfig: () => buttonStaticConfig,
|
|
24
23
|
useButton: () => useButton
|
|
@@ -137,9 +136,9 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
137
136
|
}, Button2 = (0, import_web.withStaticProperties)(ButtonComponent, {
|
|
138
137
|
Text: ButtonText,
|
|
139
138
|
Icon: ButtonIcon
|
|
140
|
-
})
|
|
139
|
+
});
|
|
141
140
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
142
|
-
const isNested = (0, import_react.useContext)(ButtonNestingContext), didFinishSSR = (0, import_web.useDidFinishSSR)(), propsActive = (0, import_web.useProps)(propsIn), {
|
|
141
|
+
const isNested = (0, import_react.useContext)(import_stacks.ButtonNestingContext), didFinishSSR = (0, import_web.useDidFinishSSR)(), propsActive = (0, import_web.useProps)(propsIn), {
|
|
143
142
|
icon,
|
|
144
143
|
iconAfter,
|
|
145
144
|
space,
|
|
@@ -149,7 +148,8 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
149
148
|
separator,
|
|
150
149
|
noTextWrap,
|
|
151
150
|
fontFamily,
|
|
152
|
-
fontSize
|
|
151
|
+
fontSize,
|
|
152
|
+
...restProps
|
|
153
153
|
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 : (0, import_font_size.getFontSize)(size)) * scaleIcon, getThemedIcon = (0, import_helpers_tamagui.useGetThemedIcon)({
|
|
154
154
|
size: iconSize,
|
|
155
155
|
color
|
|
@@ -171,7 +171,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
171
171
|
// defaults to <a /> when accessibilityRole = link
|
|
172
172
|
// see https://github.com/tamagui/tamagui/issues/505
|
|
173
173
|
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
174
|
-
),
|
|
174
|
+
), props = {
|
|
175
175
|
size,
|
|
176
176
|
...propsIn.disabled && {
|
|
177
177
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -185,7 +185,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
185
185
|
tag
|
|
186
186
|
},
|
|
187
187
|
...restProps,
|
|
188
|
-
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ButtonNestingContext.Provider, { value: !0, children: inner }),
|
|
188
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_stacks.ButtonNestingContext.Provider, { value: !0, children: inner }),
|
|
189
189
|
// forces it to be a runtime pressStyle so it passes through context text colors
|
|
190
190
|
disableClassName: didFinishSSR
|
|
191
191
|
};
|
|
@@ -201,7 +201,6 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
201
201
|
ButtonContext,
|
|
202
202
|
ButtonFrame,
|
|
203
203
|
ButtonIcon,
|
|
204
|
-
ButtonNestingContext,
|
|
205
204
|
ButtonText,
|
|
206
205
|
buttonStaticConfig,
|
|
207
206
|
useButton
|
package/dist/cjs/Button.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA,gBAAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
|
@@ -19,7 +19,6 @@ __export(Button_exports, {
|
|
|
19
19
|
ButtonContext: () => ButtonContext,
|
|
20
20
|
ButtonFrame: () => ButtonFrame,
|
|
21
21
|
ButtonIcon: () => ButtonIcon,
|
|
22
|
-
ButtonNestingContext: () => ButtonNestingContext,
|
|
23
22
|
ButtonText: () => ButtonText,
|
|
24
23
|
buttonStaticConfig: () => buttonStaticConfig,
|
|
25
24
|
useButton: () => useButton
|
|
@@ -138,9 +137,9 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
138
137
|
}, Button2 = (0, import_web.withStaticProperties)(ButtonComponent, {
|
|
139
138
|
Text: ButtonText,
|
|
140
139
|
Icon: ButtonIcon
|
|
141
|
-
})
|
|
140
|
+
});
|
|
142
141
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
143
|
-
const isNested = (0, import_react.useContext)(ButtonNestingContext), didFinishSSR = (0, import_web.useDidFinishSSR)(), propsActive = (0, import_web.useProps)(propsIn), {
|
|
142
|
+
const isNested = (0, import_react.useContext)(import_stacks.ButtonNestingContext), didFinishSSR = (0, import_web.useDidFinishSSR)(), propsActive = (0, import_web.useProps)(propsIn), {
|
|
144
143
|
icon,
|
|
145
144
|
iconAfter,
|
|
146
145
|
space,
|
|
@@ -150,7 +149,8 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
150
149
|
separator,
|
|
151
150
|
noTextWrap,
|
|
152
151
|
fontFamily,
|
|
153
|
-
fontSize
|
|
152
|
+
fontSize,
|
|
153
|
+
...restProps
|
|
154
154
|
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 : (0, import_font_size.getFontSize)(size)) * scaleIcon, getThemedIcon = (0, import_helpers_tamagui.useGetThemedIcon)({
|
|
155
155
|
size: iconSize,
|
|
156
156
|
color
|
|
@@ -172,7 +172,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
172
172
|
// defaults to <a /> when accessibilityRole = link
|
|
173
173
|
// see https://github.com/tamagui/tamagui/issues/505
|
|
174
174
|
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
175
|
-
),
|
|
175
|
+
), props = {
|
|
176
176
|
size,
|
|
177
177
|
...propsIn.disabled && {
|
|
178
178
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -186,7 +186,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
186
186
|
tag
|
|
187
187
|
},
|
|
188
188
|
...restProps,
|
|
189
|
-
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ButtonNestingContext.Provider, { value: !0, children: inner }),
|
|
189
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_stacks.ButtonNestingContext.Provider, { value: !0, children: inner }),
|
|
190
190
|
// forces it to be a runtime pressStyle so it passes through context text colors
|
|
191
191
|
disableClassName: didFinishSSR
|
|
192
192
|
};
|
|
@@ -202,7 +202,6 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
202
202
|
ButtonContext,
|
|
203
203
|
ButtonFrame,
|
|
204
204
|
ButtonIcon,
|
|
205
|
-
ButtonNestingContext,
|
|
206
205
|
ButtonText,
|
|
207
206
|
buttonStaticConfig,
|
|
208
207
|
useButton
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA,gBAAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
package/dist/esm/Button.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getFontSize } from "@tamagui/font-size";
|
|
2
2
|
import { getButtonSized } from "@tamagui/get-button-sized";
|
|
3
3
|
import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
|
|
4
|
-
import { ThemeableStack } from "@tamagui/stacks";
|
|
4
|
+
import { ButtonNestingContext, ThemeableStack } from "@tamagui/stacks";
|
|
5
5
|
import {
|
|
6
6
|
SizableText,
|
|
7
7
|
wrapChildrenInText
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
useProps,
|
|
16
16
|
withStaticProperties
|
|
17
17
|
} from "@tamagui/web";
|
|
18
|
-
import {
|
|
18
|
+
import { useContext } from "react";
|
|
19
19
|
import { jsx } from "react/jsx-runtime";
|
|
20
20
|
const ButtonContext = createStyledContext({
|
|
21
21
|
// keeping these here means they work with styled() passing down color to text
|
|
@@ -129,7 +129,7 @@ const ButtonContext = createStyledContext({
|
|
|
129
129
|
}, Button2 = withStaticProperties(ButtonComponent, {
|
|
130
130
|
Text: ButtonText,
|
|
131
131
|
Icon: ButtonIcon
|
|
132
|
-
})
|
|
132
|
+
});
|
|
133
133
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
134
134
|
const isNested = useContext(ButtonNestingContext), didFinishSSR = useDidFinishSSR(), propsActive = useProps(propsIn), {
|
|
135
135
|
icon,
|
|
@@ -141,7 +141,8 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
141
141
|
separator,
|
|
142
142
|
noTextWrap,
|
|
143
143
|
fontFamily,
|
|
144
|
-
fontSize
|
|
144
|
+
fontSize,
|
|
145
|
+
...restProps
|
|
145
146
|
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon, getThemedIcon = useGetThemedIcon({
|
|
146
147
|
size: iconSize,
|
|
147
148
|
color
|
|
@@ -163,7 +164,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
163
164
|
// defaults to <a /> when accessibilityRole = link
|
|
164
165
|
// see https://github.com/tamagui/tamagui/issues/505
|
|
165
166
|
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
166
|
-
),
|
|
167
|
+
), props = {
|
|
167
168
|
size,
|
|
168
169
|
...propsIn.disabled && {
|
|
169
170
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -192,7 +193,6 @@ export {
|
|
|
192
193
|
ButtonContext,
|
|
193
194
|
ButtonFrame,
|
|
194
195
|
ButtonIcon,
|
|
195
|
-
ButtonNestingContext,
|
|
196
196
|
ButtonText,
|
|
197
197
|
buttonStaticConfig,
|
|
198
198
|
useButton
|
package/dist/esm/Button.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,wBAAwB;AACjC,SAAS,sBAAsB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getFontSize } from "@tamagui/font-size";
|
|
2
2
|
import { getButtonSized } from "@tamagui/get-button-sized";
|
|
3
3
|
import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
|
|
4
|
-
import { ThemeableStack } from "@tamagui/stacks";
|
|
4
|
+
import { ButtonNestingContext, ThemeableStack } from "@tamagui/stacks";
|
|
5
5
|
import {
|
|
6
6
|
SizableText,
|
|
7
7
|
wrapChildrenInText
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
useProps,
|
|
16
16
|
withStaticProperties
|
|
17
17
|
} from "@tamagui/web";
|
|
18
|
-
import {
|
|
18
|
+
import { useContext } from "react";
|
|
19
19
|
import { jsx } from "react/jsx-runtime";
|
|
20
20
|
const ButtonContext = createStyledContext({
|
|
21
21
|
// keeping these here means they work with styled() passing down color to text
|
|
@@ -129,7 +129,7 @@ const ButtonContext = createStyledContext({
|
|
|
129
129
|
}, Button2 = withStaticProperties(ButtonComponent, {
|
|
130
130
|
Text: ButtonText,
|
|
131
131
|
Icon: ButtonIcon
|
|
132
|
-
})
|
|
132
|
+
});
|
|
133
133
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
134
134
|
const isNested = useContext(ButtonNestingContext), didFinishSSR = useDidFinishSSR(), propsActive = useProps(propsIn), {
|
|
135
135
|
icon,
|
|
@@ -141,7 +141,8 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
141
141
|
separator,
|
|
142
142
|
noTextWrap,
|
|
143
143
|
fontFamily,
|
|
144
|
-
fontSize
|
|
144
|
+
fontSize,
|
|
145
|
+
...restProps
|
|
145
146
|
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon, getThemedIcon = useGetThemedIcon({
|
|
146
147
|
size: iconSize,
|
|
147
148
|
color
|
|
@@ -163,7 +164,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
163
164
|
// defaults to <a /> when accessibilityRole = link
|
|
164
165
|
// see https://github.com/tamagui/tamagui/issues/505
|
|
165
166
|
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
166
|
-
),
|
|
167
|
+
), props = {
|
|
167
168
|
size,
|
|
168
169
|
...propsIn.disabled && {
|
|
169
170
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -192,7 +193,6 @@ export {
|
|
|
192
193
|
ButtonContext,
|
|
193
194
|
ButtonFrame,
|
|
194
195
|
ButtonIcon,
|
|
195
|
-
ButtonNestingContext,
|
|
196
196
|
ButtonText,
|
|
197
197
|
buttonStaticConfig,
|
|
198
198
|
useButton
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,wBAAwB;AACjC,SAAS,sBAAsB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
package/dist/jsx/Button.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getFontSize } from "@tamagui/font-size";
|
|
2
2
|
import { getButtonSized } from "@tamagui/get-button-sized";
|
|
3
3
|
import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
|
|
4
|
-
import { ThemeableStack } from "@tamagui/stacks";
|
|
4
|
+
import { ButtonNestingContext, ThemeableStack } from "@tamagui/stacks";
|
|
5
5
|
import {
|
|
6
6
|
SizableText,
|
|
7
7
|
wrapChildrenInText
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
useProps,
|
|
16
16
|
withStaticProperties
|
|
17
17
|
} from "@tamagui/web";
|
|
18
|
-
import {
|
|
18
|
+
import { useContext } from "react";
|
|
19
19
|
const ButtonContext = createStyledContext({
|
|
20
20
|
// keeping these here means they work with styled() passing down color to text
|
|
21
21
|
color: void 0,
|
|
@@ -128,7 +128,7 @@ const ButtonContext = createStyledContext({
|
|
|
128
128
|
}, Button2 = withStaticProperties(ButtonComponent, {
|
|
129
129
|
Text: ButtonText,
|
|
130
130
|
Icon: ButtonIcon
|
|
131
|
-
})
|
|
131
|
+
});
|
|
132
132
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
133
133
|
const isNested = useContext(ButtonNestingContext), didFinishSSR = useDidFinishSSR(), propsActive = useProps(propsIn), {
|
|
134
134
|
icon,
|
|
@@ -140,7 +140,8 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
140
140
|
separator,
|
|
141
141
|
noTextWrap,
|
|
142
142
|
fontFamily,
|
|
143
|
-
fontSize
|
|
143
|
+
fontSize,
|
|
144
|
+
...restProps
|
|
144
145
|
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon, getThemedIcon = useGetThemedIcon({
|
|
145
146
|
size: iconSize,
|
|
146
147
|
color
|
|
@@ -162,7 +163,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
162
163
|
// defaults to <a /> when accessibilityRole = link
|
|
163
164
|
// see https://github.com/tamagui/tamagui/issues/505
|
|
164
165
|
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
165
|
-
),
|
|
166
|
+
), props = {
|
|
166
167
|
size,
|
|
167
168
|
...propsIn.disabled && {
|
|
168
169
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -191,7 +192,6 @@ export {
|
|
|
191
192
|
ButtonContext,
|
|
192
193
|
ButtonFrame,
|
|
193
194
|
ButtonIcon,
|
|
194
|
-
ButtonNestingContext,
|
|
195
195
|
ButtonText,
|
|
196
196
|
buttonStaticConfig,
|
|
197
197
|
useButton
|
package/dist/jsx/Button.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,wBAAwB;AACjC,SAAS,sBAAsB;
|
|
4
|
+
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,wBAAwB;AACjC,SAAS,sBAAsB,sBAAsB;AACrD;AAAA,EACE;AAAA,EAGA;AAAA,OACK;AACP;AAAA,EAKE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAA4B,kBAAkB;AAIvC,MAAM,gBAAgB,oBAO3B;AAAA;AAAA,EAEA,OAAO;AAAA,EACP,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,UAAU;AAAA,EACV,WAAW;AAAA,EACX,YAAY;AAAA,EACZ,eAAe;AAAA,EACf,uBAAuB;AAAA,EACvB,MAAM;AAAA,EACN,WAAW;AAAA,EACX,SAAS;AACX,CAAC,GAqCK,cAAc,UAEd,cAAc,OAAO,gBAAgB;AAAA,EACzC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,SAAS;AAAA,EACT,WAAW;AAAA,EACX,MAAM;AAAA,EAEN,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,MAAM;AAAA,QACN,gBAAgB;AAAA,QAChB,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,eAAe;AAAA,QACf,QAAQ;AAAA,QACR,YAAY;AAAA,QACZ,YAAY;AAAA,QACZ,cAAc;AAAA,QACd,aAAa;AAAA,QACb,aAAa;AAAA,QAEb,YAAY;AAAA,UACV,cAAc;AAAA,UACd,cAAc;AAAA,UACd,cAAc;AAAA,QAChB;AAAA,MACF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MACP,UAAU;AAAA,QACR,iBAAiB;AAAA,QACjB,aAAa;AAAA,QACb,aAAa;AAAA,QAEb,YAAY;AAAA,UACV,iBAAiB;AAAA,UACjB,aAAa;AAAA,QACf;AAAA,QAEA,YAAY;AAAA,UACV,iBAAiB;AAAA,UACjB,aAAa;AAAA,QACf;AAAA,QAEA,YAAY;AAAA,UACV,iBAAiB;AAAA,UACjB,aAAa;AAAA,QACf;AAAA,MACF;AAAA,IACF;AAAA,IAEA,MAAM;AAAA,MACJ,WAAW;AAAA,IACb;AAAA,IAEA,UAAU;AAAA,MACR,MAAM;AAAA,QACJ,eAAe;AAAA,MACjB;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC,GAEK,aAAa,OAAO,aAAa;AAAA,EACrC,MAAM;AAAA,EACN,SAAS;AAAA,EAET,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,YAAY;AAAA,QACZ,QAAQ;AAAA;AAAA,QAER,UAAU;AAAA,QACV,YAAY;AAAA,QACZ,SAAS;AAAA,QACT,OAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU,QAAQ,IAAI,qBAAqB;AAAA,EAC7C;AACF,CAAC,GAEK,aAAa,CAAC,UAA6D;AAC/E,QAAM,EAAE,UAAU,YAAY,EAAE,IAAI,OAC9B,EAAE,MAAM,MAAM,IAAI,WAAW,aAAa,GAE1C,YACH,OAAO,QAAS,WAAW,OAAO,MAAM,YAAY,IAAsB,KAC3E;AAGF,SADsB,iBAAiB,EAAE,MAAM,UAAU,MAAoB,CAAC,EACzD,QAAQ;AAC/B,GAEM,kBAAkB,YAAY,UAA4B,SAC9D,OACA,KACA;AACA,QAAM,EAAE,OAAO,YAAY,IAAI,UAAU,KAAK;AAC9C,SAAO,CAAC,gBAAgB,aAAa,KAAK,KAAK;AACjD,CAAC,GAKK,qBAAqB;AAAA,EACzB,aAAa,oBAAI,IAAI;AAAA;AAAA;AAAA,IAGnB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AACH,GAEMA,UAAS,qBAAqB,iBAAiB;AAAA,EACnD,MAAM;AAAA,EACN,MAAM;AACR,CAAC;AAKD,SAAS,UACP,EAAE,WAAW,GAAG,QAAQ,GACxB,EAAE,OAAOA,QAAO,KAAK,IAAmB,EAAE,MAAMA,QAAO,KAAK,GAC5D;AACA,QAAM,WAAW,WAAW,oBAAoB,GAC1C,eAAe,gBAAgB,GAC/B,cAAc,SAAS,OAAO,GAG9B;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAY;AAAA,IACZ,aAAa;AAAA,IACb;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI,aAEE,OAAO,YAAY,SAAS,YAAY,WAAW,SAAY,UAE/D,QAAQ,YAAY,OAEpB,YACH,OAAO,QAAS,WAAW,OAAO,MAAM,YAAY,IAAsB,KAC3E,WAEI,gBAAgB,iBAAiB;AAAA,IACrC,MAAM;AAAA,IACN;AAAA,EACF,CAAC,GAEK,CAAC,YAAY,eAAe,IAAI,CAAC,MAAM,SAAS,EAAE,IAAI,aAAa,GACnE,YAAY,SAAS,iBAAiB,QAAQ,IAAI,YAClD,WAAW,aACb,CAAC,QAAQ,QAAQ,IACjB;AAAA,IACE;AAAA,IACA,EAAE,UAAU,QAAQ,UAAU,YAAY,UAAU,UAAU;AAAA,IAC9D,SAAS,cAAc,YAAY,aAAa,KAC5C;AAAA,MACE,UAAU,QAAQ,IAAI,qBAAqB;AAAA,MAC3C;AAAA,IACF,IACA;AAAA,EACN,GAEE,QAAQ,eAAe;AAAA;AAAA,IAE3B,OAAO;AAAA,IACP;AAAA,IACA;AAAA,IACA,WACE,YAAY,kBAAkB,YAC9B,YAAY,kBAAkB,mBAC1B,aACA;AAAA,IACN,UAAU,CAAC,YAAY,GAAG,UAAU,eAAe;AAAA,EACrD,CAAC,GAGK,MAAM,WACR;AAAA;AAAA;AAAA,IAGF,YAAY,sBAAsB,SAChC,MACA;AAAA,KAEE,QAAQ;AAAA,IACZ;AAAA,IACA,GAAI,QAAQ,YAAY;AAAA;AAAA,MAEtB,WAAW;AAAA;AAAA,MAEX,YAAY;AAAA,QACV,aAAa;AAAA,MACf;AAAA,IACF;AAAA,IACA,GAAI,OAAO;AAAA,MACT;AAAA,IACF;AAAA,IACA,GAAG;AAAA,IACH,UACE,CAAC,qBAAqB,SAAS,OAAO,KAAO,MAAM,EAAlD,qBAAqB;AAAA;AAAA,IAGxB,kBAAkB;AAAA,EACpB;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getFontSize } from "@tamagui/font-size";
|
|
2
2
|
import { getButtonSized } from "@tamagui/get-button-sized";
|
|
3
3
|
import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
|
|
4
|
-
import { ThemeableStack } from "@tamagui/stacks";
|
|
4
|
+
import { ButtonNestingContext, ThemeableStack } from "@tamagui/stacks";
|
|
5
5
|
import {
|
|
6
6
|
SizableText,
|
|
7
7
|
wrapChildrenInText
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
useProps,
|
|
16
16
|
withStaticProperties
|
|
17
17
|
} from "@tamagui/web";
|
|
18
|
-
import {
|
|
18
|
+
import { useContext } from "react";
|
|
19
19
|
const ButtonContext = createStyledContext({
|
|
20
20
|
// keeping these here means they work with styled() passing down color to text
|
|
21
21
|
color: void 0,
|
|
@@ -128,7 +128,7 @@ const ButtonContext = createStyledContext({
|
|
|
128
128
|
}, Button2 = withStaticProperties(ButtonComponent, {
|
|
129
129
|
Text: ButtonText,
|
|
130
130
|
Icon: ButtonIcon
|
|
131
|
-
})
|
|
131
|
+
});
|
|
132
132
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
133
133
|
const isNested = useContext(ButtonNestingContext), didFinishSSR = useDidFinishSSR(), propsActive = useProps(propsIn), {
|
|
134
134
|
icon,
|
|
@@ -140,7 +140,8 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
140
140
|
separator,
|
|
141
141
|
noTextWrap,
|
|
142
142
|
fontFamily,
|
|
143
|
-
fontSize
|
|
143
|
+
fontSize,
|
|
144
|
+
...restProps
|
|
144
145
|
} = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), color = propsActive.color, iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon, getThemedIcon = useGetThemedIcon({
|
|
145
146
|
size: iconSize,
|
|
146
147
|
color
|
|
@@ -162,7 +163,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
162
163
|
// defaults to <a /> when accessibilityRole = link
|
|
163
164
|
// see https://github.com/tamagui/tamagui/issues/505
|
|
164
165
|
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
165
|
-
),
|
|
166
|
+
), props = {
|
|
166
167
|
size,
|
|
167
168
|
...propsIn.disabled && {
|
|
168
169
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -191,7 +192,6 @@ export {
|
|
|
191
192
|
ButtonContext,
|
|
192
193
|
ButtonFrame,
|
|
193
194
|
ButtonIcon,
|
|
194
|
-
ButtonNestingContext,
|
|
195
195
|
ButtonText,
|
|
196
196
|
buttonStaticConfig,
|
|
197
197
|
useButton
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,wBAAwB;AACjC,SAAS,sBAAsB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/button",
|
|
3
|
-
"version": "1.79.
|
|
3
|
+
"version": "1.79.11",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -29,17 +29,18 @@
|
|
|
29
29
|
}
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@tamagui/font-size": "1.79.
|
|
33
|
-
"@tamagui/get-button-sized": "1.79.
|
|
34
|
-
"@tamagui/helpers-tamagui": "1.79.
|
|
35
|
-
"@tamagui/
|
|
36
|
-
"@tamagui/
|
|
32
|
+
"@tamagui/font-size": "1.79.11",
|
|
33
|
+
"@tamagui/get-button-sized": "1.79.11",
|
|
34
|
+
"@tamagui/helpers-tamagui": "1.79.11",
|
|
35
|
+
"@tamagui/stacks": "1.79.11",
|
|
36
|
+
"@tamagui/text": "1.79.11",
|
|
37
|
+
"@tamagui/web": "1.79.11"
|
|
37
38
|
},
|
|
38
39
|
"peerDependencies": {
|
|
39
40
|
"react": "*"
|
|
40
41
|
},
|
|
41
42
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.79.
|
|
43
|
+
"@tamagui/build": "1.79.11",
|
|
43
44
|
"react": "^18.2.0",
|
|
44
45
|
"vitest": "^0.34.3"
|
|
45
46
|
},
|
package/src/Button.tsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getFontSize } from '@tamagui/font-size'
|
|
2
2
|
import { getButtonSized } from '@tamagui/get-button-sized'
|
|
3
3
|
import { useGetThemedIcon } from '@tamagui/helpers-tamagui'
|
|
4
|
-
import { ThemeableStack } from '@tamagui/stacks'
|
|
4
|
+
import { ButtonNestingContext, ThemeableStack } from '@tamagui/stacks'
|
|
5
5
|
import {
|
|
6
6
|
SizableText,
|
|
7
7
|
TextContextStyles,
|
|
@@ -21,7 +21,7 @@ import {
|
|
|
21
21
|
useProps,
|
|
22
22
|
withStaticProperties,
|
|
23
23
|
} from '@tamagui/web'
|
|
24
|
-
import { FunctionComponent,
|
|
24
|
+
import { FunctionComponent, useContext } from 'react'
|
|
25
25
|
|
|
26
26
|
type ButtonVariant = 'outlined'
|
|
27
27
|
|
|
@@ -219,8 +219,6 @@ const Button = withStaticProperties(ButtonComponent, {
|
|
|
219
219
|
Icon: ButtonIcon,
|
|
220
220
|
})
|
|
221
221
|
|
|
222
|
-
export const ButtonNestingContext = createContext(false)
|
|
223
|
-
|
|
224
222
|
/**
|
|
225
223
|
* @deprecated Instead of useButton, see the Button docs for the newer and much improved Advanced customization pattern: https://tamagui.dev/docs/components/button
|
|
226
224
|
*/
|
|
@@ -244,6 +242,7 @@ function useButton<Props extends ButtonProps>(
|
|
|
244
242
|
noTextWrap,
|
|
245
243
|
fontFamily,
|
|
246
244
|
fontSize,
|
|
245
|
+
...restProps
|
|
247
246
|
} = propsActive
|
|
248
247
|
|
|
249
248
|
const size = propsActive.size || (propsActive.unstyled ? undefined : '$true')
|
|
@@ -296,9 +295,6 @@ function useButton<Props extends ButtonProps>(
|
|
|
296
295
|
? 'a'
|
|
297
296
|
: undefined
|
|
298
297
|
|
|
299
|
-
// remove the ones we used here
|
|
300
|
-
const { iconAfter: _1, icon: _2, noTextWrap: _3, ...restProps } = propsIn
|
|
301
|
-
|
|
302
298
|
const props = {
|
|
303
299
|
size,
|
|
304
300
|
...(propsIn.disabled && {
|
package/types/Button.d.ts
CHANGED
|
@@ -1132,7 +1132,6 @@ declare const Button: import("@tamagui/web").ReactComponentWithRef<Omit<Omit<imp
|
|
|
1132
1132
|
scaleIcon?: number;
|
|
1133
1133
|
}) => any;
|
|
1134
1134
|
};
|
|
1135
|
-
export declare const ButtonNestingContext: import("react").Context<boolean>;
|
|
1136
1135
|
/**
|
|
1137
1136
|
* @deprecated Instead of useButton, see the Button docs for the newer and much improved Advanced customization pattern: https://tamagui.dev/docs/components/button
|
|
1138
1137
|
*/
|
package/types/Button.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":"AAIA,OAAO,EAEL,iBAAiB,EACjB,gBAAgB,EAEjB,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,cAAc,EACd,QAAQ,EACR,UAAU,EACV,cAAc,EAQf,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/base.js
DELETED
|
@@ -1,29 +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 base_exports = {};
|
|
20
|
-
__export(base_exports, {
|
|
21
|
-
Button: () => import_Button.Button
|
|
22
|
-
});
|
|
23
|
-
module.exports = __toCommonJS(base_exports);
|
|
24
|
-
var import_Button = require("./Button");
|
|
25
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
26
|
-
0 && (module.exports = {
|
|
27
|
-
Button
|
|
28
|
-
});
|
|
29
|
-
//# sourceMappingURL=base.js.map
|