Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IconButton] Better follow the spec #9967

Merged
merged 1 commit into from
Jan 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pages/api/icon-button.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ This property accepts the following keys:
- `disabled`
- `label`
- `icon`
- `keyboardFocused`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/mui-org/material-ui/tree/v1-beta/src/IconButton/IconButton.js)
Expand Down
4 changes: 2 additions & 2 deletions src/ButtonBase/TouchRipple.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const styles = theme => ({
display: 'block',
width: '100%',
height: '100%',
animation: `mui-ripple-pulsate 1500ms ${theme.transitions.easing.easeInOut} 200ms infinite`,
animation: `mui-ripple-pulsate 2500ms ${theme.transitions.easing.easeInOut} 200ms infinite`,
},
'@keyframes mui-ripple-enter': {
'0%': {
Expand All @@ -59,7 +59,7 @@ export const styles = theme => ({
transform: 'scale(1)',
},
'50%': {
transform: 'scale(0.9)',
transform: 'scale(0.92)',
},
'100%': {
transform: 'scale(1)',
Expand Down
3 changes: 1 addition & 2 deletions src/IconButton/IconButton.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ export type IconButtonClassKey =
| 'colorSecondary'
| 'colorInherit'
| 'label'
| 'icon'
| 'keyboardFocused';
| 'icon';

declare const IconButton: React.ComponentType<IconButtonProps>;

Expand Down
5 changes: 1 addition & 4 deletions src/IconButton/IconButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ export const styles = theme => ({
width: '1em',
height: '1em',
},
keyboardFocused: {
backgroundColor: theme.palette.text.divider,
},
});

/**
Expand All @@ -69,7 +66,7 @@ function IconButton(props) {
className,
)}
centerRipple
keyboardFocusedClassName={classes.keyboardFocused}
focusRipple
disabled={disabled}
rootRef={buttonRef}
ref={rootRef}
Expand Down