From 20f092609316b2f4a9f1b191a9c681c89f55b55a Mon Sep 17 00:00:00 2001 From: Matt Brookes Date: Sat, 1 Sep 2018 01:24:20 +0100 Subject: [PATCH] [ToggleButton] Fix ToggleButtonGroup exports (#12733) * [ToggleButton] Fix ToggleButtonGroup exports * Move utility functions --- docs/src/pages/lab/toggle-button/ToggleButtons.js | 3 ++- packages/material-ui-lab/src/ToggleButton/ToggleButton.js | 2 +- packages/material-ui-lab/src/ToggleButton/index.d.ts | 1 - packages/material-ui-lab/src/ToggleButton/index.js | 2 -- .../ToggleButtonGroup.d.ts | 0 .../{ToggleButton => ToggleButtonGroup}/ToggleButtonGroup.js | 2 +- .../ToggleButtonGroup.test.js | 2 +- .../src/{ToggleButton => ToggleButtonGroup}/hasValue.js | 0 .../src/{ToggleButton => ToggleButtonGroup}/hasValue.test.js | 0 packages/material-ui-lab/src/ToggleButtonGroup/index.d.ts | 2 ++ packages/material-ui-lab/src/ToggleButtonGroup/index.js | 1 + .../{ToggleButton => ToggleButtonGroup}/isValueSelected.js | 0 .../isValueSelected.test.js | 0 packages/material-ui-lab/src/index.d.ts | 4 ++-- packages/material-ui-lab/src/index.js | 4 ++-- pages/lab/api/toggle-button-group.md | 4 ++-- 16 files changed, 14 insertions(+), 13 deletions(-) rename packages/material-ui-lab/src/{ToggleButton => ToggleButtonGroup}/ToggleButtonGroup.d.ts (100%) rename packages/material-ui-lab/src/{ToggleButton => ToggleButtonGroup}/ToggleButtonGroup.js (98%) rename packages/material-ui-lab/src/{ToggleButton => ToggleButtonGroup}/ToggleButtonGroup.test.js (99%) rename packages/material-ui-lab/src/{ToggleButton => ToggleButtonGroup}/hasValue.js (100%) rename packages/material-ui-lab/src/{ToggleButton => ToggleButtonGroup}/hasValue.test.js (100%) create mode 100644 packages/material-ui-lab/src/ToggleButtonGroup/index.d.ts create mode 100644 packages/material-ui-lab/src/ToggleButtonGroup/index.js rename packages/material-ui-lab/src/{ToggleButton => ToggleButtonGroup}/isValueSelected.js (100%) rename packages/material-ui-lab/src/{ToggleButton => ToggleButtonGroup}/isValueSelected.test.js (100%) diff --git a/docs/src/pages/lab/toggle-button/ToggleButtons.js b/docs/src/pages/lab/toggle-button/ToggleButtons.js index fbf55b7cf37855..92fffabcbca00d 100644 --- a/docs/src/pages/lab/toggle-button/ToggleButtons.js +++ b/docs/src/pages/lab/toggle-button/ToggleButtons.js @@ -12,7 +12,8 @@ import FormatColorFillIcon from '@material-ui/icons/FormatColorFill'; import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown'; import Typography from '@material-ui/core/Typography'; import Grid from '@material-ui/core/Grid'; -import ToggleButton, { ToggleButtonGroup } from '@material-ui/lab/ToggleButton'; +import ToggleButton from '@material-ui/lab/ToggleButton'; +import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup'; const styles = theme => ({ toggleContainer: { diff --git a/packages/material-ui-lab/src/ToggleButton/ToggleButton.js b/packages/material-ui-lab/src/ToggleButton/ToggleButton.js index edcf3223c9c40b..349f15ef6d706e 100644 --- a/packages/material-ui-lab/src/ToggleButton/ToggleButton.js +++ b/packages/material-ui-lab/src/ToggleButton/ToggleButton.js @@ -3,7 +3,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { withStyles } from '@material-ui/core/styles'; +import withStyles from '@material-ui/core/styles/withStyles'; import { fade } from '@material-ui/core/styles/colorManipulator'; import ButtonBase from '@material-ui/core/ButtonBase'; diff --git a/packages/material-ui-lab/src/ToggleButton/index.d.ts b/packages/material-ui-lab/src/ToggleButton/index.d.ts index a7a15e9cd24fe3..1fc7822337a76c 100644 --- a/packages/material-ui-lab/src/ToggleButton/index.d.ts +++ b/packages/material-ui-lab/src/ToggleButton/index.d.ts @@ -1,3 +1,2 @@ export { default } from './ToggleButton'; -export { default as ToggleButtonGroup } from './ToggleButtonGroup'; export * from './ToggleButton'; diff --git a/packages/material-ui-lab/src/ToggleButton/index.js b/packages/material-ui-lab/src/ToggleButton/index.js index a7a15e9cd24fe3..5061a1766c789e 100644 --- a/packages/material-ui-lab/src/ToggleButton/index.js +++ b/packages/material-ui-lab/src/ToggleButton/index.js @@ -1,3 +1 @@ export { default } from './ToggleButton'; -export { default as ToggleButtonGroup } from './ToggleButtonGroup'; -export * from './ToggleButton'; diff --git a/packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.d.ts b/packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.d.ts similarity index 100% rename from packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.d.ts rename to packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.d.ts diff --git a/packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.js b/packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.js similarity index 98% rename from packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.js rename to packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.js index 4693d89ff5a0a8..9f0b5ebdbb96d2 100644 --- a/packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.js +++ b/packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { withStyles } from '@material-ui/core/styles'; +import withStyles from '@material-ui/core/styles/withStyles'; import hasValue from './hasValue'; import isValueSelected from './isValueSelected'; diff --git a/packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.test.js b/packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.test.js similarity index 99% rename from packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.test.js rename to packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.test.js index 8afc0311f3a7bd..6df06c47d09918 100644 --- a/packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.test.js +++ b/packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.test.js @@ -3,7 +3,7 @@ import { assert } from 'chai'; import { spy } from 'sinon'; import { createMount, createShallow, getClasses } from '@material-ui/core/test-utils'; import ToggleButtonGroup from './ToggleButtonGroup'; -import ToggleButton from './ToggleButton'; +import ToggleButton from '../ToggleButton'; describe('', () => { let shallow; diff --git a/packages/material-ui-lab/src/ToggleButton/hasValue.js b/packages/material-ui-lab/src/ToggleButtonGroup/hasValue.js similarity index 100% rename from packages/material-ui-lab/src/ToggleButton/hasValue.js rename to packages/material-ui-lab/src/ToggleButtonGroup/hasValue.js diff --git a/packages/material-ui-lab/src/ToggleButton/hasValue.test.js b/packages/material-ui-lab/src/ToggleButtonGroup/hasValue.test.js similarity index 100% rename from packages/material-ui-lab/src/ToggleButton/hasValue.test.js rename to packages/material-ui-lab/src/ToggleButtonGroup/hasValue.test.js diff --git a/packages/material-ui-lab/src/ToggleButtonGroup/index.d.ts b/packages/material-ui-lab/src/ToggleButtonGroup/index.d.ts new file mode 100644 index 00000000000000..f8533d66013238 --- /dev/null +++ b/packages/material-ui-lab/src/ToggleButtonGroup/index.d.ts @@ -0,0 +1,2 @@ +export { default } from './ToggleButtonGroup'; +export * from './ToggleButtonGroup'; diff --git a/packages/material-ui-lab/src/ToggleButtonGroup/index.js b/packages/material-ui-lab/src/ToggleButtonGroup/index.js new file mode 100644 index 00000000000000..28dff2c5331011 --- /dev/null +++ b/packages/material-ui-lab/src/ToggleButtonGroup/index.js @@ -0,0 +1 @@ +export { default } from './ToggleButtonGroup'; diff --git a/packages/material-ui-lab/src/ToggleButton/isValueSelected.js b/packages/material-ui-lab/src/ToggleButtonGroup/isValueSelected.js similarity index 100% rename from packages/material-ui-lab/src/ToggleButton/isValueSelected.js rename to packages/material-ui-lab/src/ToggleButtonGroup/isValueSelected.js diff --git a/packages/material-ui-lab/src/ToggleButton/isValueSelected.test.js b/packages/material-ui-lab/src/ToggleButtonGroup/isValueSelected.test.js similarity index 100% rename from packages/material-ui-lab/src/ToggleButton/isValueSelected.test.js rename to packages/material-ui-lab/src/ToggleButtonGroup/isValueSelected.test.js diff --git a/packages/material-ui-lab/src/index.d.ts b/packages/material-ui-lab/src/index.d.ts index 196930d833cba6..2e6be5847f9d2f 100644 --- a/packages/material-ui-lab/src/index.d.ts +++ b/packages/material-ui-lab/src/index.d.ts @@ -2,5 +2,5 @@ export { default as Slider } from './Slider'; export { default as SpeedDial } from './SpeedDial'; export { default as SpeedDialAction } from './SpeedDialAction'; export { default as SpeedDialIcon } from './SpeedDialIcon'; -export { default as ToggleButton } from './ToggleButton/ToggleButton'; -export { default as ToggleButtonGroup } from './ToggleButton/ToggleButtonGroup'; +export { default as ToggleButton } from './ToggleButton'; +export { default as ToggleButtonGroup } from './ToggleButtonGroup'; diff --git a/packages/material-ui-lab/src/index.js b/packages/material-ui-lab/src/index.js index 196930d833cba6..2e6be5847f9d2f 100644 --- a/packages/material-ui-lab/src/index.js +++ b/packages/material-ui-lab/src/index.js @@ -2,5 +2,5 @@ export { default as Slider } from './Slider'; export { default as SpeedDial } from './SpeedDial'; export { default as SpeedDialAction } from './SpeedDialAction'; export { default as SpeedDialIcon } from './SpeedDialIcon'; -export { default as ToggleButton } from './ToggleButton/ToggleButton'; -export { default as ToggleButtonGroup } from './ToggleButton/ToggleButtonGroup'; +export { default as ToggleButton } from './ToggleButton'; +export { default as ToggleButtonGroup } from './ToggleButtonGroup'; diff --git a/pages/lab/api/toggle-button-group.md b/pages/lab/api/toggle-button-group.md index da35b4b38e5c30..28f444e5054b54 100644 --- a/pages/lab/api/toggle-button-group.md +++ b/pages/lab/api/toggle-button-group.md @@ -1,5 +1,5 @@ --- -filename: /packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.js +filename: /packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.js title: ToggleButtonGroup API --- @@ -36,7 +36,7 @@ This property accepts the following keys: | selected | Styles applied to the root element if `selected={true}` or `selected="auto" and `value` set. Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section -and the [implementation of the component](https://github.com/mui-org/material-ui/tree/master/packages/material-ui-lab/src/ToggleButton/ToggleButtonGroup.js) +and the [implementation of the component](https://github.com/mui-org/material-ui/tree/master/packages/material-ui-lab/src/ToggleButtonGroup/ToggleButtonGroup.js) for more detail. If using the `overrides` key of the theme as documented