Skip to content

Commit b32f79c

Browse files
authored
fix(react-grid-material-ui): use long paths for modules (#684)
related to #671
1 parent 9bcab02 commit b32f79c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+79
-95
lines changed

packages/dx-react-demos/.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"jsx-a11y/href-no-hash": "off",
2020
"jsx-a11y/anchor-is-valid": "off",
2121
"import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.*"]}],
22-
"filenames/match-regex": [2, "^[a-z-\\.]+$"]
22+
"filenames/match-regex": [2, "^[a-z-\\.]+$"],
23+
"no-restricted-imports": ["error", "material-ui", "material-ui-icons"]
2324
}
2425
}

packages/dx-react-demos/src/material-ui/basic/table-cell-template.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { TableCell, Paper } from 'material-ui';
3+
import Paper from 'material-ui/Paper';
4+
import { TableCell } from 'material-ui/Table';
45
import {
56
Grid,
67
Table,

packages/dx-react-demos/src/material-ui/basic/table-row-template.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { Paper } from 'material-ui';
3+
import Paper from 'material-ui/Paper';
44
import {
55
Grid,
66
Table,

packages/dx-react-demos/src/material-ui/components/loading.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { CircularProgress } from 'material-ui';
2+
import { CircularProgress } from 'material-ui/Progress';
33

44
import './loading.css';
55

packages/dx-react-demos/src/material-ui/data-types/editors.jsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ import {
1111
TableEditRow,
1212
TableEditColumn,
1313
} from '@devexpress/dx-react-grid-material-ui';
14-
import {
15-
Chip,
16-
Input,
17-
MenuItem,
18-
Paper,
19-
Select,
20-
} from 'material-ui';
14+
import Paper from 'material-ui/Paper';
15+
import Chip from 'material-ui/Chip';
16+
import Input from 'material-ui/Input';
17+
import Select from 'material-ui/Select';
18+
import { MenuItem } from 'material-ui/Menu';
2119

2220
import {
2321
generateRows,

packages/dx-react-demos/src/material-ui/featured-controlled-mode/demo.jsx

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@ import {
99
Table, TableHeaderRow, TableEditRow, TableEditColumn,
1010
PagingPanel, DragDropProvider, TableColumnReordering,
1111
} from '@devexpress/dx-react-grid-material-ui';
12-
import {
13-
TableCell,
14-
Button,
15-
IconButton,
16-
Input,
17-
Dialog,
12+
import Paper from 'material-ui/Paper';
13+
import Dialog, {
1814
DialogActions,
1915
DialogContent,
2016
DialogContentText,
2117
DialogTitle,
22-
MenuItem,
23-
Select,
24-
Paper,
25-
} from 'material-ui';
18+
} from 'material-ui/Dialog';
19+
import Button from 'material-ui/Button';
20+
import IconButton from 'material-ui/IconButton';
21+
import Input from 'material-ui/Input';
22+
import Select from 'material-ui/Select';
23+
import { MenuItem } from 'material-ui/Menu';
24+
import { TableCell } from 'material-ui/Table';
2625

2726
import DeleteIcon from 'material-ui-icons/Delete';
2827
import EditIcon from 'material-ui-icons/Edit';

packages/dx-react-demos/src/material-ui/featured-remote-data/demo.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import {
1111
TableHeaderRow,
1212
PagingPanel,
1313
} from '@devexpress/dx-react-grid-material-ui';
14-
import { TableCell, Paper } from 'material-ui';
14+
import Paper from 'material-ui/Paper';
15+
import { TableCell } from 'material-ui/Table';
1516
import { withStyles } from 'material-ui/styles';
1617
import { Loading } from '../components/loading';
1718

packages/dx-react-demos/src/material-ui/filtering/custom-filter-row.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { Input, TableCell, Paper } from 'material-ui';
3+
import Paper from 'material-ui/Paper';
4+
import Input from 'material-ui/Input';
5+
import { TableCell } from 'material-ui/Table';
46
import { withStyles } from 'material-ui/styles';
57
import {
68
FilteringState,

packages/dx-react-demos/src/material-ui/grouping/custom-advanced.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { Paper } from 'material-ui';
3+
import Paper from 'material-ui/Paper';
44
import {
55
GroupingState,
66
IntegratedGrouping,

packages/dx-react-demos/src/material-ui/templates/highlighted-cell.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { TableCell } from 'material-ui';
3+
import { TableCell } from 'material-ui/Table';
44
import { withStyles } from 'material-ui/styles';
55

66
const getColor = (amount) => {

0 commit comments

Comments
 (0)