Apply feedback

grommet · Jan 26, 2024 · dacd001 · dacd001
1 parent 303e071
commit dacd001
Show file tree

Hide file tree

Showing 19 changed files with 2,123 additions and 8,897 deletions.
diff --git a/src/js/components/Anchor/StyledAnchor.js b/src/js/components/Anchor/StyledAnchor.js
@@ -5,7 +5,7 @@ import { defaultProps } from '../../default-props';
 
 const disabledStyle = (theme) => `
  opacity: 0.3;
- cursor: ${theme.global.control.disabled.cursor || 'default'};
+ cursor: ${theme.global.control?.disabled?.cursor || 'default'};
  text-decoration: none;
 `;
 

diff --git a/src/js/components/Anchor/stories/Disabled.js → ...ries/CustomThemed/CustomDisabledCursor.js b/src/js/components/Anchor/stories/Disabled.js → ...ries/CustomThemed/CustomDisabledCursor.js
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { Anchor, Box, Grommet } from 'grommet';
 
-export const Disabled = () => (
+export const CustomDisabledCursor = () => (
  <Grommet
  theme={{ global: { control: { disabled: { cursor: 'not-allowed' } } } }}
  >
@@ -12,10 +12,10 @@ export const Disabled = () => (
  </Grommet>
 );
 
-Disabled.parameters = {
+CustomDisabledCursor.parameters = {
  chromatic: { disable: true },
 };
 
 export default {
- title: 'Controls/Anchor/Disabled',
+ title: 'Controls/Anchor/Custom Theme/Custom Disabled Cursor',
 };
diff --git a/src/js/components/Button/StyledButton.js b/src/js/components/Button/StyledButton.js
@@ -162,7 +162,7 @@ const activeButtonStyle = (props) => css`
 
 const disabledButtonStyle = (props) => css`
  ${disabledStyle(props.theme.button.disabled.opacity)}
- ${props.theme.global.input.disabled && props.theme.global.input.disabled}
+ ${props.theme.global.input.disabled}
  ${!props.plain &&
  props.theme.button.disabled.border &&
  props.theme.button.disabled.border.color &&