@tamagui/button 1.80.4 → 1.81.0
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 +10 -10
- package/dist/cjs/Button.js.map +1 -1
- package/dist/cjs/Button.native.js +10 -10
- package/dist/cjs/Button.native.js.map +1 -1
- package/dist/esm/Button.js +10 -11
- package/dist/esm/Button.js.map +1 -1
- package/dist/esm/Button.native.js +10 -11
- package/dist/esm/Button.native.js.map +1 -1
- package/dist/jsx/Button.js +10 -11
- package/dist/jsx/Button.js.map +1 -1
- package/dist/jsx/Button.native.js +10 -11
- package/dist/jsx/Button.native.js.map +1 -1
- package/package.json +9 -9
- package/src/Button.tsx +12 -14
- package/types/Button.d.ts.map +1 -1
package/dist/cjs/Button.js
CHANGED
|
@@ -138,7 +138,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
138
138
|
Icon: ButtonIcon
|
|
139
139
|
});
|
|
140
140
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
141
|
-
const isNested = (0, import_react.useContext)(import_stacks.ButtonNestingContext),
|
|
141
|
+
const isNested = (0, import_react.useContext)(import_stacks.ButtonNestingContext), propsActive = (0, import_web.useProps)(propsIn), {
|
|
142
142
|
icon,
|
|
143
143
|
iconAfter,
|
|
144
144
|
space,
|
|
@@ -149,6 +149,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
149
149
|
noTextWrap,
|
|
150
150
|
fontFamily,
|
|
151
151
|
fontSize,
|
|
152
|
+
tag,
|
|
152
153
|
...restProps
|
|
153
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)({
|
|
154
155
|
size: iconSize,
|
|
@@ -167,11 +168,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
167
168
|
separator,
|
|
168
169
|
direction: propsActive.flexDirection === "column" || propsActive.flexDirection === "column-reverse" ? "vertical" : "horizontal",
|
|
169
170
|
children: [themedIcon, ...contents, themedIconAfter]
|
|
170
|
-
}),
|
|
171
|
-
// defaults to <a /> when accessibilityRole = link
|
|
172
|
-
// see https://github.com/tamagui/tamagui/issues/505
|
|
173
|
-
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
174
|
-
), props = {
|
|
171
|
+
}), props = {
|
|
175
172
|
size,
|
|
176
173
|
...propsIn.disabled && {
|
|
177
174
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -181,13 +178,16 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
181
178
|
borderColor: "$background"
|
|
182
179
|
}
|
|
183
180
|
},
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
181
|
+
// fixes SSR issue + DOM nesting issue of not allowing button in button
|
|
182
|
+
tag: tag ?? (isNested ? "span" : (
|
|
183
|
+
// defaults to <a /> when accessibilityRole = link
|
|
184
|
+
// see https://github.com/tamagui/tamagui/issues/505
|
|
185
|
+
propsActive.accessibilityRole === "link" ? "a" : "button"
|
|
186
|
+
)),
|
|
187
187
|
...restProps,
|
|
188
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
|
-
disableClassName:
|
|
190
|
+
disableClassName: !0
|
|
191
191
|
};
|
|
192
192
|
return {
|
|
193
193
|
spaceSize,
|
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": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
|
@@ -139,7 +139,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
|
|
|
139
139
|
Icon: ButtonIcon
|
|
140
140
|
});
|
|
141
141
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
142
|
-
const isNested = (0, import_react.useContext)(import_stacks.ButtonNestingContext),
|
|
142
|
+
const isNested = (0, import_react.useContext)(import_stacks.ButtonNestingContext), propsActive = (0, import_web.useProps)(propsIn), {
|
|
143
143
|
icon,
|
|
144
144
|
iconAfter,
|
|
145
145
|
space,
|
|
@@ -150,6 +150,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
150
150
|
noTextWrap,
|
|
151
151
|
fontFamily,
|
|
152
152
|
fontSize,
|
|
153
|
+
tag,
|
|
153
154
|
...restProps
|
|
154
155
|
} = 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
156
|
size: iconSize,
|
|
@@ -168,11 +169,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
168
169
|
separator,
|
|
169
170
|
direction: propsActive.flexDirection === "column" || propsActive.flexDirection === "column-reverse" ? "vertical" : "horizontal",
|
|
170
171
|
children: [themedIcon, ...contents, themedIconAfter]
|
|
171
|
-
}),
|
|
172
|
-
// defaults to <a /> when accessibilityRole = link
|
|
173
|
-
// see https://github.com/tamagui/tamagui/issues/505
|
|
174
|
-
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
175
|
-
), props = {
|
|
172
|
+
}), props = {
|
|
176
173
|
size,
|
|
177
174
|
...propsIn.disabled && {
|
|
178
175
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -182,13 +179,16 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
182
179
|
borderColor: "$background"
|
|
183
180
|
}
|
|
184
181
|
},
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
182
|
+
// fixes SSR issue + DOM nesting issue of not allowing button in button
|
|
183
|
+
tag: tag ?? (isNested ? "span" : (
|
|
184
|
+
// defaults to <a /> when accessibilityRole = link
|
|
185
|
+
// see https://github.com/tamagui/tamagui/issues/505
|
|
186
|
+
propsActive.accessibilityRole === "link" ? "a" : "button"
|
|
187
|
+
)),
|
|
188
188
|
...restProps,
|
|
189
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
|
-
disableClassName:
|
|
191
|
+
disableClassName: !0
|
|
192
192
|
};
|
|
193
193
|
return {
|
|
194
194
|
spaceSize,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Button.tsx"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
package/dist/esm/Button.js
CHANGED
|
@@ -12,7 +12,6 @@ import {
|
|
|
12
12
|
getVariableValue,
|
|
13
13
|
spacedChildren,
|
|
14
14
|
styled,
|
|
15
|
-
useDidFinishSSR,
|
|
16
15
|
useProps
|
|
17
16
|
} from "@tamagui/web";
|
|
18
17
|
import { useContext } from "react";
|
|
@@ -131,7 +130,7 @@ const ButtonContext = createStyledContext({
|
|
|
131
130
|
Icon: ButtonIcon
|
|
132
131
|
});
|
|
133
132
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
134
|
-
const isNested = useContext(ButtonNestingContext),
|
|
133
|
+
const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
|
|
135
134
|
icon,
|
|
136
135
|
iconAfter,
|
|
137
136
|
space,
|
|
@@ -142,6 +141,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
142
141
|
noTextWrap,
|
|
143
142
|
fontFamily,
|
|
144
143
|
fontSize,
|
|
144
|
+
tag,
|
|
145
145
|
...restProps
|
|
146
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({
|
|
147
147
|
size: iconSize,
|
|
@@ -160,11 +160,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
160
160
|
separator,
|
|
161
161
|
direction: propsActive.flexDirection === "column" || propsActive.flexDirection === "column-reverse" ? "vertical" : "horizontal",
|
|
162
162
|
children: [themedIcon, ...contents, themedIconAfter]
|
|
163
|
-
}),
|
|
164
|
-
// defaults to <a /> when accessibilityRole = link
|
|
165
|
-
// see https://github.com/tamagui/tamagui/issues/505
|
|
166
|
-
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
167
|
-
), props = {
|
|
163
|
+
}), props = {
|
|
168
164
|
size,
|
|
169
165
|
...propsIn.disabled && {
|
|
170
166
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -174,13 +170,16 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
174
170
|
borderColor: "$background"
|
|
175
171
|
}
|
|
176
172
|
},
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
173
|
+
// fixes SSR issue + DOM nesting issue of not allowing button in button
|
|
174
|
+
tag: tag ?? (isNested ? "span" : (
|
|
175
|
+
// defaults to <a /> when accessibilityRole = link
|
|
176
|
+
// see https://github.com/tamagui/tamagui/issues/505
|
|
177
|
+
propsActive.accessibilityRole === "link" ? "a" : "button"
|
|
178
|
+
)),
|
|
180
179
|
...restProps,
|
|
181
180
|
children: /* @__PURE__ */ jsx(ButtonNestingContext.Provider, { value: !0, children: inner }),
|
|
182
181
|
// forces it to be a runtime pressStyle so it passes through context text colors
|
|
183
|
-
disableClassName:
|
|
182
|
+
disableClassName: !0
|
|
184
183
|
};
|
|
185
184
|
return {
|
|
186
185
|
spaceSize,
|
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,4BAA4B;AACrC,SAAS,wBAAwB;AACjC,SAAS,sBAAsB,sBAAsB;AACrD;AAAA,EACE;AAAA,EAGA;AAAA,OACK;AACP;AAAA,EAKE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
|
@@ -12,7 +12,6 @@ import {
|
|
|
12
12
|
getVariableValue,
|
|
13
13
|
spacedChildren,
|
|
14
14
|
styled,
|
|
15
|
-
useDidFinishSSR,
|
|
16
15
|
useProps
|
|
17
16
|
} from "@tamagui/web";
|
|
18
17
|
import { useContext } from "react";
|
|
@@ -131,7 +130,7 @@ const ButtonContext = createStyledContext({
|
|
|
131
130
|
Icon: ButtonIcon
|
|
132
131
|
});
|
|
133
132
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
134
|
-
const isNested = useContext(ButtonNestingContext),
|
|
133
|
+
const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
|
|
135
134
|
icon,
|
|
136
135
|
iconAfter,
|
|
137
136
|
space,
|
|
@@ -142,6 +141,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
142
141
|
noTextWrap,
|
|
143
142
|
fontFamily,
|
|
144
143
|
fontSize,
|
|
144
|
+
tag,
|
|
145
145
|
...restProps
|
|
146
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({
|
|
147
147
|
size: iconSize,
|
|
@@ -160,11 +160,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
160
160
|
separator,
|
|
161
161
|
direction: propsActive.flexDirection === "column" || propsActive.flexDirection === "column-reverse" ? "vertical" : "horizontal",
|
|
162
162
|
children: [themedIcon, ...contents, themedIconAfter]
|
|
163
|
-
}),
|
|
164
|
-
// defaults to <a /> when accessibilityRole = link
|
|
165
|
-
// see https://github.com/tamagui/tamagui/issues/505
|
|
166
|
-
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
167
|
-
), props = {
|
|
163
|
+
}), props = {
|
|
168
164
|
size,
|
|
169
165
|
...propsIn.disabled && {
|
|
170
166
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -174,13 +170,16 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
174
170
|
borderColor: "$background"
|
|
175
171
|
}
|
|
176
172
|
},
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
173
|
+
// fixes SSR issue + DOM nesting issue of not allowing button in button
|
|
174
|
+
tag: tag ?? (isNested ? "span" : (
|
|
175
|
+
// defaults to <a /> when accessibilityRole = link
|
|
176
|
+
// see https://github.com/tamagui/tamagui/issues/505
|
|
177
|
+
propsActive.accessibilityRole === "link" ? "a" : "button"
|
|
178
|
+
)),
|
|
180
179
|
...restProps,
|
|
181
180
|
children: /* @__PURE__ */ jsx(ButtonNestingContext.Provider, { value: !0, children: inner }),
|
|
182
181
|
// forces it to be a runtime pressStyle so it passes through context text colors
|
|
183
|
-
disableClassName:
|
|
182
|
+
disableClassName: !0
|
|
184
183
|
};
|
|
185
184
|
return {
|
|
186
185
|
spaceSize,
|
|
@@ -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,4BAA4B;AACrC,SAAS,wBAAwB;AACjC,SAAS,sBAAsB,sBAAsB;AACrD;AAAA,EACE;AAAA,EAGA;AAAA,OACK;AACP;AAAA,EAKE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
package/dist/jsx/Button.js
CHANGED
|
@@ -12,7 +12,6 @@ import {
|
|
|
12
12
|
getVariableValue,
|
|
13
13
|
spacedChildren,
|
|
14
14
|
styled,
|
|
15
|
-
useDidFinishSSR,
|
|
16
15
|
useProps
|
|
17
16
|
} from "@tamagui/web";
|
|
18
17
|
import { useContext } from "react";
|
|
@@ -130,7 +129,7 @@ const ButtonContext = createStyledContext({
|
|
|
130
129
|
Icon: ButtonIcon
|
|
131
130
|
});
|
|
132
131
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
133
|
-
const isNested = useContext(ButtonNestingContext),
|
|
132
|
+
const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
|
|
134
133
|
icon,
|
|
135
134
|
iconAfter,
|
|
136
135
|
space,
|
|
@@ -141,6 +140,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
141
140
|
noTextWrap,
|
|
142
141
|
fontFamily,
|
|
143
142
|
fontSize,
|
|
143
|
+
tag,
|
|
144
144
|
...restProps
|
|
145
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({
|
|
146
146
|
size: iconSize,
|
|
@@ -159,11 +159,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
159
159
|
separator,
|
|
160
160
|
direction: propsActive.flexDirection === "column" || propsActive.flexDirection === "column-reverse" ? "vertical" : "horizontal",
|
|
161
161
|
children: [themedIcon, ...contents, themedIconAfter]
|
|
162
|
-
}),
|
|
163
|
-
// defaults to <a /> when accessibilityRole = link
|
|
164
|
-
// see https://github.com/tamagui/tamagui/issues/505
|
|
165
|
-
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
166
|
-
), props = {
|
|
162
|
+
}), props = {
|
|
167
163
|
size,
|
|
168
164
|
...propsIn.disabled && {
|
|
169
165
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -173,13 +169,16 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
173
169
|
borderColor: "$background"
|
|
174
170
|
}
|
|
175
171
|
},
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
172
|
+
// fixes SSR issue + DOM nesting issue of not allowing button in button
|
|
173
|
+
tag: tag ?? (isNested ? "span" : (
|
|
174
|
+
// defaults to <a /> when accessibilityRole = link
|
|
175
|
+
// see https://github.com/tamagui/tamagui/issues/505
|
|
176
|
+
propsActive.accessibilityRole === "link" ? "a" : "button"
|
|
177
|
+
)),
|
|
179
178
|
...restProps,
|
|
180
179
|
children: <ButtonNestingContext.Provider value={!0}>{inner}</ButtonNestingContext.Provider>,
|
|
181
180
|
// forces it to be a runtime pressStyle so it passes through context text colors
|
|
182
|
-
disableClassName:
|
|
181
|
+
disableClassName: !0
|
|
183
182
|
};
|
|
184
183
|
return {
|
|
185
184
|
spaceSize,
|
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,4BAA4B;AACrC,SAAS,wBAAwB;AACjC,SAAS,sBAAsB,sBAAsB;AACrD;AAAA,EACE;AAAA,EAGA;AAAA,OACK;AACP;AAAA,EAKE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Button"]
|
|
6
6
|
}
|
|
@@ -12,7 +12,6 @@ import {
|
|
|
12
12
|
getVariableValue,
|
|
13
13
|
spacedChildren,
|
|
14
14
|
styled,
|
|
15
|
-
useDidFinishSSR,
|
|
16
15
|
useProps
|
|
17
16
|
} from "@tamagui/web";
|
|
18
17
|
import { useContext } from "react";
|
|
@@ -130,7 +129,7 @@ const ButtonContext = createStyledContext({
|
|
|
130
129
|
Icon: ButtonIcon
|
|
131
130
|
});
|
|
132
131
|
function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text: Button2.Text }) {
|
|
133
|
-
const isNested = useContext(ButtonNestingContext),
|
|
132
|
+
const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
|
|
134
133
|
icon,
|
|
135
134
|
iconAfter,
|
|
136
135
|
space,
|
|
@@ -141,6 +140,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
141
140
|
noTextWrap,
|
|
142
141
|
fontFamily,
|
|
143
142
|
fontSize,
|
|
143
|
+
tag,
|
|
144
144
|
...restProps
|
|
145
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({
|
|
146
146
|
size: iconSize,
|
|
@@ -159,11 +159,7 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
159
159
|
separator,
|
|
160
160
|
direction: propsActive.flexDirection === "column" || propsActive.flexDirection === "column-reverse" ? "vertical" : "horizontal",
|
|
161
161
|
children: [themedIcon, ...contents, themedIconAfter]
|
|
162
|
-
}),
|
|
163
|
-
// defaults to <a /> when accessibilityRole = link
|
|
164
|
-
// see https://github.com/tamagui/tamagui/issues/505
|
|
165
|
-
propsActive.accessibilityRole === "link" ? "a" : void 0
|
|
166
|
-
), props = {
|
|
162
|
+
}), props = {
|
|
167
163
|
size,
|
|
168
164
|
...propsIn.disabled && {
|
|
169
165
|
// in rnw - false still has keyboard tabIndex, undefined = not actually focusable
|
|
@@ -173,13 +169,16 @@ function useButton({ textProps, ...propsIn }, { Text = Button2.Text } = { Text:
|
|
|
173
169
|
borderColor: "$background"
|
|
174
170
|
}
|
|
175
171
|
},
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
172
|
+
// fixes SSR issue + DOM nesting issue of not allowing button in button
|
|
173
|
+
tag: tag ?? (isNested ? "span" : (
|
|
174
|
+
// defaults to <a /> when accessibilityRole = link
|
|
175
|
+
// see https://github.com/tamagui/tamagui/issues/505
|
|
176
|
+
propsActive.accessibilityRole === "link" ? "a" : "button"
|
|
177
|
+
)),
|
|
179
178
|
...restProps,
|
|
180
179
|
children: <ButtonNestingContext.Provider value={!0}>{inner}</ButtonNestingContext.Provider>,
|
|
181
180
|
// forces it to be a runtime pressStyle so it passes through context text colors
|
|
182
|
-
disableClassName:
|
|
181
|
+
disableClassName: !0
|
|
183
182
|
};
|
|
184
183
|
return {
|
|
185
184
|
spaceSize,
|
|
@@ -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,4BAA4B;AACrC,SAAS,wBAAwB;AACjC,SAAS,sBAAsB,sBAAsB;AACrD;AAAA,EACE;AAAA,EAGA;AAAA,OACK;AACP;AAAA,EAKE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,
|
|
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.
|
|
3
|
+
"version": "1.81.0",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -29,19 +29,19 @@
|
|
|
29
29
|
}
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@tamagui/font-size": "1.
|
|
33
|
-
"@tamagui/get-button-sized": "1.
|
|
34
|
-
"@tamagui/helpers": "1.
|
|
35
|
-
"@tamagui/helpers-tamagui": "1.
|
|
36
|
-
"@tamagui/stacks": "1.
|
|
37
|
-
"@tamagui/text": "1.
|
|
38
|
-
"@tamagui/web": "1.
|
|
32
|
+
"@tamagui/font-size": "1.81.0",
|
|
33
|
+
"@tamagui/get-button-sized": "1.81.0",
|
|
34
|
+
"@tamagui/helpers": "1.81.0",
|
|
35
|
+
"@tamagui/helpers-tamagui": "1.81.0",
|
|
36
|
+
"@tamagui/stacks": "1.81.0",
|
|
37
|
+
"@tamagui/text": "1.81.0",
|
|
38
|
+
"@tamagui/web": "1.81.0"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
41
|
"react": "*"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
|
-
"@tamagui/build": "1.
|
|
44
|
+
"@tamagui/build": "1.81.0",
|
|
45
45
|
"react": "^18.2.0",
|
|
46
46
|
"vitest": "^0.34.3"
|
|
47
47
|
},
|
package/src/Button.tsx
CHANGED
|
@@ -227,7 +227,6 @@ function useButton<Props extends ButtonProps>(
|
|
|
227
227
|
{ Text = Button.Text }: { Text: any } = { Text: Button.Text }
|
|
228
228
|
) {
|
|
229
229
|
const isNested = useContext(ButtonNestingContext)
|
|
230
|
-
const didFinishSSR = useDidFinishSSR()
|
|
231
230
|
const propsActive = useProps(propsIn) as any as ButtonProps
|
|
232
231
|
|
|
233
232
|
// careful not to destructure and re-order props, order is important
|
|
@@ -242,6 +241,7 @@ function useButton<Props extends ButtonProps>(
|
|
|
242
241
|
noTextWrap,
|
|
243
242
|
fontFamily,
|
|
244
243
|
fontSize,
|
|
244
|
+
tag,
|
|
245
245
|
...restProps
|
|
246
246
|
} = propsActive
|
|
247
247
|
|
|
@@ -286,15 +286,6 @@ function useButton<Props extends ButtonProps>(
|
|
|
286
286
|
children: [themedIcon, ...contents, themedIconAfter],
|
|
287
287
|
})
|
|
288
288
|
|
|
289
|
-
// fixes SSR issue + DOM nesting issue of not allowing button in button
|
|
290
|
-
const tag = isNested
|
|
291
|
-
? 'span'
|
|
292
|
-
: // defaults to <a /> when accessibilityRole = link
|
|
293
|
-
// see https://github.com/tamagui/tamagui/issues/505
|
|
294
|
-
propsActive.accessibilityRole === 'link'
|
|
295
|
-
? 'a'
|
|
296
|
-
: undefined
|
|
297
|
-
|
|
298
289
|
const props = {
|
|
299
290
|
size,
|
|
300
291
|
...(propsIn.disabled && {
|
|
@@ -305,15 +296,22 @@ function useButton<Props extends ButtonProps>(
|
|
|
305
296
|
borderColor: '$background',
|
|
306
297
|
},
|
|
307
298
|
}),
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
299
|
+
// fixes SSR issue + DOM nesting issue of not allowing button in button
|
|
300
|
+
tag:
|
|
301
|
+
tag ??
|
|
302
|
+
(isNested
|
|
303
|
+
? 'span'
|
|
304
|
+
: // defaults to <a /> when accessibilityRole = link
|
|
305
|
+
// see https://github.com/tamagui/tamagui/issues/505
|
|
306
|
+
propsActive.accessibilityRole === 'link'
|
|
307
|
+
? 'a'
|
|
308
|
+
: 'button'),
|
|
311
309
|
...restProps,
|
|
312
310
|
children: (
|
|
313
311
|
<ButtonNestingContext.Provider value={true}>{inner}</ButtonNestingContext.Provider>
|
|
314
312
|
),
|
|
315
313
|
// forces it to be a runtime pressStyle so it passes through context text colors
|
|
316
|
-
disableClassName:
|
|
314
|
+
disableClassName: true,
|
|
317
315
|
} as Props
|
|
318
316
|
|
|
319
317
|
return {
|
package/types/Button.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":"AAKA,OAAO,EAEL,iBAAiB,EACjB,gBAAgB,EAEjB,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,cAAc,EACd,QAAQ,EACR,UAAU,EACV,cAAc,EAOf,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,iBAAiB,EAAc,MAAM,OAAO,CAAA;AAIrD,eAAO,MAAM,aAAa;UAGd,UAAU;;GAiBpB,CAAA;AAEF,KAAK,eAAe,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AACxD,KAAK,QAAQ,GAAG,GAAG,CAAC,OAAO,GAAG,iBAAiB,CAAC,eAAe,CAAC,GAAG,IAAI,CAAA;AAEvE,KAAK,gBAAgB,GAAG,gBAAgB,GACtC,cAAc,GAAG;IACf;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf;;OAEG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAA;IACpB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IAC5B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAEH,KAAK,WAAW,GAAG,gBAAgB,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAA;AAIlE,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmEf,CAAA;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqBd,CAAA;AAEF,QAAA,MAAM,UAAU,UAAW;IAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,QAU3E,CAAA;AAUD;;GAEG;AACH,QAAA,MAAM,kBAAkB;;CAavB,CAAA;AAED,QAAA,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAlKR;;OAEG;;IAEH;;OAEG;;IAEH;;;;OAIG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAxBH;;WAEG;;QAEH;;WAEG;;QAEH;;;;WAIG;;QAEH;;WAEG;;QAEH;;WAEG;;QAEH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAxBH;;WAEG;;QAEH;;WAEG;;QAEH;;;;WAIG;;QAEH;;WAEG;;QAEH;;WAEG;;QAEH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAxBH;;WAEG;;QAEH;;WAEG;;QAEH;;;;WAIG;;QAEH;;WAEG;;QAEH;;WAEG;;QAEH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAoGoB;QAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;CAyC1E,CAAA;AAEF;;GAEG;AACH,iBAAS,SAAS,CAAC,KAAK,SAAS,WAAW,EAC1C,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,EAAE,KAAK,EAChC,EAAE,IAAkB,EAAE,GAAE;IAAE,IAAI,EAAE,GAAG,CAAA;CAA0B;;;;
|
|
1
|
+
{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":"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"}
|