@tamagui/button 1.74.7 → 1.74.8

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.
Files changed (15) hide show
  1. package/dist/cjs/Button.js +10 -12
  2. package/dist/cjs/Button.js.map +1 -1
  3. package/dist/cjs/Button.native.js +10 -12
  4. package/dist/cjs/Button.native.js.map +1 -1
  5. package/dist/esm/Button.js +11 -12
  6. package/dist/esm/Button.js.map +1 -1
  7. package/dist/esm/Button.native.js +11 -12
  8. package/dist/esm/Button.native.js.map +1 -1
  9. package/dist/jsx/Button.js +11 -12
  10. package/dist/jsx/Button.js.map +1 -1
  11. package/dist/jsx/Button.native.js +11 -12
  12. package/dist/jsx/Button.native.js.map +1 -1
  13. package/package.json +7 -7
  14. package/src/Button.tsx +13 -12
  15. package/types/Button.d.ts.map +1 -1
package/dist/cjs/Button.js CHANGED
@@ -139,8 +139,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
139
139
  Icon: ButtonIcon
140
140
  }), ButtonNestingContext = (0, import_react.createContext)(!1);
141
141
  function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
142
- const isNested = (0, import_react.useContext)(ButtonNestingContext), propsActive = (0, import_web.useProps)(propsIn), {
143
- children,
142
+ const isNested = (0, import_react.useContext)(ButtonNestingContext), didFinishSSR = (0, import_web.useDidFinishSSR)(), propsActive = (0, import_web.useProps)(propsIn), {
144
143
  icon,
145
144
  iconAfter,
146
145
  space,
@@ -150,15 +149,14 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
150
149
  separator,
151
150
  noTextWrap,
152
151
  fontFamily,
153
- fontSize,
154
- ...rest
152
+ fontSize
155
153
  } = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), iconSize = (typeof size == "number" ? size * 0.5 : (0, import_font_size.getFontSize)(size)) * scaleIcon, getThemedIcon = (0, import_helpers_tamagui.useGetThemedIcon)({
156
154
  size: iconSize,
157
155
  color: propsActive.color
158
- }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = propsActive.space ?? (0, import_web.getVariableValue)(iconSize) * scaleSpace, contents = noTextWrap ? [children] : (0, import_text.wrapChildrenInText)(
156
+ }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ?? (0, import_web.getVariableValue)(iconSize) * scaleSpace, contents = noTextWrap ? [propsIn.children] : (0, import_text.wrapChildrenInText)(
159
157
  Text,
160
- { children, fontFamily, fontSize },
161
- Text === ButtonText && propsIn.unstyled !== !0 ? {
158
+ { children: propsIn.children, fontFamily, fontSize },
159
+ Text === ButtonText && propsActive.unstyled !== !0 ? {
162
160
  unstyled: !1,
163
161
  size
164
162
  } : void 0
@@ -172,10 +170,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
172
170
  }), tag = isNested ? "span" : (
173
171
  // defaults to <a /> when accessibilityRole = link
174
172
  // see https://github.com/tamagui/tamagui/issues/505
175
- propsIn.accessibilityRole === "link" ? "a" : void 0
176
- ), props = {
173
+ propsActive.accessibilityRole === "link" ? "a" : void 0
174
+ ), { iconAfter: _1, icon: _2, noTextWrap: _3, ...restProps } = propsIn, props = {
177
175
  size,
178
- ...propsActive.disabled && {
176
+ ...propsIn.disabled && {
179
177
  // in rnw - false still has keyboard tabIndex, undefined = not actually focusable
180
178
  focusable: void 0,
181
179
  // even with tabIndex unset, it will keep focusStyle on web so disable it here
@@ -186,10 +184,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
186
184
  ...tag && {
187
185
  tag
188
186
  },
189
- ...rest,
187
+ ...restProps,
190
188
  children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ButtonNestingContext.Provider, { value: !0, children: inner }),
191
189
  // forces it to be a runtime pressStyle so it passes through context text colors
192
- disableClassName: !0
190
+ disableClassName: didFinishSSR
193
191
  };
194
192
  return {
195
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": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA,gBAAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA4B,+BAC5B,0BAA+B,sCAC/B,yBAAiC,qCACjC,gBAA+B,4BAC/B,cAKO,0BACP,aAYO,yBACP,eAA6D,kBAoKpD;AAlKF,MAAM,oBAAgB,gCAM3B;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;AACb,CAAC,GAoCK,cAAc,UAEd,kBAAc,mBAAO,8BAAgB;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;AAAA,EACZ;AACF,CAAC,GAEK,iBAAa,mBAAO,yBAAa;AAAA,EACrC,MAAM;AAAA;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;AAAA,EACZ;AACF,CAAC,GAEK,aAAa,CAAC,UAA6D;AAC/E,QAAM,EAAE,UAAU,YAAY,EAAE,IAAI,OAC9B,EAAE,MAAM,MAAM,QAAI,yBAAW,aAAa,GAE1C,YACH,OAAO,QAAS,WAAW,OAAO,UAAM,8BAAY,IAAsB,KAC3E;AAGF,aADsB,yCAAiB,EAAE,MAAM,UAAU,MAAoB,CAAC,EACzD,QAAQ;AAC/B,GAEM,kBAAkB,YAAY,UAAuB,SAAgB,OAAO,KAAK;AACrF,QAAM,EAAE,OAAO,YAAY,IAAI,UAAU,KAAK;AAC9C,SAAO,4CAAC,eAAa,GAAG,aAAa,KAAU;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,cAAS,iCAAqB,iBAAiB;AAAA,EACnD,MAAM;AAAA,EACN,MAAM;AACR,CAAC,GAEY,2BAAuB,4BAAc,EAAK;AAKvD,SAAS,UACP,SACA,EAAE,OAAOA,QAAO,KAAK,IAAmB,EAAE,MAAMA,QAAO,KAAK,GAC5D;AACA,QAAM,eAAW,yBAAW,oBAAoB,GAC1C,mBAAe,4BAAgB,GAC/B,kBAAc,qBAAS,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,EACF,IAAI,aAEE,OAAO,YAAY,SAAS,YAAY,WAAW,SAAY,UAE/D,YACH,OAAO,QAAS,WAAW,OAAO,UAAM,8BAAY,IAAsB,KAC3E,WAEI,oBAAgB,yCAAiB;AAAA,IACrC,MAAM;AAAA,IACN,OAAO,YAAY;AAAA,EACrB,CAAC,GACK,CAAC,YAAY,eAAe,IAAI,CAAC,MAAM,SAAS,EAAE,IAAI,aAAa,GACnE,YAAY,aAAS,6BAAiB,QAAQ,IAAI,YAClD,WAAW,aACb,CAAC,QAAQ,QAAQ,QACjB;AAAA,IACE;AAAA,IACA,EAAE,UAAU,QAAQ,UAAU,YAAY,SAAS;AAAA,IACnD,SAAS,cAAc,YAAY,aAAa,KAC5C;AAAA,MACE,UAAU;AAAA,MACV;AAAA,IACF,IACA;AAAA,EACN,GAEE,YAAQ,2BAAe;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,KAGE,EAAE,WAAW,IAAI,MAAM,IAAI,YAAY,IAAI,GAAG,UAAU,IAAI,SAE5D,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,4CAAC,qBAAqB,UAArB,EAA8B,OAAO,IAAO,iBAAM;AAAA;AAAA,IAGrD,kBAAkB;AAAA,EACpB;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
5
5
  "names": ["Button"]
6
6
  }
package/dist/cjs/Button.native.js CHANGED
@@ -140,8 +140,7 @@ const ButtonContext = (0, import_web.createStyledContext)({
140
140
  Icon: ButtonIcon
141
141
  }), ButtonNestingContext = (0, import_react.createContext)(!1);
142
142
  function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
143
- const isNested = (0, import_react.useContext)(ButtonNestingContext), propsActive = (0, import_web.useProps)(propsIn), {
144
- children,
143
+ const isNested = (0, import_react.useContext)(ButtonNestingContext), didFinishSSR = (0, import_web.useDidFinishSSR)(), propsActive = (0, import_web.useProps)(propsIn), {
145
144
  icon,
146
145
  iconAfter,
147
146
  space,
@@ -151,15 +150,14 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
151
150
  separator,
152
151
  noTextWrap,
153
152
  fontFamily,
154
- fontSize,
155
- ...rest
153
+ fontSize
156
154
  } = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), iconSize = (typeof size == "number" ? size * 0.5 : (0, import_font_size.getFontSize)(size)) * scaleIcon, getThemedIcon = (0, import_helpers_tamagui.useGetThemedIcon)({
157
155
  size: iconSize,
158
156
  color: propsActive.color
159
- }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = propsActive.space ?? (0, import_web.getVariableValue)(iconSize) * scaleSpace, contents = noTextWrap ? [children] : (0, import_text.wrapChildrenInText)(
157
+ }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ?? (0, import_web.getVariableValue)(iconSize) * scaleSpace, contents = noTextWrap ? [propsIn.children] : (0, import_text.wrapChildrenInText)(
160
158
  Text,
161
- { children, fontFamily, fontSize },
162
- Text === ButtonText && propsIn.unstyled !== !0 ? {
159
+ { children: propsIn.children, fontFamily, fontSize },
160
+ Text === ButtonText && propsActive.unstyled !== !0 ? {
163
161
  unstyled: !1,
164
162
  size
165
163
  } : void 0
@@ -173,10 +171,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
173
171
  }), tag = isNested ? "span" : (
174
172
  // defaults to <a /> when accessibilityRole = link
175
173
  // see https://github.com/tamagui/tamagui/issues/505
176
- propsIn.accessibilityRole === "link" ? "a" : void 0
177
- ), props = {
174
+ propsActive.accessibilityRole === "link" ? "a" : void 0
175
+ ), { iconAfter: _1, icon: _2, noTextWrap: _3, ...restProps } = propsIn, props = {
178
176
  size,
179
- ...propsActive.disabled && {
177
+ ...propsIn.disabled && {
180
178
  // in rnw - false still has keyboard tabIndex, undefined = not actually focusable
181
179
  focusable: void 0,
182
180
  // even with tabIndex unset, it will keep focusStyle on web so disable it here
@@ -187,10 +185,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
187
185
  ...tag && {
188
186
  tag
189
187
  },
190
- ...rest,
188
+ ...restProps,
191
189
  children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ButtonNestingContext.Provider, { value: !0, children: inner }),
192
190
  // forces it to be a runtime pressStyle so it passes through context text colors
193
- disableClassName: !0
191
+ disableClassName: didFinishSSR
194
192
  };
195
193
  return {
196
194
  spaceSize,
package/dist/cjs/Button.native.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
  }
package/dist/esm/Button.js CHANGED
@@ -11,6 +11,7 @@ import {
11
11
  getVariableValue,
12
12
  spacedChildren,
13
13
  styled,
14
+ useDidFinishSSR,
14
15
  useProps,
15
16
  withStaticProperties
16
17
  } from "@tamagui/web";
@@ -130,8 +131,7 @@ const ButtonContext = createStyledContext({
130
131
  Icon: ButtonIcon
131
132
  }), ButtonNestingContext = createContext(!1);
132
133
  function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
133
- const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
134
- children,
134
+ const isNested = useContext(ButtonNestingContext), didFinishSSR = useDidFinishSSR(), propsActive = useProps(propsIn), {
135
135
  icon,
136
136
  iconAfter,
137
137
  space,
@@ -141,15 +141,14 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
141
141
  separator,
142
142
  noTextWrap,
143
143
  fontFamily,
144
- fontSize,
145
- ...rest
144
+ fontSize
146
145
  } = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon, getThemedIcon = useGetThemedIcon({
147
146
  size: iconSize,
148
147
  color: propsActive.color
149
- }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = propsActive.space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [children] : wrapChildrenInText(
148
+ }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [propsIn.children] : wrapChildrenInText(
150
149
  Text,
151
- { children, fontFamily, fontSize },
152
- Text === ButtonText && propsIn.unstyled !== !0 ? {
150
+ { children: propsIn.children, fontFamily, fontSize },
151
+ Text === ButtonText && propsActive.unstyled !== !0 ? {
153
152
  unstyled: !1,
154
153
  size
155
154
  } : void 0
@@ -163,10 +162,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
163
162
  }), tag = isNested ? "span" : (
164
163
  // defaults to <a /> when accessibilityRole = link
165
164
  // see https://github.com/tamagui/tamagui/issues/505
166
- propsIn.accessibilityRole === "link" ? "a" : void 0
167
- ), props = {
165
+ propsActive.accessibilityRole === "link" ? "a" : void 0
166
+ ), { iconAfter: _1, icon: _2, noTextWrap: _3, ...restProps } = propsIn, props = {
168
167
  size,
169
- ...propsActive.disabled && {
168
+ ...propsIn.disabled && {
170
169
  // in rnw - false still has keyboard tabIndex, undefined = not actually focusable
171
170
  focusable: void 0,
172
171
  // even with tabIndex unset, it will keep focusStyle on web so disable it here
@@ -177,10 +176,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
177
176
  ...tag && {
178
177
  tag
179
178
  },
180
- ...rest,
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: !0
182
+ disableClassName: didFinishSSR
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": "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",
4
+ "mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,wBAAwB;AACjC,SAAS,sBAAsB;AAC/B;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,eAAe,kBAAkB;AAoKpD;AAlKF,MAAM,gBAAgB,oBAM3B;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;AACb,CAAC,GAoCK,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;AAAA,EACZ;AACF,CAAC,GAEK,aAAa,OAAO,aAAa;AAAA,EACrC,MAAM;AAAA;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;AAAA,EACZ;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,UAAuB,SAAgB,OAAO,KAAK;AACrF,QAAM,EAAE,OAAO,YAAY,IAAI,UAAU,KAAK;AAC9C,SAAO,oBAAC,eAAa,GAAG,aAAa,KAAU;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,GAEY,uBAAuB,cAAc,EAAK;AAKvD,SAAS,UACP,SACA,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,EACF,IAAI,aAEE,OAAO,YAAY,SAAS,YAAY,WAAW,SAAY,UAE/D,YACH,OAAO,QAAS,WAAW,OAAO,MAAM,YAAY,IAAsB,KAC3E,WAEI,gBAAgB,iBAAiB;AAAA,IACrC,MAAM;AAAA,IACN,OAAO,YAAY;AAAA,EACrB,CAAC,GACK,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,SAAS;AAAA,IACnD,SAAS,cAAc,YAAY,aAAa,KAC5C;AAAA,MACE,UAAU;AAAA,MACV;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,KAGE,EAAE,WAAW,IAAI,MAAM,IAAI,YAAY,IAAI,GAAG,UAAU,IAAI,SAE5D,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,oBAAC,qBAAqB,UAArB,EAA8B,OAAO,IAAO,iBAAM;AAAA;AAAA,IAGrD,kBAAkB;AAAA,EACpB;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
5
5
  "names": ["Button"]
6
6
  }
package/dist/esm/Button.native.js CHANGED
@@ -11,6 +11,7 @@ import {
11
11
  getVariableValue,
12
12
  spacedChildren,
13
13
  styled,
14
+ useDidFinishSSR,
14
15
  useProps,
15
16
  withStaticProperties
16
17
  } from "@tamagui/web";
@@ -130,8 +131,7 @@ const ButtonContext = createStyledContext({
130
131
  Icon: ButtonIcon
131
132
  }), ButtonNestingContext = createContext(!1);
132
133
  function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
133
- const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
134
- children,
134
+ const isNested = useContext(ButtonNestingContext), didFinishSSR = useDidFinishSSR(), propsActive = useProps(propsIn), {
135
135
  icon,
136
136
  iconAfter,
137
137
  space,
@@ -141,15 +141,14 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
141
141
  separator,
142
142
  noTextWrap,
143
143
  fontFamily,
144
- fontSize,
145
- ...rest
144
+ fontSize
146
145
  } = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon, getThemedIcon = useGetThemedIcon({
147
146
  size: iconSize,
148
147
  color: propsActive.color
149
- }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = propsActive.space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [children] : wrapChildrenInText(
148
+ }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [propsIn.children] : wrapChildrenInText(
150
149
  Text,
151
- { children, fontFamily, fontSize },
152
- Text === ButtonText && propsIn.unstyled !== !0 ? {
150
+ { children: propsIn.children, fontFamily, fontSize },
151
+ Text === ButtonText && propsActive.unstyled !== !0 ? {
153
152
  unstyled: !1,
154
153
  size
155
154
  } : void 0
@@ -163,10 +162,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
163
162
  }), tag = isNested ? "span" : (
164
163
  // defaults to <a /> when accessibilityRole = link
165
164
  // see https://github.com/tamagui/tamagui/issues/505
166
- propsIn.accessibilityRole === "link" ? "a" : void 0
167
- ), props = {
165
+ propsActive.accessibilityRole === "link" ? "a" : void 0
166
+ ), { iconAfter: _1, icon: _2, noTextWrap: _3, ...restProps } = propsIn, props = {
168
167
  size,
169
- ...propsActive.disabled && {
168
+ ...propsIn.disabled && {
170
169
  // in rnw - false still has keyboard tabIndex, undefined = not actually focusable
171
170
  focusable: void 0,
172
171
  // even with tabIndex unset, it will keep focusStyle on web so disable it here
@@ -177,10 +176,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
177
176
  ...tag && {
178
177
  tag
179
178
  },
180
- ...rest,
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: !0
182
+ disableClassName: didFinishSSR
184
183
  };
185
184
  return {
186
185
  spaceSize,
package/dist/esm/Button.native.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
  }
package/dist/jsx/Button.js CHANGED
@@ -11,6 +11,7 @@ import {
11
11
  getVariableValue,
12
12
  spacedChildren,
13
13
  styled,
14
+ useDidFinishSSR,
14
15
  useProps,
15
16
  withStaticProperties
16
17
  } from "@tamagui/web";
@@ -129,8 +130,7 @@ const ButtonContext = createStyledContext({
129
130
  Icon: ButtonIcon
130
131
  }), ButtonNestingContext = createContext(!1);
131
132
  function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
132
- const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
133
- children,
133
+ const isNested = useContext(ButtonNestingContext), didFinishSSR = useDidFinishSSR(), propsActive = useProps(propsIn), {
134
134
  icon,
135
135
  iconAfter,
136
136
  space,
@@ -140,15 +140,14 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
140
140
  separator,
141
141
  noTextWrap,
142
142
  fontFamily,
143
- fontSize,
144
- ...rest
143
+ fontSize
145
144
  } = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon, getThemedIcon = useGetThemedIcon({
146
145
  size: iconSize,
147
146
  color: propsActive.color
148
- }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = propsActive.space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [children] : wrapChildrenInText(
147
+ }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [propsIn.children] : wrapChildrenInText(
149
148
  Text,
150
- { children, fontFamily, fontSize },
151
- Text === ButtonText && propsIn.unstyled !== !0 ? {
149
+ { children: propsIn.children, fontFamily, fontSize },
150
+ Text === ButtonText && propsActive.unstyled !== !0 ? {
152
151
  unstyled: !1,
153
152
  size
154
153
  } : void 0
@@ -162,10 +161,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
162
161
  }), tag = isNested ? "span" : (
163
162
  // defaults to <a /> when accessibilityRole = link
164
163
  // see https://github.com/tamagui/tamagui/issues/505
165
- propsIn.accessibilityRole === "link" ? "a" : void 0
166
- ), props = {
164
+ propsActive.accessibilityRole === "link" ? "a" : void 0
165
+ ), { iconAfter: _1, icon: _2, noTextWrap: _3, ...restProps } = propsIn, props = {
167
166
  size,
168
- ...propsActive.disabled && {
167
+ ...propsIn.disabled && {
169
168
  // in rnw - false still has keyboard tabIndex, undefined = not actually focusable
170
169
  focusable: void 0,
171
170
  // even with tabIndex unset, it will keep focusStyle on web so disable it here
@@ -176,10 +175,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
176
175
  ...tag && {
177
176
  tag
178
177
  },
179
- ...rest,
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: !0
181
+ disableClassName: didFinishSSR
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": "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",
4
+ "mappings": "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",
5
5
  "names": ["Button"]
6
6
  }
package/dist/jsx/Button.native.js CHANGED
@@ -11,6 +11,7 @@ import {
11
11
  getVariableValue,
12
12
  spacedChildren,
13
13
  styled,
14
+ useDidFinishSSR,
14
15
  useProps,
15
16
  withStaticProperties
16
17
  } from "@tamagui/web";
@@ -129,8 +130,7 @@ const ButtonContext = createStyledContext({
129
130
  Icon: ButtonIcon
130
131
  }), ButtonNestingContext = createContext(!1);
131
132
  function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
132
- const isNested = useContext(ButtonNestingContext), propsActive = useProps(propsIn), {
133
- children,
133
+ const isNested = useContext(ButtonNestingContext), didFinishSSR = useDidFinishSSR(), propsActive = useProps(propsIn), {
134
134
  icon,
135
135
  iconAfter,
136
136
  space,
@@ -140,15 +140,14 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
140
140
  separator,
141
141
  noTextWrap,
142
142
  fontFamily,
143
- fontSize,
144
- ...rest
143
+ fontSize
145
144
  } = propsActive, size = propsActive.size || (propsActive.unstyled ? void 0 : "$true"), iconSize = (typeof size == "number" ? size * 0.5 : getFontSize(size)) * scaleIcon, getThemedIcon = useGetThemedIcon({
146
145
  size: iconSize,
147
146
  color: propsActive.color
148
- }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = propsActive.space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [children] : wrapChildrenInText(
147
+ }), [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon), spaceSize = space ?? getVariableValue(iconSize) * scaleSpace, contents = noTextWrap ? [propsIn.children] : wrapChildrenInText(
149
148
  Text,
150
- { children, fontFamily, fontSize },
151
- Text === ButtonText && propsIn.unstyled !== !0 ? {
149
+ { children: propsIn.children, fontFamily, fontSize },
150
+ Text === ButtonText && propsActive.unstyled !== !0 ? {
152
151
  unstyled: !1,
153
152
  size
154
153
  } : void 0
@@ -162,10 +161,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
162
161
  }), tag = isNested ? "span" : (
163
162
  // defaults to <a /> when accessibilityRole = link
164
163
  // see https://github.com/tamagui/tamagui/issues/505
165
- propsIn.accessibilityRole === "link" ? "a" : void 0
166
- ), props = {
164
+ propsActive.accessibilityRole === "link" ? "a" : void 0
165
+ ), { iconAfter: _1, icon: _2, noTextWrap: _3, ...restProps } = propsIn, props = {
167
166
  size,
168
- ...propsActive.disabled && {
167
+ ...propsIn.disabled && {
169
168
  // in rnw - false still has keyboard tabIndex, undefined = not actually focusable
170
169
  focusable: void 0,
171
170
  // even with tabIndex unset, it will keep focusStyle on web so disable it here
@@ -176,10 +175,10 @@ function useButton(propsIn, { Text = Button2.Text } = { Text: Button2.Text }) {
176
175
  ...tag && {
177
176
  tag
178
177
  },
179
- ...rest,
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: !0
181
+ disableClassName: didFinishSSR
183
182
  };
184
183
  return {
185
184
  spaceSize,
package/dist/jsx/Button.native.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
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/button",
3
- "version": "1.74.7",
3
+ "version": "1.74.8",
4
4
  "sideEffects": [
5
5
  "*.css"
6
6
  ],
@@ -29,17 +29,17 @@
29
29
  }
30
30
  },
31
31
  "dependencies": {
32
- "@tamagui/font-size": "1.74.7",
33
- "@tamagui/get-button-sized": "1.74.7",
34
- "@tamagui/helpers-tamagui": "1.74.7",
35
- "@tamagui/text": "1.74.7",
36
- "@tamagui/web": "1.74.7"
32
+ "@tamagui/font-size": "1.74.8",
33
+ "@tamagui/get-button-sized": "1.74.8",
34
+ "@tamagui/helpers-tamagui": "1.74.8",
35
+ "@tamagui/text": "1.74.8",
36
+ "@tamagui/web": "1.74.8"
37
37
  },
38
38
  "peerDependencies": {
39
39
  "react": "*"
40
40
  },
41
41
  "devDependencies": {
42
- "@tamagui/build": "1.74.7",
42
+ "@tamagui/build": "1.74.8",
43
43
  "react": "^18.2.0",
44
44
  "vitest": "^0.34.3"
45
45
  },
package/src/Button.tsx CHANGED
@@ -17,6 +17,7 @@ import {
17
17
  getVariableValue,
18
18
  spacedChildren,
19
19
  styled,
20
+ useDidFinishSSR,
20
21
  useProps,
21
22
  withStaticProperties,
22
23
  } from '@tamagui/web'
@@ -220,12 +221,11 @@ function useButton<Props extends ButtonProps>(
220
221
  { Text = Button.Text }: { Text: any } = { Text: Button.Text }
221
222
  ) {
222
223
  const isNested = useContext(ButtonNestingContext)
223
-
224
+ const didFinishSSR = useDidFinishSSR()
224
225
  const propsActive = useProps(propsIn) as any as ButtonProps
225
226
 
226
227
  // careful not to desctructure and re-order props, order is important
227
228
  const {
228
- children,
229
229
  icon,
230
230
  iconAfter,
231
231
  space,
@@ -236,8 +236,6 @@ function useButton<Props extends ButtonProps>(
236
236
  noTextWrap,
237
237
  fontFamily,
238
238
  fontSize,
239
-
240
- ...rest
241
239
  } = propsActive
242
240
 
243
241
  const size = propsActive.size || (propsActive.unstyled ? undefined : '$true')
@@ -251,13 +249,13 @@ function useButton<Props extends ButtonProps>(
251
249
  color: propsActive.color as any,
252
250
  })
253
251
  const [themedIcon, themedIconAfter] = [icon, iconAfter].map(getThemedIcon)
254
- const spaceSize = propsActive.space ?? getVariableValue(iconSize) * scaleSpace
252
+ const spaceSize = space ?? getVariableValue(iconSize) * scaleSpace
255
253
  const contents = noTextWrap
256
- ? [children]
254
+ ? [propsIn.children]
257
255
  : wrapChildrenInText(
258
256
  Text,
259
- { children, fontFamily, fontSize },
260
- Text === ButtonText && propsIn.unstyled !== true
257
+ { children: propsIn.children, fontFamily, fontSize },
258
+ Text === ButtonText && propsActive.unstyled !== true
261
259
  ? {
262
260
  unstyled: false,
263
261
  size,
@@ -283,13 +281,16 @@ function useButton<Props extends ButtonProps>(
283
281
  ? 'span'
284
282
  : // defaults to <a /> when accessibilityRole = link
285
283
  // see https://github.com/tamagui/tamagui/issues/505
286
- propsIn.accessibilityRole === 'link'
284
+ propsActive.accessibilityRole === 'link'
287
285
  ? 'a'
288
286
  : undefined
289
287
 
288
+ // remove the ones we used here
289
+ const { iconAfter: _1, icon: _2, noTextWrap: _3, ...restProps } = propsIn
290
+
290
291
  const props = {
291
292
  size,
292
- ...(propsActive.disabled && {
293
+ ...(propsIn.disabled && {
293
294
  // in rnw - false still has keyboard tabIndex, undefined = not actually focusable
294
295
  focusable: undefined,
295
296
  // even with tabIndex unset, it will keep focusStyle on web so disable it here
@@ -300,12 +301,12 @@ function useButton<Props extends ButtonProps>(
300
301
  ...(tag && {
301
302
  tag,
302
303
  }),
303
- ...rest,
304
+ ...restProps,
304
305
  children: (
305
306
  <ButtonNestingContext.Provider value={true}>{inner}</ButtonNestingContext.Provider>
306
307
  ),
307
308
  // forces it to be a runtime pressStyle so it passes through context text colors
308
- disableClassName: true,
309
+ disableClassName: didFinishSSR,
309
310
  } as Props
310
311
 
311
312
  return {
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,EAOf,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,iBAAiB,EAA6B,MAAM,OAAO,CAAA;AAEpE,eAAO,MAAM,aAAa;UAGd,UAAU;GAepB,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,WAAW,GAAG,gBAAgB,GACjC,QAAQ,CAAC,OAAO,WAAW,CAAC,GAC5B,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;AAIH,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;AAOD;;GAEG;AACH,QAAA,MAAM,kBAAkB;;CAavB,CAAA;AAED,QAAA,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA7JR;;OAEG;;IAEH;;OAEG;;IAEH;;;;OAIG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkGoB;QAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;CAsC1E,CAAA;AAEF,eAAO,MAAM,oBAAoB,kCAAuB,CAAA;AAExD;;GAEG;AACH,iBAAS,SAAS,CAAC,KAAK,SAAS,WAAW,EAC1C,OAAO,EAAE,KAAK,EACd,EAAE,IAAkB,EAAE,GAAE;IAAE,IAAI,EAAE,GAAG,CAAA;CAA0B;;;;EAgG9D;AAED,OAAO,EACL,MAAM,EACN,WAAW,EACX,UAAU,EACV,UAAU,EACV,kBAAkB,EAElB,SAAS,GACV,CAAA;AACD,YAAY,EAAE,WAAW,EAAE,CAAA"}
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,EAA6B,MAAM,OAAO,CAAA;AAEpE,eAAO,MAAM,aAAa;UAGd,UAAU;GAepB,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,WAAW,GAAG,gBAAgB,GACjC,QAAQ,CAAC,OAAO,WAAW,CAAC,GAC5B,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;AAIH,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;AAOD;;GAEG;AACH,QAAA,MAAM,kBAAkB;;CAavB,CAAA;AAED,QAAA,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA7JR;;OAEG;;IAEH;;OAEG;;IAEH;;;;OAIG;;IAEH;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkGoB;QAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;CAsC1E,CAAA;AAEF,eAAO,MAAM,oBAAoB,kCAAuB,CAAA;AAExD;;GAEG;AACH,iBAAS,SAAS,CAAC,KAAK,SAAS,WAAW,EAC1C,OAAO,EAAE,KAAK,EACd,EAAE,IAAkB,EAAE,GAAE;IAAE,IAAI,EAAE,GAAG,CAAA;CAA0B;;;;EAgG9D;AAED,OAAO,EACL,MAAM,EACN,WAAW,EACX,UAAU,EACV,UAAU,EACV,kBAAkB,EAElB,SAAS,GACV,CAAA;AACD,YAAY,EAAE,WAAW,EAAE,CAAA"}