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.

Sign up for GitHub

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

Jump to bottom

Added description for flatButton 'disable' prop #828

Merged
merged 1 commit into from
Jun 13, 2015
Merged

Added description for flatButton 'disable' prop #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions docs/src/app/components/pages/components/buttons.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ class ButtonPage extends React.Component {
{
name: 'Flat Button',
infoArray: [
{
name: 'disabled',
type: 'bool',
header: 'optional',
desc: 'Disables the button if set to true.'
},
{
name: 'label or children',
type: 'string (label) or HTML/React elements (children)',
Expand Down Expand Up @@ -118,6 +124,12 @@ class ButtonPage extends React.Component {
{
name: 'Raised Button',
infoArray: [
{
name: 'disabled',
type: 'bool',
header: 'optional',
desc: 'Disables the button if set to true.'
},
{
name: 'label or children',
type: 'string (label) or HTML/React elements (children)',
Expand Down Expand Up @@ -162,6 +174,12 @@ class ButtonPage extends React.Component {
{
name: 'Floating Action Button',
infoArray: [
{
name: 'disabled',
type: 'bool',
header: 'optional',
desc: 'Disables the button if set to true.'
},
{
name: 'iconClassName',
type: 'string',
Expand Down
1 change: 1 addition & 0 deletions src/floating-action-button.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var RaisedButton = React.createClass({
},

propTypes: {
disabled: React.PropTypes.bool,
iconClassName: React.PropTypes.string,
iconStyle: React.PropTypes.object,
mini: React.PropTypes.bool,
Expand Down
1 change: 1 addition & 0 deletions src/raised-button.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ var RaisedButton = React.createClass({

propTypes: {
className: React.PropTypes.string,
disabled: React.PropTypes.bool,
label: function(props, propName, componentName){
if (!props.children && !props.label) {
return new Error('Warning: Required prop `label` or `children` was not specified in `'+ componentName + '`.')
Expand Down