diff --git a/README.md b/README.md index b031596..07b5197 100644 --- a/README.md +++ b/README.md @@ -164,6 +164,7 @@ These are all of the available props (and their default values) for the main ` this.resizeColumnStart(column, e, false)} onTouchStart={e => this.resizeColumnStart(column, e, true)} @@ -312,6 +314,8 @@ export default class ReactTable extends Methods(Lifecycle(Component)) { /> ) : null + const isSortable = _.getFirstDefined(column.sortable, sortable, false) + return ( { - column.sortable && this.sortColumn(column, e.shiftKey) + isSortable && this.sortColumn(column, e.shiftKey) }} {...rest} > @@ -522,11 +526,11 @@ export default class ReactTable extends Methods(Lifecycle(Component)) { const ResolvedExpanderComponent = column.Expander || ExpanderComponent const ResolvedPivotValueComponent = column.PivotValue || PivotValueComponent const DefaultResolvedPivotComponent = PivotComponent || (props => ( -
- - -
- )) +
+ + +
+ )) const ResolvedPivotComponent = column.Pivot || DefaultResolvedPivotComponent // Is this cell expandable? diff --git a/stories/Filtering.js b/stories/Filtering.js index b5c40d0..735082f 100644 --- a/stories/Filtering.js +++ b/stories/Filtering.js @@ -28,7 +28,9 @@ class Story extends React.Component { collapseOnPageChange: true, collapseOnDataChange: true, freezeWhenExpanded: false, - showFilters: true + showFilters: true, + sortable: true, + resizable: true }, data: data } diff --git a/stories/SubComponents.js b/stories/SubComponents.js index 6442879..163c5e7 100644 --- a/stories/SubComponents.js +++ b/stories/SubComponents.js @@ -26,7 +26,9 @@ class Story extends React.Component { collapseOnPageChange: true, collapseOnDataChange: true, freezeWhenExpanded: false, - showFilters: false + showFilters: false, + sortable: true, + resizable: true }, data: data }