From 5710c4c0892fd09aa835a51e0a086f16c0154f51 Mon Sep 17 00:00:00 2001 From: Max Hoogenbosch Date: Tue, 16 Jul 2019 22:59:20 +0200 Subject: [PATCH] Use path imports for @material-ui/core --- .gitignore | 1 + src/components/m-table-action.js | 4 +++- src/components/m-table-body-row.js | 7 ++++++- src/components/m-table-body.js | 4 +++- src/components/m-table-cell.js | 2 +- src/components/m-table-edit-field.js | 5 ++++- src/components/m-table-edit-row.js | 4 +++- src/components/m-table-filter-row.js | 17 +++++++++++------ src/components/m-table-group-row.js | 4 +++- src/components/m-table-groupbar.js | 4 +++- src/components/m-table-header.js | 10 ++++++---- src/components/m-table-pagination.js | 5 ++++- src/components/m-table-stepped-pagination.js | 6 +++++- src/components/m-table-toolbar.js | 12 +++++++++++- src/default-props.js | 5 ++++- src/index.js | 2 +- src/material-table.js | 5 ++++- 17 files changed, 73 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 2815140fc..38e9ff1f4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ dist node_modules package-lock.json yarn.lock +.idea \ No newline at end of file diff --git a/src/components/m-table-action.js b/src/components/m-table-action.js index b2fa66d71..06a803110 100644 --- a/src/components/m-table-action.js +++ b/src/components/m-table-action.js @@ -1,7 +1,9 @@ /* eslint-disable no-unused-vars */ import * as React from 'react'; import PropTypes from 'prop-types'; -import { Icon, IconButton, Tooltip } from '@material-ui/core'; +import Icon from '@material-ui/core/Icon'; +import IconButton from '@material-ui/core/IconButton'; +import Tooltip from '@material-ui/core/Tooltip'; /* eslint-enable no-unused-vars */ class MTableAction extends React.Component { diff --git a/src/components/m-table-body-row.js b/src/components/m-table-body-row.js index c1616a94a..290eb66c7 100644 --- a/src/components/m-table-body-row.js +++ b/src/components/m-table-body-row.js @@ -1,5 +1,10 @@ /* eslint-disable no-unused-vars */ -import { Checkbox, TableCell, TableRow, IconButton, Icon, Tooltip } from '@material-ui/core'; +import Checkbox from '@material-ui/core/Checkbox'; +import TableCell from '@material-ui/core/TableCell'; +import TableRow from '@material-ui/core/TableRow'; +import IconButton from '@material-ui/core/IconButton'; +import Icon from '@material-ui/core/Icon'; +import Tooltip from '@material-ui/core/Tooltip'; import PropTypes from 'prop-types'; import * as React from 'react'; /* eslint-enable no-unused-vars */ diff --git a/src/components/m-table-body.js b/src/components/m-table-body.js index b7de996db..27448841b 100644 --- a/src/components/m-table-body.js +++ b/src/components/m-table-body.js @@ -1,5 +1,7 @@ /* eslint-disable no-unused-vars */ -import { TableBody, TableCell, TableRow } from '@material-ui/core'; +import TableBody from '@material-ui/core/TableBody'; +import TableCell from '@material-ui/core/TableCell'; +import TableRow from '@material-ui/core/TableRow'; import PropTypes from 'prop-types'; import * as React from 'react'; /* eslint-enable no-unused-vars */ diff --git a/src/components/m-table-cell.js b/src/components/m-table-cell.js index f9ab27ae6..19eecc5ee 100644 --- a/src/components/m-table-cell.js +++ b/src/components/m-table-cell.js @@ -1,6 +1,6 @@ /* eslint-disable no-unused-vars */ import * as React from 'react'; -import { Icon, TableCell } from '@material-ui/core'; +import TableCell from '@material-ui/core/TableCell'; import PropTypes from 'prop-types'; /* eslint-enable no-unused-vars */ diff --git a/src/components/m-table-edit-field.js b/src/components/m-table-edit-field.js index 7e16b0f32..343c70bdc 100644 --- a/src/components/m-table-edit-field.js +++ b/src/components/m-table-edit-field.js @@ -1,5 +1,8 @@ import * as React from 'react'; -import { TextField, Checkbox, Select, MenuItem } from '@material-ui/core'; +import TextField from '@material-ui/core/TextField'; +import Checkbox from '@material-ui/core/Checkbox'; +import Select from '@material-ui/core/Select'; +import MenuItem from '@material-ui/core/MenuItem'; import DateFnsUtils from '@date-io/date-fns'; import { MuiPickersUtilsProvider, TimePicker, DatePicker, DateTimePicker } from '@material-ui/pickers'; import PropTypes from 'prop-types'; diff --git a/src/components/m-table-edit-row.js b/src/components/m-table-edit-row.js index 9ec85d1b0..b1aa6f4f7 100644 --- a/src/components/m-table-edit-row.js +++ b/src/components/m-table-edit-row.js @@ -1,5 +1,7 @@ /* eslint-disable no-unused-vars */ -import { Checkbox, TableCell, TableRow, IconButton, Icon, Tooltip, Typography } from '@material-ui/core'; +import TableCell from '@material-ui/core/TableCell'; +import TableRow from '@material-ui/core/TableRow'; +import Typography from '@material-ui/core/Typography'; import PropTypes from 'prop-types'; import * as React from 'react'; import { byString, setByString } from '../utils'; diff --git a/src/components/m-table-filter-row.js b/src/components/m-table-filter-row.js index c1f227f9f..ac6e698ce 100644 --- a/src/components/m-table-filter-row.js +++ b/src/components/m-table-filter-row.js @@ -1,12 +1,17 @@ /* eslint-disable no-unused-vars */ import * as React from 'react'; import PropTypes from 'prop-types'; -import { - TableCell, TableRow, TextField, - FormControl, Select, Input, - MenuItem, Checkbox, ListItemText, - InputAdornment, Icon, Tooltip, -} from '@material-ui/core'; +import TableCell from '@material-ui/core/TableCell'; +import TableRow from '@material-ui/core/TableRow'; +import TextField from '@material-ui/core/TextField'; +import FormControl from '@material-ui/core/FormControl'; +import Select from '@material-ui/core/Select'; +import Input from '@material-ui/core/Input'; +import MenuItem from '@material-ui/core/MenuItem'; +import Checkbox from '@material-ui/core/Checkbox'; +import ListItemText from '@material-ui/core/ListItemText'; +import InputAdornment from '@material-ui/core/InputAdornment'; +import Tooltip from '@material-ui/core/Tooltip'; import DateFnsUtils from '@date-io/date-fns'; import { MuiPickersUtilsProvider, TimePicker, DatePicker, DateTimePicker } from '@material-ui/pickers'; diff --git a/src/components/m-table-group-row.js b/src/components/m-table-group-row.js index 3d72c636e..967c4b537 100644 --- a/src/components/m-table-group-row.js +++ b/src/components/m-table-group-row.js @@ -1,5 +1,7 @@ /* eslint-disable no-unused-vars */ -import { TableCell, TableRow, IconButton } from '@material-ui/core'; +import TableCell from '@material-ui/core/TableCell'; +import TableRow from '@material-ui/core/TableRow'; +import IconButton from '@material-ui/core/IconButton'; import PropTypes from 'prop-types'; import * as React from 'react'; /* eslint-enable no-unused-vars */ diff --git a/src/components/m-table-groupbar.js b/src/components/m-table-groupbar.js index 9d9bf23cf..fd06ae73b 100644 --- a/src/components/m-table-groupbar.js +++ b/src/components/m-table-groupbar.js @@ -1,5 +1,7 @@ /* eslint-disable no-unused-vars */ -import { Icon, Toolbar, Chip, Typography } from '@material-ui/core'; +import Toolbar from '@material-ui/core/Toolbar'; +import Chip from '@material-ui/core/Chip'; +import Typography from '@material-ui/core/Typography'; import PropTypes from 'prop-types'; import * as React from 'react'; import { Droppable, Draggable } from 'react-beautiful-dnd'; diff --git a/src/components/m-table-header.js b/src/components/m-table-header.js index cfc4c9d31..04ed2baf9 100644 --- a/src/components/m-table-header.js +++ b/src/components/m-table-header.js @@ -1,10 +1,12 @@ /* eslint-disable no-unused-vars */ import * as React from 'react'; import PropTypes from 'prop-types'; -import { - TableHead, TableRow, TableCell, - TableSortLabel, Checkbox, withStyles -} from '@material-ui/core'; +import TableHead from '@material-ui/core/TableHead'; +import TableRow from '@material-ui/core/TableRow'; +import TableCell from '@material-ui/core/TableCell'; +import TableSortLabel from '@material-ui/core/TableSortLabel'; +import Checkbox from '@material-ui/core/Checkbox'; +import withStyles from '@material-ui/core/styles/withStyles'; import { Droppable, Draggable } from 'react-beautiful-dnd'; /* eslint-enable no-unused-vars */ diff --git a/src/components/m-table-pagination.js b/src/components/m-table-pagination.js index d3db1c237..2c576d27d 100644 --- a/src/components/m-table-pagination.js +++ b/src/components/m-table-pagination.js @@ -1,5 +1,8 @@ /* eslint-disable no-unused-vars */ -import { Icon, IconButton, withStyles, Tooltip, Typography } from '@material-ui/core'; +import IconButton from '@material-ui/core/IconButton'; +import withStyles from '@material-ui/core/styles/withStyles'; +import Tooltip from '@material-ui/core/Tooltip'; +import Typography from '@material-ui/core/Typography'; import PropTypes from 'prop-types'; import * as React from 'react'; /* eslint-enable no-unused-vars */ diff --git a/src/components/m-table-stepped-pagination.js b/src/components/m-table-stepped-pagination.js index 6c495689f..534608ff7 100644 --- a/src/components/m-table-stepped-pagination.js +++ b/src/components/m-table-stepped-pagination.js @@ -1,5 +1,9 @@ /* eslint-disable no-unused-vars */ -import { Icon, IconButton, withStyles, Tooltip, Hidden, Typography, Button } from '@material-ui/core'; +import IconButton from '@material-ui/core/IconButton'; +import withStyles from '@material-ui/core/styles/withStyles'; +import Tooltip from '@material-ui/core/Tooltip'; +import Hidden from '@material-ui/core/Hidden'; +import Button from '@material-ui/core/Button'; import PropTypes from 'prop-types'; import * as React from 'react'; /* eslint-enable no-unused-vars */ diff --git a/src/components/m-table-toolbar.js b/src/components/m-table-toolbar.js index 0ab2b410e..b6fdc67da 100644 --- a/src/components/m-table-toolbar.js +++ b/src/components/m-table-toolbar.js @@ -1,5 +1,15 @@ /* eslint-disable no-unused-vars */ -import { Checkbox, FormControlLabel, Icon, IconButton, InputAdornment, Menu, MenuItem, TextField, Toolbar, Tooltip, Typography, withStyles } from '@material-ui/core'; +import Checkbox from '@material-ui/core/Checkbox'; +import FormControlLabel from '@material-ui/core/FormControlLabel'; +import IconButton from '@material-ui/core/IconButton'; +import InputAdornment from '@material-ui/core/InputAdornment'; +import Menu from '@material-ui/core/Menu'; +import MenuItem from '@material-ui/core/MenuItem'; +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 withStyles from '@material-ui/core/styles/withStyles'; import { lighten } from '@material-ui/core/styles/colorManipulator'; import classNames from 'classnames'; import { CsvBuilder } from 'filefy'; diff --git a/src/default-props.js b/src/default-props.js index 4e9c338bb..b893c82ec 100644 --- a/src/default-props.js +++ b/src/default-props.js @@ -1,5 +1,8 @@ import React from 'react'; -import { CircularProgress, Icon, Paper, TablePagination } from '@material-ui/core'; +import CircularProgress from '@material-ui/core/CircularProgress'; +import Icon from '@material-ui/core/Icon'; +import Paper from '@material-ui/core/Paper'; +import TablePagination from '@material-ui/core/TablePagination'; import * as MComponents from './components'; import PropTypes from 'prop-types'; import { fade } from '@material-ui/core/styles/colorManipulator'; diff --git a/src/index.js b/src/index.js index a1afbfe21..7f8910046 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,7 @@ import React from 'react'; import { defaultProps } from './default-props'; import { propTypes } from './prop-types'; import MaterialTable from './material-table'; -import { withStyles } from '@material-ui/core'; +import withStyles from '@material-ui/core/styles/withStyles'; MaterialTable.defaultProps = defaultProps; MaterialTable.propTypes = propTypes; diff --git a/src/material-table.js b/src/material-table.js index 463a63304..c0ecf355e 100644 --- a/src/material-table.js +++ b/src/material-table.js @@ -1,5 +1,8 @@ /* eslint-disable no-unused-vars */ -import { Table, TableFooter, TableRow, LinearProgress } from '@material-ui/core'; +import Table from '@material-ui/core/Table'; +import TableFooter from '@material-ui/core/TableFooter'; +import TableRow from '@material-ui/core/TableRow'; +import LinearProgress from '@material-ui/core/LinearProgress'; import DoubleScrollbar from "react-double-scrollbar"; import * as React from 'react'; import { MTablePagination, MTableSteppedPagination } from './components';