Merge pull request #134 from reactioncommerce/feat-133-mikemurray-dat…

…atable-updates feat: DataTable updates
reactioncommerce · Jan 21, 2020 · ff32c43 · ff32c43
2 parents d4102c3 + f8d5524
commit ff32c43
Show file tree

Hide file tree

Showing 15 changed files with 69,805 additions and 1,453 deletions.
diff --git a/package.json b/package.json
@@ -101,6 +101,7 @@
   "dependencies": {
     "@babel/polyfill": "~7.2.5",
     "@material-ui/core": "~4.3.2",
+    "@material-ui/lab": "~4.0.0-alpha.39",
     "@reactioncommerce/components-context": "~1.2.0",
     "commitlint": "^8.0.0",
     "mdi-material-ui": "~5.8.0",

diff --git a/package/package.json b/package/package.json
@@ -32,7 +32,7 @@
     "mdi-material-ui": "~5.8.0",
     "react-is": "~16.4.1",
     "react-select": "^3.0.4",
-    "react-table": "7.0.0-beta.0"
+    "react-table": "7.0.0-rc.15"
   },
   "devDependencies": {
     "@babel/cli": "~7.2.3",
@@ -90,6 +90,7 @@
   },
   "peerDependencies": {
     "@material-ui/core": ">=4.3.2 < 5",
+    "@material-ui/lab": ">=~4.0.0-alpha.39",
     "@reactioncommerce/components-context": "~1.2.0",
     "prop-types": "~15.7.2",
     "react-dom": "~16.9.0"

diff --git a/package/src/components/ActionMenu/ActionMenu.js b/package/src/components/ActionMenu/ActionMenu.js
@@ -114,6 +114,7 @@ const ActionMenu = React.forwardRef(function ActionMenu(props, ref) {
           if (confirmTitle || confirmMessage) {
             return (
               <ConfirmDialog
+                key={`dialog-${index}`}
                 cancelActionText={cancelActionText}
                 confirmActionText={confirmActionText}
                 title={confirmTitle}