@tamagui/button 2.0.0-rc.9 → 2.0.0

package/dist/cjs/Button.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var Button_exports = {};
 __export(Button_exports, {
@@ -24,176 +26,246 @@ __export(Button_exports, {
   ButtonContext: () => ButtonContext
 });
 module.exports = __toCommonJS(Button_exports);
-var import_font_size = require("@tamagui/font-size"),
-  import_get_button_sized = require("@tamagui/get-button-sized"),
-  import_helpers_tamagui = require("@tamagui/helpers-tamagui"),
-  import_stacks = require("@tamagui/stacks"),
-  import_text = require("@tamagui/text"),
-  import_web = require("@tamagui/web"),
-  import_react = require("react"),
-  import_jsx_runtime = require("react/jsx-runtime");
+var import_font_size = require("@tamagui/font-size");
+var import_get_button_sized = require("@tamagui/get-button-sized");
+var import_helpers_tamagui = require("@tamagui/helpers-tamagui");
+var import_stacks = require("@tamagui/stacks");
+var import_text = require("@tamagui/text");
+var import_web = require("@tamagui/web");
+var import_react = require("react");
+var import_jsx_runtime = require("react/jsx-runtime");
 const context = (0, import_web.createStyledContext)({
-    size: void 0,
-    variant: void 0,
-    color: void 0,
-    elevation: void 0
+  size: void 0,
+  variant: void 0,
+  color: void 0,
+  elevation: void 0,
+  ellipsis: void 0,
+  fontFamily: void 0,
+  fontSize: void 0,
+  fontStyle: void 0,
+  fontWeight: void 0,
+  letterSpacing: void 0,
+  maxFontSizeMultiplier: void 0,
+  textAlign: void 0
+});
+const Frame = (0, import_web.styled)(import_web.View, {
+  context,
+  name: "Button",
+  role: "button",
+  render: /* @__PURE__ */(0, import_jsx_runtime.jsx)("button", {
+    type: "button"
   }),
-  Frame = (0, import_web.styled)(import_web.View, {
-    context,
-    name: "Button",
-    role: "button",
-    render: /* @__PURE__ */(0, import_jsx_runtime.jsx)("button", {
-      type: "button"
-    }),
-    tabIndex: 0,
-    variants: {
-      unstyled: {
-        false: {
-          size: "$true",
-          justifyContent: "center",
-          alignItems: "center",
-          flexWrap: "nowrap",
-          flexDirection: "row",
-          cursor: "pointer",
-          backgroundColor: "$background",
-          borderWidth: 1,
-          borderColor: "transparent",
-          hoverStyle: {
-            backgroundColor: "$backgroundHover",
-            borderColor: "$borderColorHover"
-          },
-          pressStyle: {
-            backgroundColor: "$backgroundPress",
-            borderColor: "$borderColorHover"
-          },
-          focusVisibleStyle: {
-            outlineColor: "$outlineColor",
-            outlineStyle: "solid",
-            outlineWidth: 2
-          }
-        }
+  tabIndex: 0,
+  variants: {
+    unstyled: {
+      true: {
+        // reset browser <button> defaults
+        outlineWidth: 0,
+        borderWidth: 0,
+        backgroundColor: "transparent"
       },
-      variant: {
-        outlined: process.env.TAMAGUI_HEADLESS === "1" ? {} : {
-          backgroundColor: "transparent",
-          borderWidth: 1,
-          borderColor: "$borderColor",
-          hoverStyle: {
-            backgroundColor: "transparent",
-            borderColor: "$borderColorHover"
-          },
-          pressStyle: {
-            backgroundColor: "transparent",
-            borderColor: "$borderColorPress"
-          }
+      false: {
+        size: "$true",
+        justifyContent: "center",
+        alignItems: "center",
+        flexWrap: "nowrap",
+        flexDirection: "row",
+        backgroundColor: "$background",
+        borderWidth: 1,
+        borderColor: "transparent",
+        "$platform-web": {
+          cursor: "pointer"
+        },
+        hoverStyle: {
+          backgroundColor: "$backgroundHover",
+          borderColor: "$borderColorHover"
+        },
+        pressStyle: {
+          backgroundColor: "$backgroundPress",
+          borderColor: "$borderColorHover"
+        },
+        focusVisibleStyle: {
+          outlineColor: "$outlineColor",
+          outlineStyle: "solid",
+          outlineWidth: 2
         }
-      },
-      circular: import_stacks.themeableVariants.circular,
-      chromeless: import_stacks.themeableVariants.chromeless,
-      size: {
-        "...size": (val, extras) => {
-          const buttonStyle = (0, import_get_button_sized.getButtonSized)(val, extras),
-            gap = (0, import_web.getTokenValue)(val);
-          return {
-            ...buttonStyle,
-            gap
-          };
+      }
+    },
+    variant: {
+      outlined: process.env.TAMAGUI_HEADLESS === "1" ? {} : {
+        backgroundColor: "transparent",
+        borderWidth: 1,
+        borderColor: "$borderColor",
+        hoverStyle: {
+          backgroundColor: "transparent",
+          borderColor: "$borderColorHover"
         },
-        ":number": (val, extras) => {
-          const buttonStyle = (0, import_get_button_sized.getButtonSized)(val, extras),
-            gap = val * 0.4;
-          return {
-            ...buttonStyle,
-            gap
-          };
+        pressStyle: {
+          backgroundColor: "transparent",
+          borderColor: "$borderColorPress"
         }
+      }
+    },
+    circular: import_stacks.themeableVariants.circular,
+    chromeless: import_stacks.themeableVariants.chromeless,
+    size: {
+      "...size": (val, extras) => {
+        const buttonStyle = (0, import_get_button_sized.getButtonSized)(val, extras);
+        const gap = (0, import_web.getTokenValue)(val);
+        return {
+          ...buttonStyle,
+          gap
+        };
       },
-      elevation: {
-        "...size": import_stacks.getElevation,
-        ":number": import_stacks.getElevation
-      },
-      disabled: {
-        true: {
-          pointerEvents: "none",
-          // @ts-ignore
-          "aria-disabled": !0
-        }
+      ":number": (val, extras) => {
+        const buttonStyle = (0, import_get_button_sized.getButtonSized)(val, extras);
+        const gap = val * 0.4;
+        return {
+          ...buttonStyle,
+          gap
+        };
       }
     },
-    defaultVariants: {
-      unstyled: process.env.TAMAGUI_HEADLESS === "1"
+    elevation: {
+      "...size": import_stacks.getElevation,
+      ":number": import_stacks.getElevation
+    },
+    disabled: {
+      true: {
+        pointerEvents: "none",
+        // @ts-ignore
+        "aria-disabled": true
+      }
     }
-  }),
-  Text = (0, import_web.styled)(import_text.SizableText, {
-    context,
-    variants: {
-      unstyled: {
-        false: {
-          userSelect: "none",
-          cursor: "pointer",
-          // flexGrow 1 leads to inconsistent native style where text pushes to start of view
-          flexGrow: 0,
-          flexShrink: 1,
-          ellipsis: !0,
-          color: "$color"
+  },
+  defaultVariants: {
+    unstyled: process.env.TAMAGUI_HEADLESS === "1"
+  }
+});
+const Text = (0, import_web.styled)(import_text.SizableText, {
+  context,
+  variants: {
+    unstyled: {
+      false: {
+        userSelect: "none",
+        // flexGrow 1 leads to inconsistent native style where text pushes to start of view
+        flexGrow: 0,
+        flexShrink: 1,
+        ellipsis: true,
+        color: "$color",
+        "$platform-web": {
+          cursor: "pointer"
         }
       }
-    },
-    defaultVariants: {
-      unstyled: process.env.TAMAGUI_HEADLESS === "1"
     }
-  }),
-  Icon = props => {
-    const {
-        children,
-        scaleIcon = 1,
-        size
-      } = props,
-      styledContext = context.useStyledContext();
-    if (!styledContext) throw new Error("Button.Icon must be used within a Button");
-    const sizeToken = size ?? styledContext.size,
-      iconSize = (typeof sizeToken == "number" ? sizeToken * 0.5 : (0, import_font_size.getFontSize)(sizeToken)) * scaleIcon;
-    return (0, import_helpers_tamagui.getIcon)(children, {
-      size: iconSize,
-      color: styledContext.color
-    });
   },
-  ButtonContext = (0, import_web.createStyledContext)({
-    size: void 0,
-    variant: void 0,
-    color: void 0
-  }),
-  ButtonComponent = Frame.styleable((propsIn, ref) => {
-    const isNested = (0, import_react.useContext)(import_stacks.ButtonNestingContext),
-      processedProps = (0, import_web.useProps)(propsIn, {
-        noNormalize: !0,
-        noExpand: !0
-      }),
-      {
-        children,
-        iconSize,
-        icon,
-        iconAfter,
-        scaleIcon = 1,
-        ...props
-      } = processedProps,
-      size = propsIn.size || (propsIn.unstyled ? void 0 : "$true"),
-      styledContext = context.useStyledContext(),
-      finalSize = iconSize ?? size ?? styledContext?.size,
-      iconSizeNumber = (typeof finalSize == "number" ? finalSize * 0.5 : (0, import_font_size.getFontSize)(finalSize)) * scaleIcon,
-      [themedIcon, themedIconAfter] = [icon, iconAfter].map(icon2 => icon2 ? (0, import_helpers_tamagui.getIcon)(icon2, {
-        size: iconSizeNumber,
-        color: styledContext?.color
-        // No marginLeft or marginRight needed - spacing is handled by the gap property in Frame's size variants
-      }) : null),
-      wrappedChildren = (0, import_text.wrapChildrenInText)(Text, {
-        children
-      }, {
-        unstyled: process.env.TAMAGUI_HEADLESS === "1",
-        size: finalSize ?? styledContext?.size
-      });
-    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_stacks.ButtonNestingContext.Provider, {
-      value: !0,
+  defaultVariants: {
+    unstyled: process.env.TAMAGUI_HEADLESS === "1"
+  }
+});
+const Icon = props => {
+  const {
+    children,
+    scaleIcon = 1,
+    size
+  } = props;
+  const styledContext = context.useStyledContext();
+  if (!styledContext) {
+    throw new Error("Button.Icon must be used within a Button");
+  }
+  const sizeToken = size ?? styledContext.size;
+  const iconColorProp = styledContext.color === "unset" || typeof styledContext.color === "number" ? void 0 : styledContext.color;
+  const iconColor = (0, import_helpers_tamagui.useCurrentColor)(iconColorProp);
+  const iconSize = (typeof sizeToken === "number" ? sizeToken * 0.5 : (0, import_font_size.getFontSize)(sizeToken)) * scaleIcon;
+  return (0, import_helpers_tamagui.getIcon)(children, {
+    size: iconSize,
+    color: iconColor
+  });
+};
+const ButtonContext = (0, import_web.createStyledContext)({
+  size: void 0,
+  variant: void 0,
+  color: void 0
+});
+const ButtonComponent = Frame.styleable((propsIn, ref) => {
+  const isNested = (0, import_react.useContext)(import_stacks.ButtonNestingContext);
+  const processedProps = (0, import_web.useProps)(propsIn, {
+    noNormalize: true,
+    noExpand: true
+  });
+  const {
+    children,
+    iconSize,
+    icon,
+    iconAfter,
+    scaleIcon = 1,
+    noTextWrap,
+    textProps,
+    color,
+    ellipsis,
+    fontFamily,
+    fontSize,
+    fontStyle,
+    fontWeight,
+    letterSpacing,
+    maxFontSizeMultiplier,
+    textAlign,
+    ...props
+  } = processedProps;
+  const size = propsIn.size || (propsIn.unstyled ? void 0 : "$true");
+  const styledContext = context.useStyledContext();
+  const contextColor = color ?? propsIn.color ?? styledContext?.color;
+  const iconColorProp = contextColor === "unset" || typeof contextColor === "number" ? void 0 : contextColor;
+  const iconColor = (0, import_helpers_tamagui.useCurrentColor)(iconColorProp);
+  const finalSize = iconSize ?? size ?? styledContext?.size;
+  const iconSizeNumber = (typeof finalSize === "number" ? finalSize * 0.5 : (0, import_font_size.getFontSize)(finalSize)) * scaleIcon;
+  const [themedIcon, themedIconAfter] = [icon, iconAfter].map(icon2 => {
+    if (!icon2) return null;
+    return (0, import_helpers_tamagui.getIcon)(icon2, {
+      size: iconSizeNumber,
+      color: iconColor
+      // No marginLeft or marginRight needed - spacing is handled by the gap property in Frame's size variants
+    });
+  });
+  const wrappedChildren = (0, import_text.wrapChildrenInText)(Text, {
+    children,
+    color: contextColor,
+    ellipsis: ellipsis ?? propsIn.ellipsis ?? styledContext?.ellipsis,
+    fontFamily: fontFamily ?? propsIn.fontFamily ?? styledContext?.fontFamily,
+    fontSize: fontSize ?? propsIn.fontSize ?? styledContext?.fontSize,
+    fontStyle: fontStyle ?? propsIn.fontStyle ?? styledContext?.fontStyle,
+    fontWeight: fontWeight ?? propsIn.fontWeight ?? styledContext?.fontWeight,
+    letterSpacing: letterSpacing ?? propsIn.letterSpacing ?? styledContext?.letterSpacing,
+    maxFontSizeMultiplier: maxFontSizeMultiplier ?? propsIn.maxFontSizeMultiplier ?? styledContext?.maxFontSizeMultiplier,
+    noTextWrap: noTextWrap ?? propsIn.noTextWrap,
+    textAlign: textAlign ?? propsIn.textAlign ?? styledContext?.textAlign,
+    textProps: textProps ?? propsIn.textProps
+  }, {
+    unstyled: process.env.TAMAGUI_HEADLESS === "1",
+    size: finalSize ?? styledContext?.size
+  });
+  const textContext = {
+    color: contextColor,
+    ellipsis: ellipsis ?? propsIn.ellipsis ?? styledContext?.ellipsis,
+    fontFamily: fontFamily ?? propsIn.fontFamily ?? styledContext?.fontFamily,
+    fontSize: fontSize ?? propsIn.fontSize ?? styledContext?.fontSize,
+    fontStyle: fontStyle ?? propsIn.fontStyle ?? styledContext?.fontStyle,
+    fontWeight: fontWeight ?? propsIn.fontWeight ?? styledContext?.fontWeight,
+    letterSpacing: letterSpacing ?? propsIn.letterSpacing ?? styledContext?.letterSpacing,
+    maxFontSizeMultiplier: maxFontSizeMultiplier ?? propsIn.maxFontSizeMultiplier ?? styledContext?.maxFontSizeMultiplier,
+    textAlign: textAlign ?? propsIn.textAlign ?? styledContext?.textAlign
+  };
+  const buttonContext = {
+    ...styledContext,
+    ...textContext,
+    size: props.size ?? propsIn.size ?? styledContext?.size,
+    variant: props.variant ?? propsIn.variant ?? styledContext?.variant,
+    elevation: props.elevation ?? propsIn.elevation ?? styledContext?.elevation
+  };
+  return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_stacks.ButtonNestingContext.Provider, {
+    value: true,
+    children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(context.Provider, {
+      ...buttonContext,
       children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(Frame, {
         ref,
         ...props,
@@ -206,11 +278,12 @@ const context = (0, import_web.createStyledContext)({
         tabIndex: 0,
         children: [themedIcon, wrappedChildren, themedIconAfter]
       })
-    });
-  }),
-  Button = (0, import_web.withStaticProperties)(ButtonComponent, {
-    Apply: context.Provider,
-    Frame,
-    Text,
-    Icon
-  });
+    })
+  });
+});
+const Button = (0, import_web.withStaticProperties)(ButtonComponent, {
+  Apply: context.Provider,
+  Frame,
+  Text,
+  Icon
+});