v6.9.2

Clean up revert (#1263 )
6.9.1
2026-08-19 08:20:30 +00:00 · 2019-02-12 10:23:50 -07:00 · 2019-02-12 09:47:19 -07:00 · 2019-02-11 09:40:22 -07:00 · 2019-02-07 10:05:54 -07:00 · 2019-02-05 10:42:28 -07:00
4 changed files with 124 additions and 70 deletions
@@ -52,19 +52,77 @@

 ## Sponsors

-|                                                                                                                                                     |                                                                                                                                                                                 |
-| --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [![Platinum Sponsors](https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/platinum.png)](https://patreon.com/tannerlinsley) | [![Retool](https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/sponsor-retool.png)](https://tryretool.com/?utm_source=sponsor&utm_campaign=react_table) |
+**React Table v7** is mostly planned and I (@tannerlinsley) am looking for Patreon support to make it a reality. It will require a decent time commitment on my part to not only implement it, but also help people migrate and continue to maintain it. If you would like to contribute to my Patreon goal for v7 and beyond, [visit my Patreon and help me out!](https://patreon.com/tannerlinsley).

-|                                                                                                                                             |                                                                                                                                                  |                                                                                                                                                  |
-| ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------ |
-| [![Gold Sponsors](https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/gold.png)](https://patreon.com/tannerlinsley) | [![Retool](https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/gold-placeholder.png)](https://patreon.com/tannerlinsley) | [![Retool](https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/gold-placeholder.png)](https://patreon.com/tannerlinsley) |
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://patreon.com/tannerlinsley" target="_blank">
+          <img src="https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/platinum.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://tryretool.com/?utm_source=sponsor&utm_campaign=react_table" target="_blank">
+          <img src="https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/sponsor-retool.png">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>

-|                                                                                                                                                 |                                                                                                                                                    |                                                                                                                                                    |                                                                                                                                                    |
-| ----------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [![Silver Sponsors](https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/silver.png)](https://patreon.com/tannerlinsley) | [![Retool](https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/silver-placeholder.png)](https://patreon.com/tannerlinsley) | [![Retool](https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/silver-placeholder.png)](https://patreon.com/tannerlinsley) | [![Retool](https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/silver-placeholder.png)](https://patreon.com/tannerlinsley) |
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://patreon.com/tannerlinsley" target="_blank">
+          <img src="https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/gold.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://tryretool.com/?utm_source=sponsor&utm_campaign=react_table" target="_blank">
+          <img src="https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/gold-placeholder.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://tryretool.com/?utm_source=sponsor&utm_campaign=react_table" target="_blank">
+          <img src="https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/gold-placeholder.png">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>

-**React Table v7** is mostly planned and I (@tannerlinsley) am looking for Patreon support to make it a reality. It will require a decent time commitment on my part to not only implement it, but also help people migrate and maintain it. If you would like to contribute to my Patreon goal for v7, [visit my Patreon and help me out!](https://patreon.com/tannerlinsley). Gold
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://patreon.com/tannerlinsley" target="_blank">
+          <img src="https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/silver.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://tryretool.com/?utm_source=sponsor&utm_campaign=react_table" target="_blank">
+          <img src="https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/silver-placeholder.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://tryretool.com/?utm_source=sponsor&utm_campaign=react_table" target="_blank">
+          <img src="https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/silver-placeholder.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://tryretool.com/?utm_source=sponsor&utm_campaign=react_table" target="_blank">
+          <img src="https://raw.githubusercontent.com/tannerlinsley/files/master/images/patreon/silver-placeholder.png">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+## Issues, Questions and Support
+
+Github issues are temporarily disabled until v7 is out. Most if not all issues that were or will be opened are likely to be resolved or uneccessary after v7 is released (mostly due to the headless approach of the new component). If you have an issue or a question, feel free to use the [React Table Spectrum Community/Forum](https://spectrum.chat/react-table)!

 ## Table of Contents

@@ -1,6 +1,6 @@
 {
  "name": "react-table",
-  "version": "6.8.7",
+  "version": "6.9.2",
  "description": "A fast, lightweight, opinionated table and datagrid built on React",
  "license": "MIT",
  "homepage": "https://github.com/react-tools/react-table#readme",
@@ -257,12 +257,8 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
    }

    const makeHeaderGroups = () => {
-      const theadGroupProps = _.splitProps(
-        getTheadGroupProps(finalState, undefined, undefined, this)
-      )
-      const theadGroupTrProps = _.splitProps(
-        getTheadGroupTrProps(finalState, undefined, undefined, this)
-      )
+      const theadGroupProps = _.splitProps(getTheadGroupProps(finalState, undefined, undefined, this))
+      const theadGroupTrProps = _.splitProps(getTheadGroupTrProps(finalState, undefined, undefined, this))
      return (
        <TheadComponent
          className={classnames('-headerGroups', theadGroupProps.className)}
@@ -665,11 +661,14 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
          {rowInfo.subRows &&
            isExpanded &&
            rowInfo.subRows.map((d, i) => makePageRow(d, i, rowInfo.nestingPath))}
-          {SubComponent && !rowInfo.subRows && isExpanded && SubComponent(rowInfo, () => {
-            const newExpanded = _.clone(expanded)
+          {SubComponent &&
+            !rowInfo.subRows &&
+            isExpanded &&
+            SubComponent(rowInfo, () => {
+              const newExpanded = _.clone(expanded)

-            _.set(newExpanded, cellInfo.nestingPath, false)
-          })}
+              _.set(newExpanded, rowInfo.nestingPath, false)
+            })}
        </TrGroupComponent>
      )
    }
@@ -797,7 +796,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
      )
    }

-    const makePagination = (isTop) => {
+    const makePagination = isTop => {
      const paginationProps = _.splitProps(
        getPaginationProps(finalState, undefined, undefined, this)
      )
@@ -817,50 +816,48 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
      )
    }

-    const makeTable = () => {
-      return (
-        <div
-          className={classnames('ReactTable', className, rootProps.className)}
-          style={{
-            ...style,
-            ...rootProps.style,
-          }}
-          {...rootProps.rest}
+    const makeTable = () => (
+      <div
+        className={classnames('ReactTable', className, rootProps.className)}
+        style={{
+          ...style,
+          ...rootProps.style,
+        }}
+        {...rootProps.rest}
+      >
+        {showPagination && showPaginationTop ? (
+          <div className="pagination-top">{makePagination(true)}</div>
+        ) : null}
+        <TableComponent
+          className={classnames(tableProps.className, currentlyResizing ? 'rt-resizing' : '')}
+          style={tableProps.style}
+          {...tableProps.rest}
        >
-          {showPagination && showPaginationTop ? (
-            <div className="pagination-top">{makePagination(true)}</div>
-          ) : null}
-          <TableComponent
-            className={classnames(tableProps.className, currentlyResizing ? 'rt-resizing' : '')}
-            style={tableProps.style}
-            {...tableProps.rest}
+          {hasHeaderGroups ? makeHeaderGroups() : null}
+          {makeHeaders()}
+          {hasFilters ? makeFilters() : null}
+          <TbodyComponent
+            className={classnames(tBodyProps.className)}
+            style={{
+              ...tBodyProps.style,
+              minWidth: `${rowMinWidth}px`,
+            }}
+            {...tBodyProps.rest}
          >
-            {hasHeaderGroups ? makeHeaderGroups() : null}
-            {makeHeaders()}
-            {hasFilters ? makeFilters() : null}
-            <TbodyComponent
-              className={classnames(tBodyProps.className)}
-              style={{
-                ...tBodyProps.style,
-                minWidth: `${rowMinWidth}px`,
-              }}
-              {...tBodyProps.rest}
-            >
-              {pageRows.map((d, i) => makePageRow(d, i))}
-              {padRows.map(makePadRow)}
-            </TbodyComponent>
-            {hasColumnFooter ? makeColumnFooters() : null}
-          </TableComponent>
-          {showPagination && showPaginationBottom ? (
-            <div className="pagination-bottom">{makePagination(false)}</div>
-          ) : null}
-          {!pageRows.length && (
-            <NoDataComponent {...noDataProps}>{_.normalizeComponent(noDataText)}</NoDataComponent>
-          )}
-          <LoadingComponent loading={loading} loadingText={loadingText} {...loadingProps} />
-        </div>
-      )
-    }
+            {pageRows.map((d, i) => makePageRow(d, i))}
+            {padRows.map(makePadRow)}
+          </TbodyComponent>
+          {hasColumnFooter ? makeColumnFooters() : null}
+        </TableComponent>
+        {showPagination && showPaginationBottom ? (
+          <div className="pagination-bottom">{makePagination(false)}</div>
+        ) : null}
+        {!pageRows.length && (
+          <NoDataComponent {...noDataProps}>{_.normalizeComponent(noDataText)}</NoDataComponent>
+        )}
+        <LoadingComponent loading={loading} loadingText={loadingText} {...loadingProps} />
+      </div>
+    )

    // childProps are optionally passed to a function-as-a-child
    return children ? children(finalState, makeTable, this) : makeTable()
@@ -30,7 +30,7 @@ export default Base =>
        SubComponent,
      } = newState

-      // Determine Header Groups
+      // Determine if there are Header Groups
      let hasHeaderGroups = false
      columns.forEach(column => {
        if (column.columns) {
@@ -43,11 +43,10 @@ export default Base =>
      let expanderColumn = columns.find(
        col => col.expander || (col.columns && col.columns.some(col2 => col2.expander))
      )
-      // The actual expander might be in the columns field of a group column
+
      if (expanderColumn && !expanderColumn.expander) {
        expanderColumn = expanderColumn.columns.find(col => col.expander)
      }
-
      // If we have SubComponent's we need to make sure we have an expander column
      if (SubComponent && !expanderColumn) {
        expanderColumn = { expander: true }
@@ -204,7 +203,7 @@ export default Base =>
        currentSpan = []
      }

-      // Build flast list of allVisibleColumns and HeaderGroups
+      // Build flat list of allVisibleColumns and HeaderGroups
      visibleColumns.forEach(column => {
        if (column.columns) {
          allVisibleColumns = allVisibleColumns.concat(column.columns)
@@ -323,7 +322,7 @@ export default Base =>
        sortedData: manual
          ? resolvedData
          : this.sortData(
-            this.filterData(resolvedData, filtered, defaultFilterMethod, allDecoratedColumns),
+            this.filterData(resolvedData, filtered, defaultFilterMethod, allVisibleColumns),
            sorted,
            sortMethodsByColumnID
          ),
@@ -337,7 +336,7 @@ export default Base =>
        page: this.getStateOrProp('page'),
        pageSize: this.getStateOrProp('pageSize'),
        filter: this.getStateOrProp('filter'),
-      };
+      }

      this.props.onFetchData(currentState, this)
    }
Author	SHA1	Message	Date
Tanner Linsley	e42f1b93ba	v6.9.2	2019-02-12 10:23:50 -07:00
Weilin ShiandTanner Linsley	b17bebb546	Clean up revert (#1263 )	2019-02-12 09:47:19 -07:00
Tanner Linsley	71e2654156	6.9.1	2019-02-11 09:40:22 -07:00
Jan BauerandTanner Linsley	82cf099d80	fix typo in methods.js (#1258 ) https://github.com/tannerlinsley/react-table/issues/1257	2019-02-07 10:05:54 -07:00
John MaguireandTanner Linsley	410417d067	revert 3baa7139fbb5cf5f706ec228036b0e2eac806113 (#1249 )	2019-02-05 10:42:28 -07:00
Tanner Linsley	73b4869329	Update README.md	2019-01-31 12:33:23 -07:00
Tanner Linsley	3190047284	Update README.md	2019-01-31 12:18:45 -07:00
Tanner Linsley	00efc98779	Fix linting, update Readme	2019-01-31 12:13:34 -07:00
Tanner Linsley	379d9e11d5	v6.9.0	2019-01-31 10:18:22 -07:00
John MaguireandTanner Linsley	3fff682578	apply @twheys PR #1077 as patch and update Array.concat to [].concat (#1241 )	2019-01-31 10:15:09 -07:00