@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/native/index.mjs CHANGED
@@ -468,9 +468,11 @@ var Button = ({
468
468
  }
469
469
  };
470
470
  const brandControl = theme?.colors?.control?.brand;
471
- const disabledBg = brandControl?.primary?.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg;
472
- const disabledBorder = brandControl?.primary?.borderDisable ?? variantStyles.borderDisable ?? variantStyles.border;
473
- const disabledText = brandControl?.text?.disable ?? textStyles.disable;
471
+ const sharedDisable = theme?.colors?.control?.disable;
472
+ const usesBrandDisable = tone === "brand" || !sharedDisable;
473
+ const disabledBg = usesBrandDisable ? brandControl?.primary?.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg : sharedDisable.bg;
474
+ const disabledBorder = usesBrandDisable ? brandControl?.primary?.borderDisable ?? variantStyles.borderDisable ?? variantStyles.border : sharedDisable.border;
475
+ const disabledText = usesBrandDisable ? brandControl?.text?.disable ?? textStyles.disable : sharedDisable.content;
474
476
  let backgroundColor = variantStyles.bg;
475
477
  if (disabled) {
476
478
  backgroundColor = disabledBg;
@@ -732,11 +734,13 @@ var IconButton = ({
732
734
  }
733
735
  };
734
736
  const brandControl = theme.colors.control.brand;
737
+ const sharedDisable = theme.colors.control.disable;
738
+ const usesBrandDisable = tone === "brand";
735
739
  const variantHasFill = !isTransparentColor(variantStyles.bg);
736
- const filledDisabledBg = brandControl.primary.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg;
740
+ const filledDisabledBg = usesBrandDisable ? brandControl.primary.bgDisable ?? variantStyles.bgDisable ?? variantStyles.bg : sharedDisable.bg;
737
741
  const disabledBg = variantHasFill ? filledDisabledBg : variantStyles.bg;
738
- const disabledBorder = brandControl.primary.borderDisable ?? "transparent";
739
- const disabledText = brandControl.text.disable;
742
+ const disabledBorder = usesBrandDisable ? brandControl.primary.borderDisable ?? "transparent" : sharedDisable.border;
743
+ const disabledText = usesBrandDisable ? brandControl.text.disable : sharedDisable.content;
740
744
  let backgroundColor = variantStyles.bg;
741
745
  if (disabled) {
742
746
  backgroundColor = disabledBg;
@@ -949,9 +953,16 @@ var FlexButton = forwardRef(
949
953
  const isDisabled = disabled || loading;
950
954
  const getVariantColors = (currentState) => {
951
955
  if (isDisabled) {
956
+ const disabledPalette = variant === "brand" ? {
957
+ bg: theme.colors.control.brand.primary.bgDisable,
958
+ text: theme.colors.control.brand.text.disable
959
+ } : {
960
+ bg: theme.colors.control.disable.bg,
961
+ text: theme.colors.control.disable.content
962
+ };
952
963
  return {
953
- bg: background ? theme.colors.control.brand.primary.bgDisable : "transparent",
954
- text: theme.colors.control.brand.text.disable,
964
+ bg: background ? disabledPalette.bg : "transparent",
965
+ text: disabledPalette.text,
955
966
  border: void 0
956
967
  };
957
968
  }