Skip to content

Commit

Permalink
🐛 Fixes react-table selection
Browse files Browse the repository at this point in the history
  • Loading branch information
@dankolbman
dankolbman committed Mar 24, 2019
1 parent 3b460d4 commit f9c247d
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 40 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -28,7 +28,7 @@
"react-redux-form": "^1.16.11",
"react-router-dom": "^4.2.2",
"react-scripts": "1.1.4",
"react-table": "^6.8.6",
"react-table": "^6.9.0",
"react-timeago": "^3.4.3",
"redux": "^4.0.1",
"redux-devtools-extension": "^2.13.7",
Expand Down
4 changes: 3 additions & 1 deletion src/actions/studies.js
View file
Expand Up @@ -127,7 +127,9 @@ export function fetchAllStudies(page, filters) {
};
}

export function toggleStudy(key, shift, row) {
export function toggleStudy(selectedKey, shift, row) {
// Needed because react-table started adding a prefix to ids in 6.9.0
const key = selectedKey.replace('select-', '');
return (dispatch, getState) => {
var selection = getState().studies.selected.items;
const index = selection.indexOf(key);
Expand Down
76 changes: 38 additions & 38 deletions yarn.lock
View file
Expand Up @@ -20,8 +20,8 @@
"@babel/types" "^7.0.0"

"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1":
version "7.4.0"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.0.tgz#d523416573f19aa12784639e631257c7fc58c0aa"
version "7.4.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.2.tgz#f5ab6897320f16decd855eed70b705908a313fe8"
dependencies:
regenerator-runtime "^0.13.2"

Expand Down Expand Up @@ -197,8 +197,8 @@ ant-design-palettes@^1.1.3:
tinycolor2 "^1.4.1"

antd@^3.4.1:
version "3.15.1"
resolved "https://registry.yarnpkg.com/antd/-/antd-3.15.1.tgz#16ce63a2d84a88906e6ece934423871aa67395c5"
version "3.15.2"
resolved "https://registry.yarnpkg.com/antd/-/antd-3.15.2.tgz#5692ed9f7db878b1ec9f0cafcb4027b9cb36c32e"
dependencies:
"@ant-design/icons" "~1.2.0"
"@ant-design/icons-react" "~1.1.2"
Expand Down Expand Up @@ -1395,10 +1395,10 @@ browserslist@^2.1.2, browserslist@^2.5.1:
electron-to-chromium "^1.3.30"

browserslist@^4.4.2:
version "4.5.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.1.tgz#2226cada1947b33f4cfcf7b608dcb519b6128106"
version "4.5.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.2.tgz#36ad281f040af684555a23c780f5c2081c752df0"
dependencies:
caniuse-lite "^1.0.30000949"
caniuse-lite "^1.0.30000951"
electron-to-chromium "^1.3.116"
node-releases "^1.1.11"

Expand Down Expand Up @@ -1517,7 +1517,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
version "1.0.30000951"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000951.tgz#64a5d491c8164a4f81ce9f3ab906b61df9a61b1a"

caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000947, caniuse-lite@^1.0.30000949:
caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000947, caniuse-lite@^1.0.30000951:
version "1.0.30000951"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000951.tgz#c7c2fd4d71080284c8677dd410368df8d83688fe"

Expand Down Expand Up @@ -1590,8 +1590,8 @@ chokidar@^1.6.0:
fsevents "^1.0.0"

chokidar@^2.0.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
version "2.1.5"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
dependencies:
anymatch "^2.0.0"
async-each "^1.0.1"
Expand All @@ -1603,7 +1603,7 @@ chokidar@^2.0.2:
normalize-path "^3.0.0"
path-is-absolute "^1.0.0"
readdirp "^2.2.1"
upath "^1.1.0"
upath "^1.1.1"
optionalDependencies:
fsevents "^1.2.7"

Expand Down Expand Up @@ -2518,8 +2518,8 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.116, electron-to-chromium@^1.3.30:
version "1.3.116"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.116.tgz#1dbfee6a592a0c14ade77dbdfe54fef86387d702"
version "1.3.119"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.119.tgz#9a7770da667252aeb81f667853f67c2b26e00197"

elliptic@^6.0.0:
version "6.4.1"
Expand Down Expand Up @@ -4524,8 +4524,8 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"

js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
version "3.12.2"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
version "3.13.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
Expand Down Expand Up @@ -6230,8 +6230,8 @@ qs@6.5.2, qs@~6.5.2:
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"

qs@^6.4.0, qs@^6.5.1:
version "6.6.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
version "6.7.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"

qs@~6.4.0:
version "6.4.0"
Expand All @@ -6253,8 +6253,8 @@ querystring@0.2.0:
resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"

querystringify@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
version "2.1.1"
resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"

raf@3.4.0:
version "3.4.0"
Expand Down Expand Up @@ -6489,8 +6489,8 @@ rc-notification@~3.3.0:
rc-util "^4.0.4"

rc-pagination@~1.17.7:
version "1.17.8"
resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.17.8.tgz#65583bebe13fffe4de7f418e1a6c86374ceabceb"
version "1.17.10"
resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.17.10.tgz#e5804b15d81dcad5ddf777d5ee3d6f9565594ece"
dependencies:
babel-runtime "6.x"
prop-types "^15.5.7"
Expand Down Expand Up @@ -6738,13 +6738,13 @@ react-dev-utils@^5.0.1:
text-table "0.2.0"

react-dom@^16.4.0, react-dom@^16.4.2:
version "16.8.4"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.4.tgz#1061a8e01a2b3b0c8160037441c3bf00a0e3bc48"
version "16.8.5"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.5.tgz#b3e37d152b49e07faaa8de41fdf562be3463335e"
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.4"
scheduler "^0.13.5"

react-draft-wysiwyg@^1.12.13:
version "1.13.2"
Expand Down Expand Up @@ -6772,8 +6772,8 @@ react-google-login@^5.0.2:
prop-types "^15.6.0"

react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.2:
version "16.8.4"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
version "16.8.5"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.5.tgz#c54ac229dd66b5afe0de5acbe47647c3da692ff8"

react-lazy-load@^3.0.13:
version "3.0.13"
Expand Down Expand Up @@ -6911,7 +6911,7 @@ react-slick@~0.23.2:
prettier "^1.14.3"
resize-observer-polyfill "^1.5.0"

react-table@^6.8.6:
react-table@^6.9.0:
version "6.9.2"
resolved "https://registry.yarnpkg.com/react-table/-/react-table-6.9.2.tgz#6a59adfeb8d5deced288241ed1c7847035b5ec5f"
dependencies:
Expand All @@ -6922,13 +6922,13 @@ react-timeago@^3.4.3:
resolved "https://registry.yarnpkg.com/react-timeago/-/react-timeago-3.4.3.tgz#eb9061eefb044e4a2b09ce8c99d34645b2dbfa25"

react@^16.4.0, react@^16.4.2:
version "16.8.4"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768"
version "16.8.5"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.5.tgz#49be3b655489d74504ad994016407e8a0445de66"
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.4"
scheduler "^0.13.5"

read-cache@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -7090,8 +7090,8 @@ regexpu-core@^2.0.0:
regjsparser "^0.1.4"

registry-auth-token@^3.0.1:
version "3.3.2"
resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
version "3.4.0"
resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
dependencies:
rc "^1.1.6"
safe-buffer "^5.0.1"
Expand Down Expand Up @@ -7379,9 +7379,9 @@ sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"

scheduler@^0.13.4:
version "0.13.4"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298"
scheduler@^0.13.5:
version "0.13.5"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.5.tgz#b7226625167041298af3b98088a9dbbf6d7733a8"
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
Expand Down Expand Up @@ -8178,8 +8178,8 @@ uglify-js@^2.8.29:
uglify-to-browserify "~1.0.0"

uglify-js@^3.0.13, uglify-js@^3.1.4:
version "3.5.0"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.0.tgz#72cd24773c4961023f4f292ab9531177a0021897"
version "3.5.2"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.2.tgz#dc0c7ac2da0a4b7d15e84266818ff30e82529474"
dependencies:
commander "~2.19.0"
source-map "~0.6.1"
Expand Down Expand Up @@ -8286,7 +8286,7 @@ unzip-response@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"

upath@^1.1.0:
upath@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"

Expand Down

0 comments on commit f9c247d

Please sign in to comment.