Skip to content

Commit

Permalink
[Button] Expose disableTouchRipple (#6234)
Browse files Browse the repository at this point in the history
* Update FlatButton to expose disableTouchRipple

- The enhanced button wrapper exposes an option to disable
  touch ripples.  This is the case with the IconButton and
  should be persisted to the FlatButton.
- In addition to exposing the prop, the documentation page
  will be automatically updated with the new prop for Icon Button
  as well, since the documentation for the props is pulled strictly
  from the FlatButton component

* Update RaisedButton to expose disableTouchRipple

- The enhanced button wrapper exposes the option to
  disable touch ripples.  This is the case with the
  FlatButton component and should be exposed on
  RaisedButton for consistency.
- In addition to exposing the prop,
  the documentation page will automatically be
  updated with the newly defined prop from the
  RaisedButton component
  • Loading branch information
oshalygin authored and oliviertassinari committed Feb 25, 2017
1 parent 77fe482 commit 3d1aef2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/FlatButton/FlatButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ class FlatButton extends Component {
PropTypes.string,
PropTypes.element,
]),
/**
* If true, the element's ripple effect will be disabled.
*/
disableTouchRipple: React.PropTypes.bool,
/**
* Disables the button if set to true.
*/
Expand Down
4 changes: 4 additions & 0 deletions src/RaisedButton/RaisedButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ class RaisedButton extends Component {
PropTypes.string,
PropTypes.element,
]),
/**
* If true, the element's ripple effect will be disabled.
*/
disableTouchRipple: React.PropTypes.bool,
/**
* If true, the button will be disabled.
*/
Expand Down

0 comments on commit 3d1aef2

Please sign in to comment.