Skip to content

Commit 60ec8af

Browse files
authored
Merge pull request #40 from easeq/master
0.6.4
2 parents db86e63 + 02f14ec commit 60ec8af

File tree

3 files changed

+43
-16
lines changed

3 files changed

+43
-16
lines changed

package-lock.json

Lines changed: 29 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@flipbyte/redux-datatable",
3-
"version": "0.6.3",
3+
"version": "0.6.4",
44
"description": "React-Redux data table",
55
"main": "lib/index.js",
66
"module": "es/index.js",
@@ -25,7 +25,7 @@
2525
"react-dom": "^16.8.6",
2626
"rxjs": "^6.4.0",
2727
"prop-types": "^15.6.2",
28-
"react-redux": "^6.0.1",
28+
"react-redux": "^7.1.0",
2929
"redux": "^4.0.1",
3030
"styled-components": "^4.2.0",
3131
"redux-observable": "^1.1.0",
@@ -47,7 +47,7 @@
4747
"path-to-regexp": "^3.0.0",
4848
"react": "^16.8.6",
4949
"react-dom": "^16.8.6",
50-
"react-redux": "^6.0.1",
50+
"react-redux": "^7.1.0",
5151
"redux": "^4.0.1",
5252
"redux-logger": "^3.0.6",
5353
"redux-observable": "^1.1.0",

src/createTable.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import _ from 'lodash';
2-
import React, { useState, useEffect } from 'react';
2+
import React, { useState, useEffect, useMemo } from 'react';
33
import { connect } from 'react-redux';
44

55
import Layout from './containers/Layout';
@@ -38,17 +38,21 @@ const ReduxDatatable = ({ config = {}, reducerName, tableData = {}, action, thun
3838
columns: [ visibleColumnIds, setVisibleColumnIds ],
3939
editing: [ isEditing, setIsEditing ],
4040
printing: [ isPrinting, setIsPrinting ],
41-
paginationProps: calculatePaginationProps(tableData.query, config.components.Limiter.default || 10),
4241
minWidth,
4342
state,
4443
scroller: [ scrollData, setScrollData ],
4544
width: [ tableWidth, setTableWidth ],
46-
visibleColumns: visibleColumnIds.reduce((result, currentIndex) => {
47-
const { [currentIndex]: column } = columns;
48-
return [ ...result, column ];
49-
}, [])
45+
paginationProps: useMemo(() => (
46+
calculatePaginationProps(tableData.query, config.components.Limiter.default || 10)
47+
), [ tableData.query ]),
48+
visibleColumns: useMemo(() => (
49+
visibleColumnIds.reduce((result, currentIndex) => {
50+
const { [currentIndex]: column } = columns;
51+
return [ ...result, column ];
52+
}, [])
53+
), [ visibleColumnIds ])
5054
};
51-
55+
5256
// Fetch data and populate table on first load.
5357
useEffect(() => {
5458
loadData();

0 commit comments

Comments
 (0)