@xsolla/xui-button 0.219.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/native/index.js CHANGED
@@ -502,9 +502,11 @@ var Button = ({
502
502
  }
503
503
  };
504
504
  const brandControl = theme?.colors?.control?.brand;
505
- const disabledBg = brandControl?.primary?.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg;
506
- const disabledBorder = brandControl?.primary?.borderDisable ?? variantStyles.borderDisable ?? variantStyles.border;
507
- const disabledText = brandControl?.text?.disable ?? textStyles.disable;
505
+ const sharedDisable = theme?.colors?.control?.disable;
506
+ const usesBrandDisable = tone === "brand" || !sharedDisable;
507
+ const disabledBg = usesBrandDisable ? brandControl?.primary?.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg : sharedDisable.bg;
508
+ const disabledBorder = usesBrandDisable ? brandControl?.primary?.borderDisable ?? variantStyles.borderDisable ?? variantStyles.border : sharedDisable.border;
509
+ const disabledText = usesBrandDisable ? brandControl?.text?.disable ?? textStyles.disable : sharedDisable.content;
508
510
  let backgroundColor = variantStyles.bg;
509
511
  if (disabled) {
510
512
  backgroundColor = disabledBg;
@@ -766,11 +768,13 @@ var IconButton = ({
766
768
  }
767
769
  };
768
770
  const brandControl = theme.colors.control.brand;
771
+ const sharedDisable = theme.colors.control.disable;
772
+ const usesBrandDisable = tone === "brand";
769
773
  const variantHasFill = !isTransparentColor(variantStyles.bg);
770
- const filledDisabledBg = brandControl.primary.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg;
774
+ const filledDisabledBg = usesBrandDisable ? brandControl.primary.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg : sharedDisable.bg;
771
775
  const disabledBg = variantHasFill ? filledDisabledBg : variantStyles.bg;
772
- const disabledBorder = brandControl.primary.borderDisable ?? "transparent";
773
- const disabledText = brandControl.text.disable;
776
+ const disabledBorder = usesBrandDisable ? brandControl.primary.borderDisable ?? "transparent" : sharedDisable.border;
777
+ const disabledText = usesBrandDisable ? brandControl.text.disable : sharedDisable.content;
774
778
  let backgroundColor = variantStyles.bg;
775
779
  if (disabled) {
776
780
  backgroundColor = disabledBg;
@@ -979,9 +983,16 @@ var FlexButton = (0, import_react4.forwardRef)(
979
983
  const isDisabled = disabled || loading;
980
984
  const getVariantColors = (currentState) => {
981
985
  if (isDisabled) {
986
+ const disabledPalette = variant === "brand" ? {
987
+ bg: theme.colors.control.brand.primary.bgDisable,
988
+ text: theme.colors.control.brand.text.disable
989
+ } : {
990
+ bg: theme.colors.control.disable.bg,
991
+ text: theme.colors.control.disable.content
992
+ };
982
993
  return {
983
- bg: background ? theme.colors.control.brand.primary.bgDisable : "transparent",
984
- text: theme.colors.control.brand.text.disable,
994
+ bg: background ? disabledPalette.bg : "transparent",
995
+ text: disabledPalette.text,
985
996
  border: void 0
986
997
  };
987
998
  }