@xsolla/xui-button 0.220.0 → 0.221.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.
Files changed (9) hide show
  1. package/native/index.js +19 -8
  2. package/native/index.js.map +1 -1
  3. package/native/index.mjs +19 -8
  4. package/native/index.mjs.map +1 -1
  5. package/package.json +4 -4
  6. package/web/index.js +19 -8
  7. package/web/index.js.map +1 -1
  8. package/web/index.mjs +19 -8
  9. package/web/index.mjs.map +1 -1
package/web/index.js CHANGED
@@ -546,9 +546,11 @@ var Button = ({
546
546
  }
547
547
  };
548
548
  const brandControl = theme?.colors?.control?.brand;
549
- const disabledBg = brandControl?.primary?.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg;
550
- const disabledBorder = brandControl?.primary?.borderDisable ?? variantStyles.borderDisable ?? variantStyles.border;
551
- const disabledText = brandControl?.text?.disable ?? textStyles.disable;
549
+ const sharedDisable = theme?.colors?.control?.disable;
550
+ const usesBrandDisable = tone === "brand" || !sharedDisable;
551
+ const disabledBg = usesBrandDisable ? brandControl?.primary?.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg : sharedDisable.bg;
552
+ const disabledBorder = usesBrandDisable ? brandControl?.primary?.borderDisable ?? variantStyles.borderDisable ?? variantStyles.border : sharedDisable.border;
553
+ const disabledText = usesBrandDisable ? brandControl?.text?.disable ?? textStyles.disable : sharedDisable.content;
552
554
  let backgroundColor = variantStyles.bg;
553
555
  if (disabled) {
554
556
  backgroundColor = disabledBg;
@@ -810,11 +812,13 @@ var IconButton = ({
810
812
  }
811
813
  };
812
814
  const brandControl = theme.colors.control.brand;
815
+ const sharedDisable = theme.colors.control.disable;
816
+ const usesBrandDisable = tone === "brand";
813
817
  const variantHasFill = !isTransparentColor(variantStyles.bg);
814
- const filledDisabledBg = brandControl.primary.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg;
818
+ const filledDisabledBg = usesBrandDisable ? brandControl.primary.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg : sharedDisable.bg;
815
819
  const disabledBg = variantHasFill ? filledDisabledBg : variantStyles.bg;
816
- const disabledBorder = brandControl.primary.borderDisable ?? "transparent";
817
- const disabledText = brandControl.text.disable;
820
+ const disabledBorder = usesBrandDisable ? brandControl.primary.borderDisable ?? "transparent" : sharedDisable.border;
821
+ const disabledText = usesBrandDisable ? brandControl.text.disable : sharedDisable.content;
818
822
  let backgroundColor = variantStyles.bg;
819
823
  if (disabled) {
820
824
  backgroundColor = disabledBg;
@@ -1023,9 +1027,16 @@ var FlexButton = (0, import_react5.forwardRef)(
1023
1027
  const isDisabled = disabled || loading;
1024
1028
  const getVariantColors = (currentState) => {
1025
1029
  if (isDisabled) {
1030
+ const disabledPalette = variant === "brand" ? {
1031
+ bg: theme.colors.control.brand.primary.bgDisable,
1032
+ text: theme.colors.control.brand.text.disable
1033
+ } : {
1034
+ bg: theme.colors.control.disable.bg,
1035
+ text: theme.colors.control.disable.content
1036
+ };
1026
1037
  return {
1027
- bg: background ? theme.colors.control.brand.primary.bgDisable : "transparent",
1028
- text: theme.colors.control.brand.text.disable,
1038
+ bg: background ? disabledPalette.bg : "transparent",
1039
+ text: disabledPalette.text,
1029
1040
  border: void 0
1030
1041
  };
1031
1042
  }