@xsolla/xui-button 0.220.0 → 0.221.1

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.mjs CHANGED
@@ -505,9 +505,11 @@ var Button = ({
505
505
  }
506
506
  };
507
507
  const brandControl = theme?.colors?.control?.brand;
508
- const disabledBg = brandControl?.primary?.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg;
509
- const disabledBorder = brandControl?.primary?.borderDisable ?? variantStyles.borderDisable ?? variantStyles.border;
510
- const disabledText = brandControl?.text?.disable ?? textStyles.disable;
508
+ const sharedDisable = theme?.colors?.control?.disable;
509
+ const usesBrandDisable = tone === "brand" || !sharedDisable;
510
+ const disabledBg = usesBrandDisable ? brandControl?.primary?.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg : sharedDisable.bg;
511
+ const disabledBorder = usesBrandDisable ? brandControl?.primary?.borderDisable ?? variantStyles.borderDisable ?? variantStyles.border : sharedDisable.border;
512
+ const disabledText = usesBrandDisable ? brandControl?.text?.disable ?? textStyles.disable : sharedDisable.content;
511
513
  let backgroundColor = variantStyles.bg;
512
514
  if (disabled) {
513
515
  backgroundColor = disabledBg;
@@ -769,11 +771,13 @@ var IconButton = ({
769
771
  }
770
772
  };
771
773
  const brandControl = theme.colors.control.brand;
774
+ const sharedDisable = theme.colors.control.disable;
775
+ const usesBrandDisable = tone === "brand";
772
776
  const variantHasFill = !isTransparentColor(variantStyles.bg);
773
- const filledDisabledBg = brandControl.primary.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg;
777
+ const filledDisabledBg = usesBrandDisable ? brandControl.primary.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg : sharedDisable.bg;
774
778
  const disabledBg = variantHasFill ? filledDisabledBg : variantStyles.bg;
775
- const disabledBorder = brandControl.primary.borderDisable ?? "transparent";
776
- const disabledText = brandControl.text.disable;
779
+ const disabledBorder = usesBrandDisable ? brandControl.primary.borderDisable ?? "transparent" : sharedDisable.border;
780
+ const disabledText = usesBrandDisable ? brandControl.text.disable : sharedDisable.content;
777
781
  let backgroundColor = variantStyles.bg;
778
782
  if (disabled) {
779
783
  backgroundColor = disabledBg;
@@ -986,9 +990,16 @@ var FlexButton = forwardRef(
986
990
  const isDisabled = disabled || loading;
987
991
  const getVariantColors = (currentState) => {
988
992
  if (isDisabled) {
993
+ const disabledPalette = variant === "brand" ? {
994
+ bg: theme.colors.control.brand.primary.bgDisable,
995
+ text: theme.colors.control.brand.text.disable
996
+ } : {
997
+ bg: theme.colors.control.disable.bg,
998
+ text: theme.colors.control.disable.content
999
+ };
989
1000
  return {
990
- bg: background ? theme.colors.control.brand.primary.bgDisable : "transparent",
991
- text: theme.colors.control.brand.text.disable,
1001
+ bg: background ? disabledPalette.bg : "transparent",
1002
+ text: disabledPalette.text,
992
1003
  border: void 0
993
1004
  };
994
1005
  }