[ToggleButton] Fix ToggleButtonGroup exports (mui#12733)

* [ToggleButton] Fix ToggleButtonGroup exports * Move utility functions
akaxiaok · Sep 1, 2018 · 20f0926 · 20f0926
1 parent f9632f8
commit 20f0926
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,3 +1 @@
 export { default } from './ToggleButton';
-export { default as ToggleButtonGroup } from './ToggleButtonGroup';
-export * from './ToggleButton';
diff --git a/...b/src/ToggleButton/ToggleButtonGroup.d.ts → .../ToggleButtonGroup/ToggleButtonGroup.d.ts b/...b/src/ToggleButton/ToggleButtonGroup.d.ts → .../ToggleButtonGroup/ToggleButtonGroup.d.ts
diff --git a/...lab/src/ToggleButton/ToggleButtonGroup.js → ...rc/ToggleButtonGroup/ToggleButtonGroup.js b/...lab/src/ToggleButton/ToggleButtonGroup.js → ...rc/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/...rc/ToggleButton/ToggleButtonGroup.test.js → ...ggleButtonGroup/ToggleButtonGroup.test.js b/...rc/ToggleButton/ToggleButtonGroup.test.js → ...ggleButtonGroup/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('<ToggleButtonGroup />', () => {
   let shallow;

diff --git a/...erial-ui-lab/src/ToggleButton/hasValue.js → ...-ui-lab/src/ToggleButtonGroup/hasValue.js b/...erial-ui-lab/src/ToggleButton/hasValue.js → ...-ui-lab/src/ToggleButtonGroup/hasValue.js
diff --git a/...-ui-lab/src/ToggleButton/hasValue.test.js → ...ab/src/ToggleButtonGroup/hasValue.test.js b/...-ui-lab/src/ToggleButton/hasValue.test.js → ...ab/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
@@ -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
@@ -0,0 +1 @@
+export { default } from './ToggleButtonGroup';
diff --git a/...i-lab/src/ToggleButton/isValueSelected.js → .../src/ToggleButtonGroup/isValueSelected.js b/...i-lab/src/ToggleButton/isValueSelected.js → .../src/ToggleButtonGroup/isValueSelected.js
diff --git a/.../src/ToggleButton/isValueSelected.test.js → ...ToggleButtonGroup/isValueSelected.test.js b/.../src/ToggleButton/isValueSelected.test.js → ...ToggleButtonGroup/isValueSelected.test.js
diff --git 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
@@ -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
@@ -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:
 | <span class="prop-name">selected</span> | 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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export { default } from './ToggleButtonGroup';
		export * from './ToggleButtonGroup';