Skip to content

[v4] Table.(Editable/SelectMenu)Cell Fixes #284

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

Merged
jeroenransijn merged 2 commits into from
Aug 14, 2018
Merged

[v4] Table.(Editable/SelectMenu)Cell Fixes #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb41d1
fix size and isSelectable={true}
jeroenransijn Aug 14, 2018
a631973
fixes to size and isSelectable={true}
jeroenransijn Aug 14, 2018
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
3 changes: 1 addition & 2 deletions src/table/src/EditableCell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class EditableCell extends React.PureComponent {
* Makes the TableCell focusable.
* Will add tabIndex={-1 || this.props.tabIndex}.
*/
isSelectable: PropTypes.bool,
isSelectable: PropTypes.bool.isRequired,

/**
* When true, the cell can't be edited.
Expand Down Expand Up @@ -147,7 +147,6 @@ class EditableCell extends React.PureComponent {
onClick={this.handleClick}
onDoubleClick={this.handleDoubleClick}
onKeyDown={this.handleKeyDown}
size={size}
cursor={disabled ? 'not-allowed' : isSelectable ? 'default' : 'text'}
textProps={{
size,
Expand Down
6 changes: 3 additions & 3 deletions src/table/src/SelectMenuCell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SelectMenuCell extends React.PureComponent {
* Makes the TableCell focusable.
* Will add tabIndex={-1 || this.props.tabIndex}.
*/
isSelectable: PropTypes.bool,
isSelectable: PropTypes.bool.isRequired,

/**
* When true, the cell can't be edited.
Expand All @@ -41,7 +41,8 @@ class SelectMenuCell extends React.PureComponent {
}

static defaultProps = {
size: 300
size: 300,
isSelectable: true
}

state = {
Expand Down Expand Up @@ -135,7 +136,6 @@ class SelectMenuCell extends React.PureComponent {
}
aria-haspopup
aria-expanded={isShown}
size={size}
cursor={
disabled ? 'not-allowed' : isSelectable ? 'default' : 'text'
}
Expand Down