@xsolla/xui-button 0.171.2 → 0.171.3-pr341.1781516667

package/native/index.mjs

@@ -335,6 +335,7 @@ var Button = ({
   sublabel,
   labelAlignment = "center",
   labelIcon,
+  labelIconRight,
   customContent,
   "aria-label": ariaLabel,
   "aria-describedby": ariaDescribedBy,
@@ -371,14 +372,21 @@ var Button = ({
     ghost: "#000",
     disable: "#666"
   };
-  const handlePress = () => {
-    if (!isDisabled && onPress) {
+  const handlePress = (e) => {
+    if (isDisabled) {
+      e?.preventDefault();
+      return;
+    }
+    if (onPress) {
       onPress();
     }
   };
   const handleKeyDown = (e) => {
-    if (isDisabled) return;
     if (e.key === "Enter" || e.key === " ") {
+      if (isDisabled) {
+        e.preventDefault();
+        return;
+      }
       e.preventDefault();
       setIsKeyboardPressed(true);
     }
@@ -393,14 +401,23 @@ var Button = ({
       }
     }
   };
+  const brandControl = theme?.colors?.control?.brand;
+  const disabledBg = brandControl?.primary?.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg;
+  const disabledBorder = brandControl?.primary?.borderDisable ?? variantStyles.borderDisable ?? variantStyles.border;
+  const disabledText = brandControl?.text?.disable ?? textStyles.disable;
   let backgroundColor = variantStyles.bg;
   if (disabled) {
-    backgroundColor = variantStyles.bgDisable || variantStyles.bg;
+    backgroundColor = disabledBg;
   } else if (isKeyboardPressed) {
     backgroundColor = variantStyles.bgPress || variantStyles.bg;
   }
-  const borderColor = disabled ? variantStyles.borderDisable || variantStyles.border : variantStyles.border;
-  const textColor = disabled ? textStyles.disable : textStyles[variant];
+  let borderColor = variantStyles.border;
+  if (disabled) {
+    borderColor = disabledBorder;
+  } else if (isKeyboardPressed) {
+    borderColor = variantStyles.borderPress || variantStyles.border;
+  }
+  const textColor = disabled ? disabledText : textStyles[variant];
   const computedAriaLabel = ariaLabel;
   return /* @__PURE__ */ jsxs(
     Box,
@@ -411,7 +428,6 @@ var Button = ({
       onPress: handlePress,
       onKeyDown: handleKeyDown,
       onKeyUp: handleKeyUp,
-      disabled: isDisabled,
       "aria-label": computedAriaLabel,
       "aria-disabled": isDisabled || void 0,
       "aria-busy": loading || void 0,
@@ -433,12 +449,17 @@ var Button = ({
       justifyContent: "center",
       position: "relative",
       cursor: disabled ? "not-allowed" : loading ? "wait" : "pointer",
-      style: { transition: "background-color 500ms ease", opacity: 1 },
+      style: {
+        transition: "background-color 500ms ease, border-color 500ms ease",
+        opacity: 1
+      },
       hoverStyle: !isDisabled ? {
-        backgroundColor: variantStyles?.bgHover
+        backgroundColor: variantStyles?.bgHover,
+        borderColor: variantStyles?.borderHover
       } : void 0,
       pressStyle: !isDisabled ? {
-        backgroundColor: variantStyles?.bgPress
+        backgroundColor: variantStyles?.bgPress,
+        borderColor: variantStyles?.borderPress
       } : void 0,
       focusStyle: {
         outlineColor: theme.colors.border.brand,
@@ -504,12 +525,27 @@ var Button = ({
                 sizeStyles.labelIconSize,
                 textColor
               ) }),
-              /* @__PURE__ */ jsx5(Text, { color: textColor, fontSize: sizeStyles.fontSize, fontWeight: "500", children }),
-              sublabel && /* @__PURE__ */ jsx5(
+              /* @__PURE__ */ jsx5(
                 Text,
                 {
                   color: textColor,
                   fontSize: sizeStyles.fontSize,
+                  lineHeight: sizeStyles.lineHeight,
+                  fontWeight: "500",
+                  children
+                }
+              ),
+              labelIconRight && /* @__PURE__ */ jsx5(Box, { "aria-hidden": true, children: cloneIconWithDefaults(
+                labelIconRight,
+                sizeStyles.labelIconSize,
+                textColor
+              ) }),
+              sublabel && /* @__PURE__ */ jsx5(
+                Text,
+                {
+                  color: textColor,
+                  fontSize: sizeStyles.sublabelFontSize,
+                  lineHeight: sizeStyles.lineHeight,
                   fontWeight: "500",
                   style: { opacity: 0.4 },
                   children: sublabel
@@ -1374,7 +1410,7 @@ var ButtonGroup = ({
     }
     return processedChildren;
   };
-  return /* @__PURE__ */ jsxs5(Box, { flexDirection: "column", width: "100%", gap: 8, children: [
+  return /* @__PURE__ */ jsxs5(Box, { flexDirection: "column", width: "100%", gap: 12, children: [
     /* @__PURE__ */ jsx9(
       Box,
       {
@@ -1392,7 +1428,7 @@ var ButtonGroup = ({
         children: renderChildren()
       }
     ),
-    error && /* @__PURE__ */ jsx9(Box, { marginTop: 4, children: /* @__PURE__ */ jsx9(
+    error && /* @__PURE__ */ jsx9(Box, { children: /* @__PURE__ */ jsx9(
       Text,
       {
         id: errorId,
@@ -1400,17 +1436,19 @@ var ButtonGroup = ({
         "aria-live": "assertive",
         color: theme.colors.content.alert.primary,
         fontSize: 14,
+        lineHeight: 18,
         fontWeight: "400",
         style: orientation === "vertical" ? { textAlign: "center" } : void 0,
         children: error
       }
     ) }),
-    description && /* @__PURE__ */ jsx9(Box, { marginTop: 4, children: /* @__PURE__ */ jsx9(
+    description && /* @__PURE__ */ jsx9(Box, { children: /* @__PURE__ */ jsx9(
       Text,
       {
         id: descriptionId,
         color: theme.colors.content.tertiary,
         fontSize: 14,
+        lineHeight: 18,
         fontWeight: "400",
         style: orientation === "vertical" ? { textAlign: "center" } : void 0,
         children: description