test(usegroupby/useexpanded): improved tests for useGroupBy/useExpanded

This commit is contained in:
tannerlinsley
2019-07-30 17:00:59 -06:00
parent 12e7b3220d
commit 2c5610d885
24 changed files with 11620 additions and 16 deletions

View File

@@ -0,0 +1,4 @@
{
"presets": ["react-app"],
"plugins": ["styled-components"]
}

View File

@@ -0,0 +1 @@
SKIP_PREFLIGHT_CHECK=true

View File

@@ -0,0 +1,7 @@
{
"extends": ["react-app", "prettier"],
"rules": {
// "eqeqeq": 0,
// "jsx-a11y/anchor-is-valid": 0
}
}

View File

@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
/node_modules
/.pnp
.pnp.js
# testing
/coverage
# production
/build
# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
npm-debug.log*
yarn-debug.log*
yarn-error.log*

View File

@@ -0,0 +1,29 @@
const path = require('path')
const resolveFrom = require('resolve-from')
const fixLinkedDependencies = config => {
config.resolve = {
...config.resolve,
alias: {
...config.resolve.alias,
react$: resolveFrom(path.resolve('node_modules'), 'react'),
'react-dom$': resolveFrom(path.resolve('node_modules'), 'react-dom'),
},
}
return config
}
const includeSrcDirectory = config => {
config.resolve = {
...config.resolve,
modules: [path.resolve('src'), ...config.resolve.modules],
}
return config
}
module.exports = [
['use-babel-config', '.babelrc'],
['use-eslint-config', '.eslintrc'],
fixLinkedDependencies,
// includeSrcDirectory,
]

View File

@@ -0,0 +1,6 @@
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app) and Rescripts.
You can:
- [Open this example in a new CodeSandbox](https://codesandbox.io/s/github/tannerlinsley/react-table/tree/master/examples/basic)
- `yarn` and `yarn start` to run and edit the example

View File

@@ -0,0 +1,35 @@
{
"private": true,
"scripts": {
"start": "rescripts start",
"build": "rescripts build",
"test": "rescripts test",
"eject": "rescripts eject"
},
"dependencies": {
"namor": "^1.1.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-scripts": "3.0.1",
"react-table": "next",
"styled-components": "^4.3.2"
},
"devDependencies": {
"@rescripts/cli": "^0.0.11",
"@rescripts/rescript-use-babel-config": "^0.0.8",
"@rescripts/rescript-use-eslint-config": "^0.0.9",
"babel-eslint": "10.0.1"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@@ -0,0 +1,38 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>

View File

@@ -0,0 +1,15 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}

View File

@@ -0,0 +1,168 @@
import React from 'react'
import styled from 'styled-components'
import { useTable, useExpanded } from 'react-table'
import makeData from './makeData'
const Styles = styled.div`
padding: 1rem;
table {
border-spacing: 0;
border: 1px solid black;
tr {
:last-child {
td {
border-bottom: 0;
}
}
}
th,
td {
margin: 0;
padding: 0.5rem;
border-bottom: 1px solid black;
border-right: 1px solid black;
:last-child {
border-right: 0;
}
}
}
`
function Table({ columns: userColumns, data, SubComponent }) {
const {
getTableProps,
headerGroups,
rows,
prepareRow,
columns,
state: [{ expanded }],
} = useTable(
{
columns: userColumns,
data,
},
useExpanded
)
return (
<>
<pre>
<code>{JSON.stringify({ expanded }, null, 2)}</code>
</pre>
<table {...getTableProps()}>
<thead>
{headerGroups.map(headerGroup => (
<tr {...headerGroup.getHeaderGroupProps()}>
{headerGroup.headers.map(column => (
<th {...column.getHeaderProps()}>{column.render('Header')}</th>
))}
</tr>
))}
</thead>
<tbody>
{rows.map(
(row, i) =>
prepareRow(row) || (
<>
<tr {...row.getRowProps()}>
{row.cells.map(cell => {
return (
<td {...cell.getCellProps()}>{cell.render('Cell')}</td>
)
})}
</tr>
{!row.subRows.length && row.isExpanded ? (
<tr>
<td colSpan={columns.length}>{SubComponent({ row })}</td>
</tr>
) : null}
</>
)
)}
</tbody>
</table>
<br />
<div>Showing the first 20 results of {rows.length} rows</div>
</>
)
}
function App() {
const columns = React.useMemo(
() => [
{
Header: () => null,
id: 'expander',
Cell: ({ row }) => (
<span
style={{
cursor: 'pointer',
paddingLeft: `${row.depth * 2}rem`,
}}
onClick={() => row.toggleExpanded()}
>
{row.isExpanded ? '👇' : '👉'}
</span>
),
},
{
Header: 'Name',
columns: [
{
Header: 'First Name',
accessor: 'firstName',
},
{
Header: 'Last Name',
accessor: 'lastName',
},
],
},
{
Header: 'Info',
columns: [
{
Header: 'Age',
accessor: 'age',
},
{
Header: 'Visits',
accessor: 'visits',
},
{
Header: 'Status',
accessor: 'status',
},
{
Header: 'Profile Progress',
accessor: 'progress',
},
],
},
],
[]
)
const data = React.useMemo(() => makeData(5, 5, 5), [])
return (
<Styles>
<Table
columns={columns}
data={data}
SubComponent={({ row }) => (
<pre>
<code>{JSON.stringify({ values: row.values }, null, 2)}</code>
</pre>
)}
/>
</Styles>
)
}
export default App

View File

@@ -0,0 +1,9 @@
import React from 'react'
import ReactDOM from 'react-dom'
import App from './App'
it('renders without crashing', () => {
const div = document.createElement('div')
ReactDOM.render(<App />, div)
ReactDOM.unmountComponentAtNode(div)
})

View File

@@ -0,0 +1,13 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}

View File

@@ -0,0 +1,12 @@
import React from 'react'
import ReactDOM from 'react-dom'
import './index.css'
import App from './App'
import * as serviceWorker from './serviceWorker'
ReactDOM.render(<App />, document.getElementById('root'))
// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://bit.ly/CRA-PWA
serviceWorker.unregister()

View File

@@ -0,0 +1,40 @@
import namor from 'namor'
const range = len => {
const arr = []
for (let i = 0; i < len; i++) {
arr.push(i)
}
return arr
}
const newPerson = () => {
const statusChance = Math.random()
return {
firstName: namor.generate({ words: 1, numbers: 0 }),
lastName: namor.generate({ words: 1, numbers: 0 }),
age: Math.floor(Math.random() * 30),
visits: Math.floor(Math.random() * 100),
progress: Math.floor(Math.random() * 100),
status:
statusChance > 0.66
? 'relationship'
: statusChance > 0.33
? 'complicated'
: 'single',
}
}
export default function makeData(...lens) {
const makeDataLevel = (depth = 0) => {
const len = lens[depth]
return range(len).map(d => {
return {
...newPerson(),
subRows: lens[depth + 1] ? makeDataLevel(depth + 1) : undefined,
}
})
}
return makeDataLevel()
}

View File

@@ -0,0 +1,135 @@
// This optional code is used to register a service worker.
// register() is not called by default.
// This lets the app load faster on subsequent visits in production, and gives
// it offline capabilities. However, it also means that developers (and users)
// will only see deployed updates on subsequent visits to a page, after all the
// existing tabs open on the page have been closed, since previously cached
// resources are updated in the background.
// To learn more about the benefits of this model and instructions on how to
// opt-in, read https://bit.ly/CRA-PWA
const isLocalhost = Boolean(
window.location.hostname === 'localhost' ||
// [::1] is the IPv6 localhost address.
window.location.hostname === '[::1]' ||
// 127.0.0.1/8 is considered localhost for IPv4.
window.location.hostname.match(
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
)
)
export function register(config) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href)
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
return
}
window.addEventListener('load', () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`
if (isLocalhost) {
// This is running on localhost. Let's check if a service worker still exists or not.
checkValidServiceWorker(swUrl, config)
// Add some additional logging to localhost, pointing developers to the
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
'This web app is being served cache-first by a service ' +
'worker. To learn more, visit https://bit.ly/CRA-PWA'
)
})
} else {
// Is not localhost. Just register service worker
registerValidSW(swUrl, config)
}
})
}
}
function registerValidSW(swUrl, config) {
navigator.serviceWorker
.register(swUrl)
.then(registration => {
registration.onupdatefound = () => {
const installingWorker = registration.installing
if (installingWorker == null) {
return
}
installingWorker.onstatechange = () => {
if (installingWorker.state === 'installed') {
if (navigator.serviceWorker.controller) {
// At this point, the updated precached content has been fetched,
// but the previous service worker will still serve the older
// content until all client tabs are closed.
console.log(
'New content is available and will be used when all ' +
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
)
// Execute callback
if (config && config.onUpdate) {
config.onUpdate(registration)
}
} else {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log('Content is cached for offline use.')
// Execute callback
if (config && config.onSuccess) {
config.onSuccess(registration)
}
}
}
}
}
})
.catch(error => {
console.error('Error during service worker registration:', error)
})
}
function checkValidServiceWorker(swUrl, config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl)
.then(response => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get('content-type')
if (
response.status === 404 ||
(contentType != null && contentType.indexOf('javascript') === -1)
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then(registration => {
registration.unregister().then(() => {
window.location.reload()
})
})
} else {
// Service worker found. Proceed as normal.
registerValidSW(swUrl, config)
}
})
.catch(() => {
console.log(
'No internet connection found. App is running in offline mode.'
)
})
}
export function unregister() {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.ready.then(registration => {
registration.unregister()
})
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -142,19 +142,24 @@ export const useTable = (props, ...plugins) => {
() => {
if (debug) console.time('getAccessedRows')
// Access the row's data
const accessRow = (originalRow, i, depth = 0) => {
const accessRow = (originalRow, i, depth = 0, parentPath = []) => {
// Keep the original reference around
const original = originalRow
// Make the new path for the row
const path = [...parentPath, i]
// Process any subRows
const subRows = originalRow[subRowsKey]
? originalRow[subRowsKey].map((d, i) => accessRow(d, i, depth + 1))
? originalRow[subRowsKey].map((d, i) =>
accessRow(d, i, depth + 1, path)
)
: []
const row = {
original,
index: i,
path: [i], // used to create a key for each row even if not nested
path, // used to create a key for each row even if not nested
subRows,
depth,
cells: [{}], // This is a dummy cell
@@ -316,10 +321,9 @@ export const useTable = (props, ...plugins) => {
// any rows the user wishes to be displayed.
instanceRef.current.prepareRow = row => {
const { path } = row
row.getRowProps = props =>
mergeProps(
{ key: ['row', ...path].join('_') },
{ key: ['row', ...row.path].join('_') },
applyPropHooks(
instanceRef.current.hooks.getRowProps,
row,
@@ -342,7 +346,7 @@ export const useTable = (props, ...plugins) => {
// Give each cell a getCellProps base
cell.getCellProps = props => {
const columnPathStr = [...path, column.id].join('_')
const columnPathStr = [...row.path, column.id].join('_')
return mergeProps(
{
key: ['cell', columnPathStr].join('_'),

View File

@@ -0,0 +1,714 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`renders an expandable table 1`] = `
"Snapshot Diff:
- First value
+ Second value
@@ -1,10 +1,12 @@
<DocumentFragment>
<pre>
<code>
{
- \\"expanded\\": {}
+ \\"expanded\\": {
+ \\"0\\": true
+ }
}
</code>
</pre>
<table
class=\\"\\"
@@ -82,10 +84,53 @@
<td
class=\\"\\"
>
<span
style=\\"cursor: pointer; padding-left: 0rem;\\"
+ >
+ 👇
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ tanner
+ </td>
+ <td
+ class=\\"\\"
+ >
+ linsley
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 29
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 100
+ </td>
+ <td
+ class=\\"\\"
+ >
+ In Relationship
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 50
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 2rem;\\"
>
👉
</span>
</td>
<td
@@ -115,10 +160,139 @@
</td>
<td
class=\\"\\"
>
50
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 2rem;\\"
+ >
+ 👉
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ derek
+ </td>
+ <td
+ class=\\"\\"
+ >
+ perkins
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 40
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 40
+ </td>
+ <td
+ class=\\"\\"
+ >
+ Single
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 80
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 2rem;\\"
+ >
+ 👉
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ joe
+ </td>
+ <td
+ class=\\"\\"
+ >
+ bergevin
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 45
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 20
+ </td>
+ <td
+ class=\\"\\"
+ >
+ Complicated
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 10
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 2rem;\\"
+ >
+ 👉
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ jaylen
+ </td>
+ <td
+ class=\\"\\"
+ >
+ linsley
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 26
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 99
+ </td>
+ <td
+ class=\\"\\"
+ >
+ In Relationship
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 70
</td>
</tr>
<tr
class=\\"\\"
>"
`;
exports[`renders an expandable table 2`] = `
"Snapshot Diff:
- First value
+ Second value
@@ -1,11 +1,13 @@
<DocumentFragment>
<pre>
<code>
{
\\"expanded\\": {
- \\"0\\": true
+ \\"0\\": {
+ \\"0\\": true
+ }
}
}
</code>
</pre>
<table
@@ -127,10 +129,53 @@
<td
class=\\"\\"
>
<span
style=\\"cursor: pointer; padding-left: 2rem;\\"
+ >
+ 👇
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ tanner
+ </td>
+ <td
+ class=\\"\\"
+ >
+ linsley
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 29
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 100
+ </td>
+ <td
+ class=\\"\\"
+ >
+ In Relationship
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 50
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 4rem;\\"
>
👉
</span>
</td>
<td
@@ -160,10 +205,139 @@
</td>
<td
class=\\"\\"
>
50
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 4rem;\\"
+ >
+ 👉
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ derek
+ </td>
+ <td
+ class=\\"\\"
+ >
+ perkins
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 40
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 40
+ </td>
+ <td
+ class=\\"\\"
+ >
+ Single
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 80
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 4rem;\\"
+ >
+ 👉
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ joe
+ </td>
+ <td
+ class=\\"\\"
+ >
+ bergevin
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 45
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 20
+ </td>
+ <td
+ class=\\"\\"
+ >
+ Complicated
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 10
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 4rem;\\"
+ >
+ 👉
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ jaylen
+ </td>
+ <td
+ class=\\"\\"
+ >
+ linsley
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 26
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 99
+ </td>
+ <td
+ class=\\"\\"
+ >
+ In Relationship
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 70
</td>
</tr>
<tr
class=\\"\\"
>"
`;
exports[`renders an expandable table 3`] = `
"Snapshot Diff:
- First value
+ Second value
@@ -2,11 +2,13 @@
<pre>
<code>
{
\\"expanded\\": {
\\"0\\": {
- \\"0\\": true
+ \\"0\\": {
+ \\"0\\": true
+ }
}
}
}
</code>
</pre>
@@ -172,10 +174,53 @@
<td
class=\\"\\"
>
<span
style=\\"cursor: pointer; padding-left: 4rem;\\"
+ >
+ 👇
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ tanner
+ </td>
+ <td
+ class=\\"\\"
+ >
+ linsley
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 29
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 100
+ </td>
+ <td
+ class=\\"\\"
+ >
+ In Relationship
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 50
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 6rem;\\"
>
👉
</span>
</td>
<td
@@ -205,10 +250,139 @@
</td>
<td
class=\\"\\"
>
50
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 6rem;\\"
+ >
+ 👉
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ derek
+ </td>
+ <td
+ class=\\"\\"
+ >
+ perkins
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 40
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 40
+ </td>
+ <td
+ class=\\"\\"
+ >
+ Single
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 80
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 6rem;\\"
+ >
+ 👉
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ joe
+ </td>
+ <td
+ class=\\"\\"
+ >
+ bergevin
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 45
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 20
+ </td>
+ <td
+ class=\\"\\"
+ >
+ Complicated
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 10
+ </td>
+ </tr>
+ <tr
+ class=\\"\\"
+ >
+ <td
+ class=\\"\\"
+ >
+ <span
+ style=\\"cursor: pointer; padding-left: 6rem;\\"
+ >
+ 👉
+ </span>
+ </td>
+ <td
+ class=\\"\\"
+ >
+ jaylen
+ </td>
+ <td
+ class=\\"\\"
+ >
+ linsley
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 26
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 99
+ </td>
+ <td
+ class=\\"\\"
+ >
+ In Relationship
+ </td>
+ <td
+ class=\\"\\"
+ >
+ 70
</td>
</tr>
<tr
class=\\"\\"
>"
`;
exports[`renders an expandable table 4`] = `
"Snapshot Diff:
- First value
+ Second value
@@ -3,11 +3,13 @@
<code>
{
\\"expanded\\": {
\\"0\\": {
\\"0\\": {
- \\"0\\": true
+ \\"0\\": {
+ \\"0\\": true
+ }
}
}
}
}
</code>
@@ -218,11 +220,11 @@
class=\\"\\"
>
<span
style=\\"cursor: pointer; padding-left: 6rem;\\"
>
- 👉
+ 👇
</span>
</td>
<td
class=\\"\\"
>
@@ -250,10 +252,30 @@
</td>
<td
class=\\"\\"
>
50
+ </td>
+ </tr>
+ <tr>
+ <td
+ colspan=\\"7\\"
+ >
+ <pre>
+ <code>
+ {
+ \\"values\\": {
+ \\"firstName\\": \\"tanner\\",
+ \\"lastName\\": \\"linsley\\",
+ \\"age\\": 29,
+ \\"visits\\": 100,
+ \\"status\\": \\"In Relationship\\",
+ \\"progress\\": 50
+ }
+ }
+ </code>
+ </pre>
</td>
</tr>
<tr
class=\\"\\"
>"
`;

View File

@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`renders a filterable table 1`] = `
exports[`renders a groupable table 1`] = `
"Snapshot Diff:
- First value
+ Second value
@@ -207,7 +207,7 @@ exports[`renders a filterable table 1`] = `
</DocumentFragment>"
`;
exports[`renders a filterable table 2`] = `
exports[`renders a groupable table 2`] = `
"Snapshot Diff:
- First value
+ Second value

View File

@@ -0,0 +1,207 @@
import '@testing-library/react/cleanup-after-each'
import '@testing-library/jest-dom/extend-expect'
import React from 'react'
import { render, fireEvent } from '@testing-library/react'
import { useTable } from '../../hooks/useTable'
import { useExpanded } from '../useExpanded'
const makeData = () => [
{
firstName: 'tanner',
lastName: 'linsley',
age: 29,
visits: 100,
status: 'In Relationship',
progress: 50,
},
{
firstName: 'derek',
lastName: 'perkins',
age: 40,
visits: 40,
status: 'Single',
progress: 80,
},
{
firstName: 'joe',
lastName: 'bergevin',
age: 45,
visits: 20,
status: 'Complicated',
progress: 10,
},
{
firstName: 'jaylen',
lastName: 'linsley',
age: 26,
visits: 99,
status: 'In Relationship',
progress: 70,
},
]
const data = makeData()
data[0].subRows = makeData()
data[0].subRows[0].subRows = makeData()
data[0].subRows[0].subRows[0].subRows = makeData()
function Table({ columns: userColumns, data, SubComponent }) {
const {
getTableProps,
headerGroups,
rows,
prepareRow,
columns,
state: [{ expanded }],
} = useTable(
{
columns: userColumns,
data,
},
useExpanded
)
return (
<>
<pre>
<code>{JSON.stringify({ expanded }, null, 2)}</code>
</pre>
<table {...getTableProps()}>
<thead>
{headerGroups.map(headerGroup => (
<tr {...headerGroup.getHeaderGroupProps()}>
{headerGroup.headers.map(column => (
<th {...column.getHeaderProps()}>{column.render('Header')}</th>
))}
</tr>
))}
</thead>
<tbody>
{rows.map((row, i) => {
prepareRow(row)
const { key, ...rowProps } = row.getRowProps()
return (
<React.Fragment key={key}>
<tr {...rowProps}>
{row.cells.map(cell => {
return (
<td {...cell.getCellProps()}>{cell.render('Cell')}</td>
)
})}
</tr>
{!row.subRows.length && row.isExpanded ? (
<tr>
<td colSpan={columns.length}>{SubComponent({ row })}</td>
</tr>
) : null}
</React.Fragment>
)
})}
</tbody>
</table>
</>
)
}
function App() {
const columns = React.useMemo(
() => [
{
Header: () => null,
id: 'expander',
Cell: ({ row }) => (
<span
style={{
cursor: 'pointer',
paddingLeft: `${row.depth * 2}rem`,
}}
onClick={() => row.toggleExpanded()}
>
{row.isExpanded ? '👇' : '👉'}
</span>
),
},
{
Header: 'Name',
columns: [
{
Header: 'First Name',
accessor: 'firstName',
},
{
Header: 'Last Name',
accessor: 'lastName',
},
],
},
{
Header: 'Info',
columns: [
{
Header: 'Age',
accessor: 'age',
},
{
Header: 'Visits',
accessor: 'visits',
},
{
Header: 'Status',
accessor: 'status',
},
{
Header: 'Profile Progress',
accessor: 'progress',
},
],
},
],
[]
)
return (
<Table
columns={columns}
data={data}
SubComponent={({ row }) => (
<pre>
<code>{JSON.stringify({ values: row.values }, null, 2)}</code>
</pre>
)}
/>
)
}
test('renders an expandable table', () => {
const { getAllByText, asFragment } = render(<App />)
let expandButtons = getAllByText('👉')
const beforeGrouping = asFragment()
fireEvent.click(expandButtons[0])
const afterGrouping1 = asFragment()
expandButtons = getAllByText('👉')
fireEvent.click(expandButtons[0])
const afterGrouping2 = asFragment()
expandButtons = getAllByText('👉')
fireEvent.click(expandButtons[0])
const afterGrouping3 = asFragment()
expandButtons = getAllByText('👉')
fireEvent.click(expandButtons[0])
const afterGrouping4 = asFragment()
expect(beforeGrouping).toMatchDiffSnapshot(afterGrouping1)
expect(afterGrouping1).toMatchDiffSnapshot(afterGrouping2)
expect(afterGrouping2).toMatchDiffSnapshot(afterGrouping3)
expect(afterGrouping3).toMatchDiffSnapshot(afterGrouping4)
})

View File

@@ -187,7 +187,7 @@ function App() {
return <Table columns={columns} data={data} />
}
test('renders a filterable table', () => {
test('renders a groupable table', () => {
const { getAllByText, asFragment } = render(<App />)
const groupByButtons = getAllByText('👊')

View File

@@ -43,8 +43,7 @@ function useMain(instance) {
}
hooks.prepareRow.push(row => {
const { path } = row
row.toggleExpanded = set => toggleExpandedByPath(path, set)
row.toggleExpanded = set => toggleExpandedByPath(row.path, set)
return row
})
@@ -68,13 +67,13 @@ function useMain(instance) {
row.canExpand = row.subRows && !!row.subRows.length
if (row.isExpanded && row.subRows && row.subRows.length) {
row.subRows.forEach((row, i) => handleRow(row))
row.subRows.forEach(handleRow)
}
return row
}
rows.forEach(row => handleRow(row))
rows.forEach(handleRow)
return expandedRows
},

View File

@@ -23,7 +23,7 @@ export function decorateColumn(column, defaultColumn, parent, depth, index) {
accessor = row => getBy(row, accessorString)
}
if (!id && typeof Header === 'string') {
if (!id && typeof Header === 'string' && Header) {
id = Header
}
@@ -38,8 +38,8 @@ export function decorateColumn(column, defaultColumn, parent, depth, index) {
}
column = {
Header: ({ id }) => id,
Cell: ({ value }) => typeof value !== 'undefined' ? value : '',
Header: () => null,
Cell: ({ value }) => (typeof value !== 'undefined' ? value : ''),
show: true,
...column,
id,