Rename expandedRows->expanded, onExpandRow->onExpanded

src/defaultProps.js

@@ -53,7 +53,7 @@ export default {
   // sorted: [],
   // filtered: [],
   // resizing: [],
-  // expandedRows: {},
+  // expanded: {},
 
   // Controlled State Callbacks
   onExpandSubComponent: undefined,
@@ -62,7 +62,7 @@ export default {
   onSortedChange: undefined,
   onFilteredChange: undefined,
   onResize: undefined,
-  onExpandRow: undefined,
+  onExpanded: undefined,
 
   // Pivoting
   pivotBy: undefined,

src/index.js

@@ -35,7 +35,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
       page: 0,
       pageSize: props.defaultPageSize,
       sorted: props.defaultSorted,
-      expandedRows: props.defaultExpanded,
+      expanded: props.defaultExpanded,
       filtered: props.defaultFiltered,
       resizing: props.defaultResizing,
       currentlyResizing: false,
@@ -95,8 +95,8 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
       resizing,
       pages,
       // Pivoting State
-      expandedRows,
-      onExpandRow,
+      expanded,
+      onExpanded,
       // Components
       TableComponent,
       TheadComponent,
@@ -144,7 +144,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
             _viewIndex: index
           }
           const newPath = path.concat([i])
-          if (rowWithViewIndex[subRowsKey] && _.get(expandedRows, newPath)) {
+          if (rowWithViewIndex[subRowsKey] && _.get(expanded, newPath)) {
             [rowWithViewIndex[subRowsKey], index] = recurseRowsViewIndex(rowWithViewIndex[subRowsKey], newPath, index)
           }
           return rowWithViewIndex
@@ -437,7 +437,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
         groupedByPivot: row[groupedByPivotKey],
         subRows: row[subRowsKey]
       }
-      const isExpanded = _.get(expandedRows, rowInfo.nestingPath)
+      const isExpanded = _.get(expanded, rowInfo.nestingPath)
       const trGroupProps = getTrGroupProps(finalState, rowInfo, undefined, this)
       const trProps = _.splitProps(getTrProps(finalState, rowInfo, undefined, this))
       return (
@@ -497,21 +497,21 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
               let isPreview
 
               const onExpanderClick = (e) => {
-                let newExpandedRows = _.clone(expandedRows)
+                let newExpanded = _.clone(expanded)
                 if (isExpanded) {
-                  newExpandedRows = _.set(newExpandedRows, cellInfo.nestingPath, false)
+                  newExpanded = _.set(newExpanded, cellInfo.nestingPath, false)
                 } else {
-                  newExpandedRows = _.set(newExpandedRows, cellInfo.nestingPath, {})
+                  newExpanded = _.set(newExpanded, cellInfo.nestingPath, {})
                 }
-                if (onExpandRow) {
-                  onExpandRow(newExpandedRows, cellInfo.nestingPath, e)
+                if (onExpanded) {
+                  onExpanded(newExpanded, cellInfo.nestingPath, e)
                 }
-                // If expandedRows is being controlled, don't manage internal state
-                if (this.props.expandedRows) {
+                // If expanded is being controlled, don't manage internal state
+                if (this.props.expanded) {
                   return
                 }
                 return this.setStateWithData({
-                  expandedRows: newExpandedRows
+                  expanded: newExpanded
                 })
               }
 

src/lifecycle.js

@@ -45,9 +45,9 @@ export default Base => class extends Base {
     // If freezeWhenExpanded is set, check for frozen conditions
     if (freezeWhenExpanded) {
       // if any rows are expanded, freeze the existing data and sorting
-      const keys = Object.keys(newResolvedState.expandedRows)
+      const keys = Object.keys(newResolvedState.expanded)
       for (var i = 0; i < keys.length; i++) {
-        if (newResolvedState.expandedRows[keys[i]]) {
+        if (newResolvedState.expanded[keys[i]]) {
           newResolvedState.frozen = true
           break
         }
@@ -70,7 +70,7 @@ export default Base => class extends Base {
         (oldState.showFilters !== newResolvedState.showFilters) ||
         (!newResolvedState.frozen && oldState.resolvedData !== newResolvedState.resolvedData && this.props.collapseOnDataChange)
       ) {
-        newResolvedState.expandedRows = {}
+        newResolvedState.expanded = {}
       }
 
       Object.assign(newResolvedState, this.getSortedData(newResolvedState))

src/methods.js

@@ -413,7 +413,7 @@ export default Base => class extends Base {
     }
     const newState = {page}
     if (collapseOnPageChange) {
-      newState.expandedRows = {}
+      newState.expanded = {}
     }
     this.setStateWithData(newState, () => {
       this.fireFetchData()

stories/ControlledTable.js

@@ -37,7 +37,7 @@ class Story extends React.Component {
       sorted: [],
       page: 0,
       pageSize: 10,
-      expandedRows: {},
+      expanded: {},
       resizing: [],
       filtered: []
     }
@@ -56,14 +56,14 @@ class Story extends React.Component {
             sorted={this.state.sorted}
             page={this.state.page}
             pageSize={this.state.pageSize}
-            expandedRows={this.state.expandedRows}
+            expanded={this.state.expanded}
             resizing={this.state.resizing}
             filtered={this.state.filtered}
             // Callbacks
             onSortedChange={sorted => this.setState({sorted})}
             onPageChange={page => this.setState({page})}
             onPageSizeChange={(pageSize, page) => this.setState({page, pageSize})}
-            onExpandRow={(expandedRows) => this.setState({expandedRows})}
+            onExpanded={(expanded) => this.setState({expanded})}
             onResize={resizing => this.setState({resizing})}
             onFilteredChange={filtered => this.setState({filtered})}
           />