diff --git a/__tests__/demo/demo-components/RemoteData/index.js b/__tests__/demo/demo-components/RemoteData/index.js index 6ad34010..6c504d4a 100644 --- a/__tests__/demo/demo-components/RemoteData/index.js +++ b/__tests__/demo/demo-components/RemoteData/index.js @@ -1,9 +1,5 @@ import React, { useState, useRef, Component } from 'react'; import MaterialTable, { MTableBodyRow, MTableEditRow } from '../../../../src'; -import { Grid, MuiThemeProvider, Button } from '@material-ui/core'; -import { createMuiTheme } from '@material-ui/core/styles'; -import Typography from '@material-ui/core/Typography'; - // check if removing this.isRemoteData()@https://github.com/material-table-core/core/blob/0e953441fd9f9912d8cf97db103a8e0cb4f43912/src/material-table.js#L119-L120 // is any good diff --git a/__tests__/demo/demo.js b/__tests__/demo/demo.js index eb3a0b6f..23cb0172 100644 --- a/__tests__/demo/demo.js +++ b/__tests__/demo/demo.js @@ -16,6 +16,7 @@ * built-in dev server (run `npm start`) */ +import { ThemeProvider, createTheme } from '@material-ui/core'; import React from 'react'; import { render } from 'react-dom'; @@ -40,7 +41,7 @@ import { I1353, I1941, I122 } from './demo-components/RemoteData'; module.hot.accept(); render( -
+

Basic

@@ -112,6 +113,6 @@ render( -
, + , document.querySelector('#app') ); diff --git a/__tests__/demo/demo.original.js b/__tests__/demo/demo.original.js index e873af7b..a61fba1f 100644 --- a/__tests__/demo/demo.original.js +++ b/__tests__/demo/demo.original.js @@ -1,12 +1,14 @@ -import { Grid, MuiThemeProvider, Button } from '@material-ui/core'; -import { createMuiTheme } from '@material-ui/core'; +import { Grid, ThemeProvider } from '@material-ui/core'; +import { createTheme } from '@material-ui/core/styles'; +import React, { Component } from 'react'; +import MaterialTable from '../src'; let direction = 'ltr'; // direction = 'rtl'; -const theme = createMuiTheme({ +const theme = createTheme({ direction: direction, palette: { - type: 'light' + mode: 'light' } }); @@ -483,7 +485,7 @@ class App extends Component { render() { return ( <> - +
@@ -678,7 +680,7 @@ class App extends Component { // /> }
- + ); } diff --git a/package-lock.json b/package-lock.json index 58a10192..138c3b78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,6 @@ "version": "7.12.11", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, "requires": { "@babel/highlight": "^7.10.4" } @@ -315,8 +314,7 @@ "@babel/helper-validator-identifier": { "version": "7.12.11", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==" }, "@babel/helper-validator-option": { "version": "7.12.11", @@ -351,7 +349,6 @@ "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", "chalk": "^2.0.0", @@ -362,7 +359,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -373,7 +369,6 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "requires": { "has-flag": "^3.0.0" } @@ -1213,17 +1208,238 @@ "@date-io/core": "^1.3.13" } }, + "@date-io/dayjs": { + "version": "2.10.11", + "resolved": "https://registry.npmjs.org/@date-io/dayjs/-/dayjs-2.10.11.tgz", + "integrity": "sha512-4+OUOeIxwTXhUil5Cw197jxEDWqoUPZsNeXgfta+Rol5sS6XyeeFOXtAfSKDZee8xIJL0cSGzy46eSQUP279XA==", + "requires": { + "@date-io/core": "^2.10.11" + }, + "dependencies": { + "@date-io/core": { + "version": "2.10.11", + "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.10.11.tgz", + "integrity": "sha512-keXQnwH0LM8wyvu+j5Z2KGK56D+eItjy7DnwuWl/oV+DM2UEYl0z5WhdPMpfswSyt/kjuPOzcVF/7u/skMLaoA==" + } + } + }, + "@date-io/luxon": { + "version": "2.10.11", + "resolved": "https://registry.npmjs.org/@date-io/luxon/-/luxon-2.10.11.tgz", + "integrity": "sha512-SS6SIkp0Y9GFwpQycCTUAyW3OZTW05CWI1DJu10hUzcg8SmjJfhjs7hQY3TOeW+JT6VtXGTVGwbWPUBJsNkhZg==", + "requires": { + "@date-io/core": "^2.10.11" + }, + "dependencies": { + "@date-io/core": { + "version": "2.10.11", + "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.10.11.tgz", + "integrity": "sha512-keXQnwH0LM8wyvu+j5Z2KGK56D+eItjy7DnwuWl/oV+DM2UEYl0z5WhdPMpfswSyt/kjuPOzcVF/7u/skMLaoA==" + } + } + }, + "@date-io/moment": { + "version": "2.10.11", + "resolved": "https://registry.npmjs.org/@date-io/moment/-/moment-2.10.11.tgz", + "integrity": "sha512-xym/Ew0C7WSmH3w1KcEwoWoUnQ9UjjDZo1++SwlGdGIU0lPEv1QmMx59shWWL49GAz7KOsCEF2Gu9uDt8cEcVw==", + "requires": { + "@date-io/core": "^2.10.11" + }, + "dependencies": { + "@date-io/core": { + "version": "2.10.11", + "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.10.11.tgz", + "integrity": "sha512-keXQnwH0LM8wyvu+j5Z2KGK56D+eItjy7DnwuWl/oV+DM2UEYl0z5WhdPMpfswSyt/kjuPOzcVF/7u/skMLaoA==" + } + } + }, "@discoveryjs/json-ext": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz", "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==", "dev": true }, + "@emotion/babel-plugin": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz", + "integrity": "sha512-UZKwBV2rADuhRp+ZOGgNWg2eYgbzKzQXfQPtJbu/PLy8onurxlNCLvxMQEvlr1/GudguPI5IU9qIY1+2z1M5bA==", + "requires": { + "@babel/helper-module-imports": "^7.12.13", + "@babel/plugin-syntax-jsx": "^7.12.13", + "@babel/runtime": "^7.13.10", + "@emotion/hash": "^0.8.0", + "@emotion/memoize": "^0.7.5", + "@emotion/serialize": "^1.0.2", + "babel-plugin-macros": "^2.6.1", + "convert-source-map": "^1.5.0", + "escape-string-regexp": "^4.0.0", + "find-root": "^1.1.0", + "source-map": "^0.5.7", + "stylis": "^4.0.3" + }, + "dependencies": { + "@babel/helper-module-imports": { + "version": "7.13.12", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz", + "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==", + "requires": { + "@babel/types": "^7.13.12" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz", + "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==" + }, + "@babel/helper-validator-identifier": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", + "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==" + }, + "@babel/plugin-syntax-jsx": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz", + "integrity": "sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==", + "requires": { + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@babel/runtime": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz", + "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "@babel/types": { + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz", + "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==", + "requires": { + "@babel/helper-validator-identifier": "^7.14.0", + "to-fast-properties": "^2.0.0" + } + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + } + } + }, + "@emotion/cache": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz", + "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==", + "requires": { + "@emotion/memoize": "^0.7.4", + "@emotion/sheet": "^1.0.0", + "@emotion/utils": "^1.0.0", + "@emotion/weak-memoize": "^0.2.5", + "stylis": "^4.0.3" + } + }, + "@emotion/core": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/@emotion/core/-/core-11.0.0.tgz", + "integrity": "sha512-w4sE3AmHmyG6RDKf6mIbtHpgJUSJ2uGvPQb8VXFL7hFjMPibE8IiehG8cMX3Ztm4svfCQV6KqusQbeIOkurBcA==" + }, "@emotion/hash": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", - "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==", - "dev": true + "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + }, + "@emotion/is-prop-valid": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.1.0.tgz", + "integrity": "sha512-9RkilvXAufQHsSsjQ3PIzSns+pxuX4EW8EbGeSPjZMHuMx6z/MOzb9LpqNieQX4F3mre3NWS2+X3JNRHTQztUQ==", + "requires": { + "@emotion/memoize": "^0.7.4" + } + }, + "@emotion/memoize": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz", + "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==" + }, + "@emotion/react": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.4.0.tgz", + "integrity": "sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg==", + "requires": { + "@babel/runtime": "^7.13.10", + "@emotion/cache": "^11.4.0", + "@emotion/serialize": "^1.0.2", + "@emotion/sheet": "^1.0.1", + "@emotion/utils": "^1.0.0", + "@emotion/weak-memoize": "^0.2.5", + "hoist-non-react-statics": "^3.3.1" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz", + "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@emotion/serialize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.2.tgz", + "integrity": "sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==", + "requires": { + "@emotion/hash": "^0.8.0", + "@emotion/memoize": "^0.7.4", + "@emotion/unitless": "^0.7.5", + "@emotion/utils": "^1.0.0", + "csstype": "^3.0.2" + } + }, + "@emotion/sheet": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz", + "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==" + }, + "@emotion/styled": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.3.0.tgz", + "integrity": "sha512-fUoLcN3BfMiLlRhJ8CuPUMEyKkLEoM+n+UyAbnqGEsCd5IzKQ7VQFLtzpJOaCD2/VR2+1hXQTnSZXVJeiTNltA==", + "requires": { + "@babel/runtime": "^7.13.10", + "@emotion/babel-plugin": "^11.3.0", + "@emotion/is-prop-valid": "^1.1.0", + "@emotion/serialize": "^1.0.2", + "@emotion/utils": "^1.0.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz", + "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@emotion/unitless": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", + "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" + }, + "@emotion/utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz", + "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==" + }, + "@emotion/weak-memoize": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", + "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "@eslint/eslintrc": { "version": "0.2.2", @@ -1889,57 +2105,135 @@ } }, "@material-ui/core": { - "version": "4.11.2", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.11.2.tgz", - "integrity": "sha512-/D1+AQQeYX/WhT/FUk78UCRj8ch/RCglsQLYujYTIqPSJlwZHKcvHidNeVhODXeApojeXjkl0tWdk5C9ofwOkQ==", - "dev": true, + "version": "5.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-5.0.0-alpha.35.tgz", + "integrity": "sha512-IEEjG0PTjsraPMd/I/CxFnCK1kTzibAOAlZ5a8F98JzJiKIl0FuXtJZU3mVDUUYN3Hr5V//sw9hKRS2Uqep+5A==", "requires": { "@babel/runtime": "^7.4.4", - "@material-ui/styles": "^4.11.2", - "@material-ui/system": "^4.11.2", - "@material-ui/types": "^5.1.0", - "@material-ui/utils": "^4.11.2", + "@material-ui/private-theming": "5.0.0-alpha.35", + "@material-ui/styled-engine": "5.0.0-alpha.34", + "@material-ui/system": "5.0.0-alpha.35", + "@material-ui/types": "6.0.1", + "@material-ui/unstyled": "5.0.0-alpha.35", + "@material-ui/utils": "5.0.0-alpha.35", + "@popperjs/core": "^2.4.4", "@types/react-transition-group": "^4.2.0", "clsx": "^1.0.4", + "csstype": "^3.0.2", "hoist-non-react-statics": "^3.3.2", - "popper.js": "1.16.1-lts", "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0", + "react-is": "^17.0.0", "react-transition-group": "^4.4.0" + }, + "dependencies": { + "react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" + } } }, - "@material-ui/pickers": { - "version": "3.2.10", - "resolved": "https://registry.npmjs.org/@material-ui/pickers/-/pickers-3.2.10.tgz", - "integrity": "sha512-B8G6Obn5S3RCl7hwahkQj9sKUapwXWFjiaz/Bsw1fhYFdNMnDUolRiWQSoKPb1/oKe37Dtfszoywi1Ynbo3y8w==", + "@material-ui/lab": { + "version": "5.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-5.0.0-alpha.35.tgz", + "integrity": "sha512-AvPVSN17Oh9LBbfOkpBue5cn/IRk2F++8Hnuw+Jl0ZafyAUWAl4B9XIXwBkCp4UIWYlUFiuKWm854P1duYkILg==", "requires": { - "@babel/runtime": "^7.6.0", - "@date-io/core": "1.x", - "@types/styled-jsx": "^2.2.8", - "clsx": "^1.0.2", - "react-transition-group": "^4.0.0", - "rifm": "^0.7.0" + "@babel/runtime": "^7.4.4", + "@date-io/date-fns": "^2.10.6", + "@date-io/dayjs": "^2.10.6", + "@date-io/luxon": "^2.10.6", + "@date-io/moment": "^2.10.6", + "@material-ui/system": "5.0.0-alpha.35", + "@material-ui/utils": "5.0.0-alpha.35", + "clsx": "^1.0.4", + "prop-types": "^15.7.2", + "react-is": "^17.0.0", + "react-transition-group": "^4.4.1", + "rifm": "^0.12.0" }, "dependencies": { "@date-io/core": { - "version": "1.3.13", - "resolved": "https://registry.npmjs.org/@date-io/core/-/core-1.3.13.tgz", - "integrity": "sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA==" + "version": "2.10.11", + "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.10.11.tgz", + "integrity": "sha512-keXQnwH0LM8wyvu+j5Z2KGK56D+eItjy7DnwuWl/oV+DM2UEYl0z5WhdPMpfswSyt/kjuPOzcVF/7u/skMLaoA==" + }, + "@date-io/date-fns": { + "version": "2.10.11", + "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.10.11.tgz", + "integrity": "sha512-QG9IAZ4bvwkJftoSVKtdb5ISH+Qp4zilrjhzcL4RXaeqkfIWiFeXqQPgJljvPl6gQ04zf2SjGkWjdh1eJxxwmQ==", + "requires": { + "@date-io/core": "^2.10.11" + } + }, + "@material-ui/system": { + "version": "5.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-5.0.0-alpha.35.tgz", + "integrity": "sha512-Jz21xD1ieOxesAxRv0eNWZFgZsUqO4cLnkoJV57ldtnLAaSKJ7hPiHCo28gTezEij7MQbHlmSCAlndlKate0GA==", + "requires": { + "@babel/runtime": "^7.4.4", + "@material-ui/styled-engine": "5.0.0-alpha.34", + "@material-ui/types": "6.0.1", + "@material-ui/utils": "5.0.0-alpha.35", + "csstype": "^3.0.2", + "prop-types": "^15.7.2" + } + }, + "@material-ui/types": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-6.0.1.tgz", + "integrity": "sha512-t53C2BZE59e8ao38EDIZdM2smPDSEo5Xx9XxQ/MNM9Ph63Mu4vj5pmECiXkYp0y2OrvFiiZhcqRWV34SBOA18g==" + }, + "@material-ui/utils": { + "version": "5.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-5.0.0-alpha.35.tgz", + "integrity": "sha512-Msu+zIXd7Y2JrTU9JIf0xjjjAMdWEIdlj2Tmj9bSYFF6bgStrQ1WXXZxxFz5GmdzT7FcLi5U3PqBynSNX/QDGA==", + "requires": { + "@babel/runtime": "^7.4.4", + "@types/prop-types": "^15.7.3", + "@types/react-is": "^16.7.1 || ^17.0.0", + "prop-types": "^15.7.2", + "react-is": "^17.0.0" + } + }, + "react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" } } }, + "@material-ui/private-theming": { + "version": "5.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@material-ui/private-theming/-/private-theming-5.0.0-alpha.35.tgz", + "integrity": "sha512-D02L9kYjnMd8PtJUSXpiBk13+FnjQIDWINzBtRJXpwDooA7M3ejtTGPp+YJnP/wYs4nKdh852/+WiRk3VI5q4Q==", + "requires": { + "@babel/runtime": "^7.4.4", + "@material-ui/utils": "5.0.0-alpha.35", + "prop-types": "^15.7.2" + } + }, + "@material-ui/styled-engine": { + "version": "5.0.0-alpha.34", + "resolved": "https://registry.npmjs.org/@material-ui/styled-engine/-/styled-engine-5.0.0-alpha.34.tgz", + "integrity": "sha512-1j+4tIxS6x3McJ+3O9mxwzjkci/uu09nnON7ZDgqX9O3f15D8CP8cmAy0PDm47M4utMwIqj+EaS4Y6d2PZWF5Q==", + "requires": { + "@babel/runtime": "^7.4.4", + "@emotion/cache": "^11.0.0", + "prop-types": "^15.7.2" + } + }, "@material-ui/styles": { - "version": "4.11.2", - "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.2.tgz", - "integrity": "sha512-xbItf8zkfD3FuGoD9f2vlcyPf9jTEtj9YTJoNNV+NMWaSAHXgrW6geqRoo/IwBuMjqpwqsZhct13e2nUyU9Ljw==", - "dev": true, + "version": "5.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-5.0.0-alpha.35.tgz", + "integrity": "sha512-GQ99bQkKjyC6AJXEdYvRcZ6k4xarZl3ybxQ3UPGlDxlLUbtE5dHT5Mg88NON7kVhSZOS4sTqE+c2ggvvLYja5g==", "requires": { "@babel/runtime": "^7.4.4", "@emotion/hash": "^0.8.0", - "@material-ui/types": "^5.1.0", - "@material-ui/utils": "^4.11.2", + "@material-ui/private-theming": "5.0.0-alpha.35", + "@material-ui/types": "6.0.1", + "@material-ui/utils": "5.0.0-alpha.35", "clsx": "^1.0.4", - "csstype": "^2.5.2", + "csstype": "^3.0.2", "hoist-non-react-statics": "^3.3.2", "jss": "^10.0.3", "jss-plugin-camel-case": "^10.0.3", @@ -1950,51 +2244,62 @@ "jss-plugin-rule-value-function": "^10.0.3", "jss-plugin-vendor-prefixer": "^10.0.3", "prop-types": "^15.7.2" - }, - "dependencies": { - "csstype": { - "version": "2.6.14", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.14.tgz", - "integrity": "sha512-2mSc+VEpGPblzAxyeR+vZhJKgYg0Og0nnRi7pmRXFYYxSfnOnW8A5wwQb4n4cE2nIOzqKOAzLCaEX6aBmNEv8A==", - "dev": true - } } }, "@material-ui/system": { - "version": "4.11.2", - "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.11.2.tgz", - "integrity": "sha512-BELFJEel5E+5DMiZb6XXT3peWRn6UixRvBtKwSxqntmD0+zwbbfCij6jtGwwdJhN1qX/aXrKu10zX31GBaeR7A==", - "dev": true, + "version": "5.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-5.0.0-alpha.35.tgz", + "integrity": "sha512-Jz21xD1ieOxesAxRv0eNWZFgZsUqO4cLnkoJV57ldtnLAaSKJ7hPiHCo28gTezEij7MQbHlmSCAlndlKate0GA==", "requires": { "@babel/runtime": "^7.4.4", - "@material-ui/utils": "^4.11.2", - "csstype": "^2.5.2", + "@material-ui/styled-engine": "5.0.0-alpha.34", + "@material-ui/types": "6.0.1", + "@material-ui/utils": "5.0.0-alpha.35", + "csstype": "^3.0.2", "prop-types": "^15.7.2" + } + }, + "@material-ui/types": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-6.0.1.tgz", + "integrity": "sha512-t53C2BZE59e8ao38EDIZdM2smPDSEo5Xx9XxQ/MNM9Ph63Mu4vj5pmECiXkYp0y2OrvFiiZhcqRWV34SBOA18g==" + }, + "@material-ui/unstyled": { + "version": "5.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@material-ui/unstyled/-/unstyled-5.0.0-alpha.35.tgz", + "integrity": "sha512-iTlwlftnH/3w4hU/xaJePMDVsL/JtYJhruJxZ2Tt/2eVzGTvYq88PLQ5+o2VBRROnxQGKRjpNuX3nss+/RudPg==", + "requires": { + "@babel/runtime": "^7.4.4", + "@material-ui/utils": "5.0.0-alpha.35", + "clsx": "^1.0.4", + "prop-types": "^15.7.2", + "react-is": "^17.0.0" }, "dependencies": { - "csstype": { - "version": "2.6.14", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.14.tgz", - "integrity": "sha512-2mSc+VEpGPblzAxyeR+vZhJKgYg0Og0nnRi7pmRXFYYxSfnOnW8A5wwQb4n4cE2nIOzqKOAzLCaEX6aBmNEv8A==", - "dev": true + "react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" } } }, - "@material-ui/types": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz", - "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==", - "dev": true - }, "@material-ui/utils": { - "version": "4.11.2", - "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.2.tgz", - "integrity": "sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==", - "dev": true, + "version": "5.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-5.0.0-alpha.35.tgz", + "integrity": "sha512-Msu+zIXd7Y2JrTU9JIf0xjjjAMdWEIdlj2Tmj9bSYFF6bgStrQ1WXXZxxFz5GmdzT7FcLi5U3PqBynSNX/QDGA==", "requires": { "@babel/runtime": "^7.4.4", + "@types/prop-types": "^15.7.3", + "@types/react-is": "^16.7.1 || ^17.0.0", "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0" + "react-is": "^17.0.0" + }, + "dependencies": { + "react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" + } } }, "@nicolo-ribaudo/chokidar-2": { @@ -2023,6 +2328,11 @@ "integrity": "sha512-3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA==", "dev": true }, + "@popperjs/core": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", + "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" + }, "@sinonjs/commons": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", @@ -2191,6 +2501,11 @@ "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", "dev": true }, + "@types/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" + }, "@types/prettier": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.6.tgz", @@ -2211,11 +2526,18 @@ "csstype": "^3.0.2" } }, + "@types/react-is": { + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.0.tgz", + "integrity": "sha512-A0DQ1YWZ0RG2+PV7neAotNCIh8gZ3z7tQnDJyS2xRPDNtAtSPcJ9YyfMP8be36Ha0kQRzbZCrrTMznA4blqO5g==", + "requires": { + "@types/react": "*" + } + }, "@types/react-transition-group": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz", - "integrity": "sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==", - "dev": true, + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==", "requires": { "@types/react": "*" } @@ -2226,14 +2548,6 @@ "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==", "dev": true }, - "@types/styled-jsx": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/@types/styled-jsx/-/styled-jsx-2.2.8.tgz", - "integrity": "sha512-Yjye9VwMdYeXfS71ihueWRSxrruuXTwKCbzue4+5b2rjnQ//AtyM7myZ1BEhNhBQ/nL/RE7bdToUoLln2miKvg==", - "requires": { - "@types/react": "*" - } - }, "@types/yargs": { "version": "15.0.12", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz", @@ -2597,7 +2911,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -2981,6 +3294,46 @@ "@types/babel__traverse": "^7.0.6" } }, + "babel-plugin-macros": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz", + "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==", + "requires": { + "@babel/runtime": "^7.7.2", + "cosmiconfig": "^6.0.0", + "resolve": "^1.12.0" + }, + "dependencies": { + "cosmiconfig": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", + "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", + "requires": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.7.2" + } + }, + "parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + } + }, + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" + } + } + }, "babel-polyfill": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", @@ -3428,8 +3781,7 @@ "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, "camelcase": { "version": "5.3.1", @@ -3765,7 +4117,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -3773,8 +4124,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "colorette": { "version": "1.2.1", @@ -3870,7 +4220,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, "requires": { "safe-buffer": "~5.1.1" } @@ -3993,7 +4342,6 @@ "version": "2.0.8", "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz", "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==", - "dev": true, "requires": { "@babel/runtime": "^7.8.3", "is-in-browser": "^1.0.2" @@ -4507,7 +4855,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, "requires": { "is-arrayish": "^0.2.1" } @@ -4581,8 +4928,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { "version": "1.14.3", @@ -5537,6 +5883,11 @@ } } }, + "find-root": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", + "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" + }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -5635,8 +5986,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "function.prototype.name": { "version": "1.1.3", @@ -5881,7 +6231,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -5889,8 +6238,7 @@ "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "has-symbols": { "version": "1.0.1", @@ -6158,8 +6506,7 @@ "hyphenate-style-name": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz", - "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==", - "dev": true + "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==" }, "iconv-lite": { "version": "0.4.24", @@ -6180,7 +6527,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -6206,7 +6552,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-2.0.1.tgz", "integrity": "sha512-G8vgmork+6H9S8lUAg1gtXEj2JxIQTo0g2PbFiYOdjkziSI0F7UYBiVwhZRuixhBCNGczAls34+5HJPyZysvxQ==", - "dev": true, "requires": { "symbol-observable": "1.2.0" } @@ -6331,8 +6676,7 @@ "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { "version": "1.0.1", @@ -6377,7 +6721,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", - "dev": true, "requires": { "has": "^1.0.3" } @@ -6476,8 +6819,7 @@ "is-in-browser": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz", - "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=", - "dev": true + "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=" }, "is-negative-zero": { "version": "2.0.1", @@ -8458,8 +8800,7 @@ "json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" }, "json-schema": { "version": "0.2.3", @@ -8513,10 +8854,9 @@ } }, "jss": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/jss/-/jss-10.5.0.tgz", - "integrity": "sha512-B6151NvG+thUg3murLNHRPLxTLwQ13ep4SH5brj4d8qKtogOx/jupnpfkPGSHPqvcwKJaCLctpj2lEk+5yGwMw==", - "dev": true, + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz", + "integrity": "sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==", "requires": { "@babel/runtime": "^7.3.1", "csstype": "^3.0.2", @@ -8526,77 +8866,70 @@ } }, "jss-plugin-camel-case": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.5.0.tgz", - "integrity": "sha512-GSjPL0adGAkuoqeYiXTgO7PlIrmjv5v8lA6TTBdfxbNYpxADOdGKJgIEkffhlyuIZHlPuuiFYTwUreLUmSn7rg==", - "dev": true, + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.6.0.tgz", + "integrity": "sha512-JdLpA3aI/npwj3nDMKk308pvnhoSzkW3PXlbgHAzfx0yHWnPPVUjPhXFtLJzgKZge8lsfkUxvYSQ3X2OYIFU6A==", "requires": { "@babel/runtime": "^7.3.1", "hyphenate-style-name": "^1.0.3", - "jss": "10.5.0" + "jss": "10.6.0" } }, "jss-plugin-default-unit": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.5.0.tgz", - "integrity": "sha512-rsbTtZGCMrbcb9beiDd+TwL991NGmsAgVYH0hATrYJtue9e+LH/Gn4yFD1ENwE+3JzF3A+rPnM2JuD9L/SIIWw==", - "dev": true, + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.6.0.tgz", + "integrity": "sha512-7y4cAScMHAxvslBK2JRK37ES9UT0YfTIXWgzUWD5euvR+JR3q+o8sQKzBw7GmkQRfZijrRJKNTiSt1PBsLI9/w==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.5.0" + "jss": "10.6.0" } }, "jss-plugin-global": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.5.0.tgz", - "integrity": "sha512-FZd9+JE/3D7HMefEG54fEC0XiQ9rhGtDHAT/ols24y8sKQ1D5KIw6OyXEmIdKFmACgxZV2ARQ5pAUypxkk2IFQ==", - "dev": true, + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.6.0.tgz", + "integrity": "sha512-I3w7ji/UXPi3VuWrTCbHG9rVCgB4yoBQLehGDTmsnDfXQb3r1l3WIdcO8JFp9m0YMmyy2CU7UOV6oPI7/Tmu+w==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.5.0" + "jss": "10.6.0" } }, "jss-plugin-nested": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.5.0.tgz", - "integrity": "sha512-ejPlCLNlEGgx8jmMiDk/zarsCZk+DV0YqXfddpgzbO9Toamo0HweCFuwJ3ZO40UFOfqKwfpKMVH/3HUXgxkTMg==", - "dev": true, + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.6.0.tgz", + "integrity": "sha512-fOFQWgd98H89E6aJSNkEh2fAXquC9aZcAVjSw4q4RoQ9gU++emg18encR4AT4OOIFl4lQwt5nEyBBRn9V1Rk8g==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.5.0", + "jss": "10.6.0", "tiny-warning": "^1.0.2" } }, "jss-plugin-props-sort": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.5.0.tgz", - "integrity": "sha512-kTLRvrOetFKz5vM88FAhLNeJIxfjhCepnvq65G7xsAQ/Wgy7HwO1BS/2wE5mx8iLaAWC6Rj5h16mhMk9sKdZxg==", - "dev": true, + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.6.0.tgz", + "integrity": "sha512-oMCe7hgho2FllNc60d9VAfdtMrZPo9n1Iu6RNa+3p9n0Bkvnv/XX5San8fTPujrTBScPqv9mOE0nWVvIaohNuw==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.5.0" + "jss": "10.6.0" } }, "jss-plugin-rule-value-function": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.5.0.tgz", - "integrity": "sha512-jXINGr8BSsB13JVuK274oEtk0LoooYSJqTBCGeBu2cG/VJ3+4FPs1gwLgsq24xTgKshtZ+WEQMVL34OprLidRA==", - "dev": true, + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.6.0.tgz", + "integrity": "sha512-TKFqhRTDHN1QrPTMYRlIQUOC2FFQb271+AbnetURKlGvRl/eWLswcgHQajwuxI464uZk91sPiTtdGi7r7XaWfA==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.5.0", + "jss": "10.6.0", "tiny-warning": "^1.0.2" } }, "jss-plugin-vendor-prefixer": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.5.0.tgz", - "integrity": "sha512-rux3gmfwDdOKCLDx0IQjTwTm03IfBa+Rm/hs747cOw5Q7O3RaTUIMPKjtVfc31Xr/XI9Abz2XEupk1/oMQ7zRA==", - "dev": true, + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.6.0.tgz", + "integrity": "sha512-doJ7MouBXT1lypLLctCwb4nJ6lDYqrTfVS3LtXgox42Xz0gXusXIIDboeh6UwnSmox90QpVnub7au8ybrb0krQ==", "requires": { "@babel/runtime": "^7.3.1", "css-vendor": "^2.0.8", - "jss": "10.5.0" + "jss": "10.6.0" } }, "jsx-ast-utils": { @@ -8646,8 +8979,7 @@ "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, "load-json-file": { "version": "2.0.0", @@ -9457,7 +9789,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, "requires": { "callsites": "^3.0.0" } @@ -9539,8 +9870,7 @@ "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-to-regexp": { "version": "0.1.7", @@ -9625,12 +9955,6 @@ "semver-compare": "^1.0.0" } }, - "popper.js": { - "version": "1.16.1-lts", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz", - "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==", - "dev": true - }, "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", @@ -10439,7 +10763,6 @@ "version": "1.19.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", - "dev": true, "requires": { "is-core-module": "^2.1.0", "path-parse": "^1.0.6" @@ -10465,8 +10788,7 @@ "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, "resolve-url": { "version": "0.2.1", @@ -10487,12 +10809,9 @@ "dev": true }, "rifm": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/rifm/-/rifm-0.7.0.tgz", - "integrity": "sha512-DSOJTWHD67860I5ojetXdEQRIBvF6YcpNe53j0vn1vp9EUb9N80EiZTxgP+FkDKorWC8PZw052kTF4C1GOivCQ==", - "requires": { - "@babel/runtime": "^7.3.1" - } + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/rifm/-/rifm-0.12.0.tgz", + "integrity": "sha512-PqOl+Mo2lyqrKiD34FPlnQ+ksD3F+a62TQlphiZshgriyHdfjn6jGyqUZhd+s3nsMYXwXYDdjrrv8wX7QsOG3g==" }, "rimraf": { "version": "3.0.2", @@ -10528,8 +10847,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", @@ -11025,8 +11343,7 @@ "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-resolve": { "version": "0.5.3", @@ -11366,6 +11683,11 @@ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, + "stylis": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz", + "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==" + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -11570,8 +11892,7 @@ "tiny-warning": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", - "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==", - "dev": true + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" }, "tmpl": { "version": "1.0.4", @@ -11582,8 +11903,7 @@ "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, "to-object-path": { "version": "0.3.0", @@ -12651,6 +12971,11 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, + "yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" + }, "yargs": { "version": "13.3.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", diff --git a/package.json b/package.json index 523ac742..cf72180a 100644 --- a/package.json +++ b/package.json @@ -102,18 +102,22 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@date-io/date-fns": "^1.3.13", - "@material-ui/pickers": "^3.2.10", "classnames": "^2.2.6", "date-fns": "^2.16.1", "debounce": "^1.2.0", "fast-deep-equal": "^3.1.3", "prop-types": "^15.7.2", "react-beautiful-dnd": "^13.0.0", - "react-double-scrollbar": "0.0.15" + "react-double-scrollbar": "0.0.15", + "@date-io/core": "^1.3.13", + "@material-ui/core": "^5.0.0-alpha.35", + "@material-ui/styles": "^5.0.0-alpha.35", + "@material-ui/lab": "^5.0.0-alpha.35", + "@emotion/core": "^11.0.0", + "@emotion/react": "^11.0.0", + "@emotion/styled": "^11.0.0" }, "peerDependencies": { - "@date-io/core": "^1.3.13", - "@material-ui/core": "^4.11.2", "react": ">=16.8.0", "react-dom": ">=16.8.0" } diff --git a/src/components/MTableEditCell/index.js b/src/components/MTableEditCell/index.js index 89d6ad6c..28d73462 100644 --- a/src/components/MTableEditCell/index.js +++ b/src/components/MTableEditCell/index.js @@ -1,6 +1,7 @@ import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { TableCell, CircularProgress, withTheme } from '@material-ui/core'; +import { TableCell, CircularProgress } from '@material-ui/core'; +import { withTheme } from '@material-ui/styles'; function MTableEditCell(props) { const [state, setState] = useState(() => ({ diff --git a/src/components/MTableEditField/DateField.js b/src/components/MTableEditField/DateField.js index 0fb8d2a0..6f9ceb0f 100644 --- a/src/components/MTableEditField/DateField.js +++ b/src/components/MTableEditField/DateField.js @@ -1,6 +1,6 @@ import React from 'react'; import DateFnsUtils from '@date-io/date-fns'; -import { MuiPickersUtilsProvider, DatePicker } from '@material-ui/pickers'; +import { LocalizationProvider, DatePicker } from '@material-ui/lab'; function DateField({ columnDef, @@ -31,7 +31,7 @@ function DateField({ const datePickerProps = getProps(); return ( - + - + ); } diff --git a/src/components/MTableEditField/DateTimeField.js b/src/components/MTableEditField/DateTimeField.js index 1e538d52..bad56798 100644 --- a/src/components/MTableEditField/DateTimeField.js +++ b/src/components/MTableEditField/DateTimeField.js @@ -1,10 +1,10 @@ import React from 'react'; import DateFnsUtils from '@date-io/date-fns'; -import { MuiPickersUtilsProvider, DateTimePicker } from '@material-ui/pickers'; +import { LocalizationProvider, DateTimePicker } from '@material-ui/lab'; function DateTimeField({ forwardedRef, ...props }) { return ( - + - + ); } diff --git a/src/components/MTableEditField/TimeField.js b/src/components/MTableEditField/TimeField.js index 720decec..9f3c6900 100644 --- a/src/components/MTableEditField/TimeField.js +++ b/src/components/MTableEditField/TimeField.js @@ -1,10 +1,10 @@ import React from 'react'; import DateFnsUtils from '@date-io/date-fns'; -import { MuiPickersUtilsProvider, TimePicker } from '@material-ui/pickers'; +import { LocalizationProvider, TimePicker } from '@material-ui/lab'; function TimeField({ forwardedRef, ...props }) { return ( - + - + ); } diff --git a/src/components/MTableFilterRow/DateFilter.js b/src/components/MTableFilterRow/DateFilter.js index 4c4f51b8..9d98deba 100644 --- a/src/components/MTableFilterRow/DateFilter.js +++ b/src/components/MTableFilterRow/DateFilter.js @@ -4,9 +4,9 @@ import { getLocalizedFilterPlaceHolder } from './utils'; import { DatePicker, DateTimePicker, - MuiPickersUtilsProvider, + LocalizationProvider, TimePicker -} from '@material-ui/pickers'; +} from '@material-ui/lab'; function DateFilter({ columnDef, @@ -34,12 +34,12 @@ function DateFilter({ } return ( - {dateInputElement} - + ); } diff --git a/src/components/MTableHeader/index.js b/src/components/MTableHeader/index.js index 84d39567..c8bb5356 100644 --- a/src/components/MTableHeader/index.js +++ b/src/components/MTableHeader/index.js @@ -6,7 +6,8 @@ import TableCell from '@material-ui/core/TableCell'; import TableSortLabel from '@material-ui/core/TableSortLabel'; import Checkbox from '@material-ui/core/Checkbox'; import { Draggable } from 'react-beautiful-dnd'; -import { Tooltip, withStyles } from '@material-ui/core'; +import { Tooltip } from '@material-ui/core'; +import { withStyles } from '@material-ui/styles'; import * as CommonValues from '../../utils/common-values'; export function MTableHeader({ onColumnResized, ...props }) { diff --git a/src/components/MTablePagination/index.js b/src/components/MTablePagination/index.js index 29892984..0ca4275a 100644 --- a/src/components/MTablePagination/index.js +++ b/src/components/MTablePagination/index.js @@ -1,6 +1,6 @@ /* eslint-disable no-unused-vars */ import IconButton from '@material-ui/core/IconButton'; -import { withStyles } from '@material-ui/core'; +import { withStyles } from '@material-ui/styles'; import Tooltip from '@material-ui/core/Tooltip'; import Typography from '@material-ui/core/Typography'; import PropTypes from 'prop-types'; @@ -9,19 +9,19 @@ import React from 'react'; function MTablePagination(props) { const handleFirstPageButtonClick = (event) => { - props.onChangePage(event, 0); + props.onPageChange(event, 0); }; const handleBackButtonClick = (event) => { - props.onChangePage(event, props.page - 1); + props.onPageChange(event, props.page - 1); }; const handleNextButtonClick = (event) => { - props.onChangePage(event, props.page + 1); + props.onPageChange(event, props.page + 1); }; const handleLastPageButtonClick = (event) => { - props.onChangePage( + props.onPageChange( event, Math.max(0, Math.ceil(props.count / props.rowsPerPage) - 1) ); diff --git a/src/components/MTableSteppedPaginationInner/index.js b/src/components/MTableSteppedPaginationInner/index.js index 70e6f0a4..4cb6938f 100644 --- a/src/components/MTableSteppedPaginationInner/index.js +++ b/src/components/MTableSteppedPaginationInner/index.js @@ -1,33 +1,30 @@ -/* eslint-disable no-unused-vars */ import IconButton from '@material-ui/core/IconButton'; -import { withStyles } from '@material-ui/core'; +import { withStyles } from '@material-ui/styles'; import Tooltip from '@material-ui/core/Tooltip'; -import Hidden from '@material-ui/core/Hidden'; +import Box from '@material-ui/core/Box'; import Button from '@material-ui/core/Button'; import PropTypes from 'prop-types'; import React from 'react'; -/* eslint-enable no-unused-vars */ function MTablePaginationInner(props) { const handleFirstPageButtonClick = (event) => { - props.onChangePage(event, 0); + props.onPageChange(event, 0); }; const handleBackButtonClick = (event) => { - props.onChangePage(event, props.page - 1); + props.onPageChange(event, props.page - 1); }; const handleNextButtonClick = (event) => { - props.onChangePage(event, props.page + 1); + props.onPageChange(event, props.page + 1); }; const handleNumberButtonClick = (number) => (event) => { - props.onChangePage(event, number); + props.onPageChange(event, number); }; const handleLastPageButtonClick = (event) => { - props.onChangePage( - event, + props.onPageChange( Math.max(0, Math.ceil(props.count / props.rowsPerPage) - 1) ); }; @@ -109,7 +106,9 @@ function MTablePaginationInner(props) { - {renderPagesButton(pageStart, pageEnd)} + + {renderPagesButton(pageStart, pageEnd)} + ({ }); MTablePaginationInner.propTypes = { - onChangePage: PropTypes.func, + onPageChange: PropTypes.func, page: PropTypes.number, count: PropTypes.number, rowsPerPage: PropTypes.number, diff --git a/src/components/MTableSummaryRow/index.js b/src/components/MTableSummaryRow/index.js index 309814c8..c94a2364 100644 --- a/src/components/MTableSummaryRow/index.js +++ b/src/components/MTableSummaryRow/index.js @@ -1,5 +1,6 @@ import * as React from 'react'; -import { TableRow, TableCell, withStyles } from '@material-ui/core'; +import { TableRow, TableCell } from '@material-ui/core'; +import { withStyles } from '@material-ui/styles'; import { getStyle } from '../MTableCell/utils'; import * as CommonValues from '../../utils/common-values'; import PropTypes from 'prop-types'; diff --git a/src/components/MTableToolbar/index.js b/src/components/MTableToolbar/index.js index dbb1d73e..41d3f12f 100644 --- a/src/components/MTableToolbar/index.js +++ b/src/components/MTableToolbar/index.js @@ -7,7 +7,8 @@ import TextField from '@material-ui/core/TextField'; import Toolbar from '@material-ui/core/Toolbar'; import Tooltip from '@material-ui/core/Tooltip'; import Typography from '@material-ui/core/Typography'; -import { lighten, withStyles } from '@material-ui/core'; +import { lighten } from '@material-ui/core'; +import { withStyles } from '@material-ui/styles'; import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/src/components/index.js b/src/components/index.js index 2c998a0c..45d3b4bd 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -34,7 +34,7 @@ export { default as MTableGroupRow } from './MTableGroupRow'; export { default as MTableHeader } from './MTableHeader'; export { default as MTableSteppedPagination } from './MTableSteppedPaginationInner'; export { default as MTablePagination } from './MTablePagination'; -export { default as MTableSummaryRow } from "./MTableSummaryRow"; +export { default as MTableSummaryRow } from './MTableSummaryRow'; export { default as MTableToolbar } from './MTableToolbar'; /** THESE REFACTORS ARE HAVING ISSUES */ // export { default as MTableEditCell } from './MTableEditCell'; diff --git a/src/components/m-table-body.js b/src/components/m-table-body.js index a13a1f15..c310e732 100644 --- a/src/components/m-table-body.js +++ b/src/components/m-table-body.js @@ -4,7 +4,7 @@ import { TableBody, TableCell, TableRow } from '@material-ui/core'; class MTableBody extends React.Component { renderEmpty(emptyRowCount, renderData) { - const rowHeight = this.props.options.padding === 'default' ? 49 : 36; + const rowHeight = this.props.options.padding === 'normal' ? 49 : 36; const localization = { ...MTableBody.defaultProps.localization, ...this.props.localization diff --git a/src/components/m-table-edit-cell.js b/src/components/m-table-edit-cell.js index 950085f4..5b9a0907 100644 --- a/src/components/m-table-edit-cell.js +++ b/src/components/m-table-edit-cell.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import TableCell from '@material-ui/core/TableCell'; import CircularProgress from '@material-ui/core/CircularProgress'; -import { withTheme } from '@material-ui/core'; +import { withTheme } from '@material-ui/styles'; class MTableEditCell extends React.Component { constructor(props) { diff --git a/src/components/m-table-edit-field.js b/src/components/m-table-edit-field.js index c1e02a86..d9d9b643 100644 --- a/src/components/m-table-edit-field.js +++ b/src/components/m-table-edit-field.js @@ -9,11 +9,11 @@ import FormGroup from '@material-ui/core/FormGroup'; import FormControlLabel from '@material-ui/core/FormControlLabel'; import DateFnsUtils from '@date-io/date-fns'; import { - MuiPickersUtilsProvider, + LocalizationProvider, TimePicker, DatePicker, DateTimePicker -} from '@material-ui/pickers'; +} from '@material-ui/lab'; import PropTypes from 'prop-types'; class MTableEditField extends React.Component { @@ -92,9 +92,13 @@ class MTableEditField extends React.Component { ? this.props.columnDef.dateSetting.format : 'dd.MM.yyyy'; return ( - + } format={dateFormat} value={this.props.value || null} onChange={this.props.onChange} @@ -108,15 +112,19 @@ class MTableEditField extends React.Component { 'aria-label': `${this.props.columnDef.title}: press space to edit` }} /> - + ); } renderTimeField() { return ( - + } format="HH:mm:ss" value={this.props.value || null} onChange={this.props.onChange} @@ -130,15 +138,19 @@ class MTableEditField extends React.Component { 'aria-label': `${this.props.columnDef.title}: press space to edit` }} /> - + ); } renderDateTimeField() { return ( - + } format="dd.MM.yyyy HH:mm:ss" value={this.props.value || null} onChange={this.props.onChange} @@ -152,7 +164,7 @@ class MTableEditField extends React.Component { 'aria-label': `${this.props.columnDef.title}: press space to edit` }} /> - + ); } @@ -160,6 +172,7 @@ class MTableEditField extends React.Component { return ( ); @@ -191,6 +207,7 @@ class MTableEditField extends React.Component { return ( ({ +const styles = { paginationRoot: { width: '100%' }, paginationToolbar: { - padding: 0, + padding: '0 !important', width: '100%' }, paginationCaption: { @@ -22,7 +22,7 @@ const styles = (theme) => ({ paginationSelectRoot: { margin: 0 } -}); +}; export default withStyles(styles, { withTheme: true })((props) => ( diff --git a/src/material-table.js b/src/material-table.js index ebdfff3d..efaaec08 100644 --- a/src/material-table.js +++ b/src/material-table.js @@ -10,8 +10,8 @@ import { DragDropContext, Droppable } from 'react-beautiful-dnd'; import DataManager from './utils/data-manager'; import { debounce } from 'debounce'; import equal from 'fast-deep-equal/react'; -import { withStyles } from '@material-ui/core'; import * as CommonValues from './utils/common-values'; +import { withStyles } from '@material-ui/styles'; /* eslint-enable no-unused-vars */ @@ -160,7 +160,7 @@ export default class MaterialTable extends React.Component { : this.state.pageSize; if (count <= pageSize * currentPage && currentPage !== 0) { - this.onChangePage(null, Math.max(0, Math.ceil(count / pageSize) - 1)); + this.onPageChange(null, Math.max(0, Math.ceil(count / pageSize) - 1)); } } @@ -370,45 +370,45 @@ export default class MaterialTable extends React.Component { } }; - onChangePage = (event, page) => { + onPageChange = (event, page) => { if (this.isRemoteData()) { const query = { ...this.state.query }; query.page = page; this.onQueryChange(query, () => { - this.props.onChangePage && - this.props.onChangePage(page, query.pageSize); + this.props.onPageChange && + this.props.onPageChange(page, query.pageSize); }); } else { if (!this.isOutsidePageNumbers(this.props)) { this.dataManager.changeCurrentPage(page); } this.setState(this.dataManager.getRenderState(), () => { - this.props.onChangePage && - this.props.onChangePage(page, this.state.pageSize); + this.props.onPageChange && + this.props.onPageChange(page, this.state.pageSize); }); } }; - onChangeRowsPerPage = (event) => { + onRowsPerPageChange = (event) => { const pageSize = event.target.value; this.dataManager.changePageSize(pageSize); - this.props.onChangePage && this.props.onChangePage(0, pageSize); + this.props.onPageChange && this.props.onPageChange(0, pageSize); if (this.isRemoteData()) { const query = { ...this.state.query }; query.pageSize = event.target.value; query.page = 0; this.onQueryChange(query, () => { - this.props.onChangeRowsPerPage && - this.props.onChangeRowsPerPage(pageSize); + this.props.onRowsPerPageChange && + this.props.onRowsPerPageChange(pageSize); }); } else { this.dataManager.changeCurrentPage(0); this.setState(this.dataManager.getRenderState(), () => { - this.props.onChangeRowsPerPage && - this.props.onChangeRowsPerPage(pageSize); + this.props.onRowsPerPageChange && + this.props.onRowsPerPageChange(pageSize); }); } }; @@ -785,8 +785,8 @@ export default class MaterialTable extends React.Component { ) }} page={this.isRemoteData() ? this.state.query.page : currentPage} - onChangePage={this.onChangePage} - onChangeRowsPerPage={this.onChangeRowsPerPage} + onPageChange={this.onPageChange} + onRowsPerPageChange={this.onRowsPerPageChange} ActionsComponent={(subProps) => props.options.paginationType === 'normal' ? ( - props.options.padding === 'default' ? 'medium' : 'small'; + props.options.padding === 'normal' ? 'medium' : 'small'; export const baseIconSize = (props) => elementSize(props) === 'medium' ? 48 : 32; export const rowActions = (props) => diff --git a/types/index.d.ts b/types/index.d.ts index 8a0d0115..f492d6c3 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -50,8 +50,8 @@ export interface MaterialTableProps { options?: Options; parentChildData?: (row: RowData, rows: RowData[]) => RowData | undefined; localization?: Localization; - onChangeRowsPerPage?: (pageSize: number) => void; - onChangePage?: (page: number, pageSize: number) => void; + onRowsPerPageChange?: (pageSize: number) => void; + onPageChange?: (page: number, pageSize: number) => void; onChangeColumnHidden?: (column: Column, hidden: boolean) => void; onColumnDragged?: (sourceIndex: number, destinationIndex: number) => void; onOrderChange?: (orderBy: number, orderDirection: 'asc' | 'desc') => void; @@ -343,7 +343,7 @@ export interface Options { loadingType?: 'overlay' | 'linear'; maxBodyHeight?: number | string; minBodyHeight?: number | string; - padding?: 'default' | 'dense'; + padding?: 'normal' | 'dense'; paging?: boolean; grouping?: boolean; groupTitle?: (groupData: any) => any;