From dce63d8a6a1194b66c1cc5241594ea173a9c65f9 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sat, 28 Mar 2020 00:53:59 +0100 Subject: [PATCH 1/2] [core] Remove createSvgIcon duplication --- .../src/utils/createSvgIcon.d.ts | 7 ++----- .../src/utils/createSvgIcon.js | 21 +------------------ .../src/internal/svg-icons/Add.js | 2 +- .../src/internal/svg-icons/ArrowDropDown.js | 2 +- .../src/internal/svg-icons/Close.js | 2 +- .../src/internal/svg-icons/ErrorOutline.js | 2 +- .../src/internal/svg-icons/FirstPage.js | 2 +- .../src/internal/svg-icons/InfoOutlined.js | 2 +- .../src/internal/svg-icons/LastPage.js | 2 +- .../src/internal/svg-icons/NavigateBefore.js | 2 +- .../src/internal/svg-icons/NavigateNext.js | 2 +- .../svg-icons/ReportProblemOutlined.js | 2 +- .../src/internal/svg-icons/Star.js | 2 +- .../src/internal/svg-icons/SuccessOutlined.js | 2 +- .../src/createSvgIcon/createSvgIcon.d.ts | 5 +++++ .../src/createSvgIcon}/createSvgIcon.js | 7 +++++-- .../material-ui/src/createSvgIcon/index.d.ts | 2 ++ .../material-ui/src/createSvgIcon/index.js | 1 + .../src/internal/svg-icons/ArrowDownward.js | 2 +- .../src/internal/svg-icons/ArrowDropDown.js | 2 +- .../src/internal/svg-icons/Cancel.js | 2 +- .../src/internal/svg-icons/CheckBox.js | 2 +- .../svg-icons/CheckBoxOutlineBlank.js | 2 +- .../src/internal/svg-icons/CheckCircle.js | 2 +- .../src/internal/svg-icons/Close.js | 2 +- .../svg-icons/IndeterminateCheckBox.js | 2 +- .../internal/svg-icons/KeyboardArrowLeft.js | 2 +- .../internal/svg-icons/KeyboardArrowRight.js | 2 +- .../src/internal/svg-icons/MoreHoriz.js | 2 +- .../src/internal/svg-icons/Person.js | 2 +- .../internal/svg-icons/RadioButtonChecked.js | 2 +- .../svg-icons/RadioButtonUnchecked.js | 2 +- .../src/internal/svg-icons/Warning.js | 2 +- .../src/internal/svg-icons/createSvgIcon.js | 20 ------------------ 34 files changed, 43 insertions(+), 74 deletions(-) create mode 100644 packages/material-ui/src/createSvgIcon/createSvgIcon.d.ts rename packages/{material-ui-lab/src/internal/svg-icons => material-ui/src/createSvgIcon}/createSvgIcon.js (76%) create mode 100644 packages/material-ui/src/createSvgIcon/index.d.ts create mode 100644 packages/material-ui/src/createSvgIcon/index.js delete mode 100644 packages/material-ui/src/internal/svg-icons/createSvgIcon.js diff --git a/packages/material-ui-icons/src/utils/createSvgIcon.d.ts b/packages/material-ui-icons/src/utils/createSvgIcon.d.ts index 9a9c973ff79cc1..b30877a075c2f2 100644 --- a/packages/material-ui-icons/src/utils/createSvgIcon.d.ts +++ b/packages/material-ui-icons/src/utils/createSvgIcon.d.ts @@ -1,5 +1,2 @@ -import SvgIcon from '@material-ui/core/SvgIcon'; - -declare function createSvgIcon(path: React.ReactNode, displayName: string): typeof SvgIcon; - -export default createSvgIcon; +export { default } from '@material-ui/core/createSvgIcon'; +export * from '@material-ui/core/createSvgIcon'; diff --git a/packages/material-ui-icons/src/utils/createSvgIcon.js b/packages/material-ui-icons/src/utils/createSvgIcon.js index 21e086a3ab170f..1633e7af3cc2b3 100644 --- a/packages/material-ui-icons/src/utils/createSvgIcon.js +++ b/packages/material-ui-icons/src/utils/createSvgIcon.js @@ -1,20 +1 @@ -import React from 'react'; -import SvgIcon from '@material-ui/core/SvgIcon'; - -export default function createSvgIcon(path, displayName) { - const Component = React.memo( - React.forwardRef((props, ref) => ( - - {path} - - )), - ); - - if (process.env.NODE_ENV !== 'production') { - Component.displayName = `${displayName}Icon`; - } - - Component.muiName = SvgIcon.muiName; - - return Component; -} +export { default } from '@material-ui/core/createSvgIcon'; diff --git a/packages/material-ui-lab/src/internal/svg-icons/Add.js b/packages/material-ui-lab/src/internal/svg-icons/Add.js index dc223900a21568..2336d1737df6ec 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/Add.js +++ b/packages/material-ui-lab/src/internal/svg-icons/Add.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/ArrowDropDown.js b/packages/material-ui-lab/src/internal/svg-icons/ArrowDropDown.js index 6deb6bd0a37aa2..cea816c3f0e6d9 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/ArrowDropDown.js +++ b/packages/material-ui-lab/src/internal/svg-icons/ArrowDropDown.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/Close.js b/packages/material-ui-lab/src/internal/svg-icons/Close.js index 942d756074f25d..03a32449aad8d5 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/Close.js +++ b/packages/material-ui-lab/src/internal/svg-icons/Close.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/ErrorOutline.js b/packages/material-ui-lab/src/internal/svg-icons/ErrorOutline.js index ca178ffe959c40..fc6cb861d4e1de 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/ErrorOutline.js +++ b/packages/material-ui-lab/src/internal/svg-icons/ErrorOutline.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/FirstPage.js b/packages/material-ui-lab/src/internal/svg-icons/FirstPage.js index 27102f886182ff..c4f08c91286572 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/FirstPage.js +++ b/packages/material-ui-lab/src/internal/svg-icons/FirstPage.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/InfoOutlined.js b/packages/material-ui-lab/src/internal/svg-icons/InfoOutlined.js index b5e38004bcf43d..515adb3750058b 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/InfoOutlined.js +++ b/packages/material-ui-lab/src/internal/svg-icons/InfoOutlined.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/LastPage.js b/packages/material-ui-lab/src/internal/svg-icons/LastPage.js index 20d190e998cb01..549c44537ce600 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/LastPage.js +++ b/packages/material-ui-lab/src/internal/svg-icons/LastPage.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/NavigateBefore.js b/packages/material-ui-lab/src/internal/svg-icons/NavigateBefore.js index fc4ac139f53b96..934eb67d052feb 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/NavigateBefore.js +++ b/packages/material-ui-lab/src/internal/svg-icons/NavigateBefore.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/NavigateNext.js b/packages/material-ui-lab/src/internal/svg-icons/NavigateNext.js index b35b7d1c89753a..7c7a3ef6c363a2 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/NavigateNext.js +++ b/packages/material-ui-lab/src/internal/svg-icons/NavigateNext.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/ReportProblemOutlined.js b/packages/material-ui-lab/src/internal/svg-icons/ReportProblemOutlined.js index b82ed0671e5734..8bafd6f2cb6b9b 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/ReportProblemOutlined.js +++ b/packages/material-ui-lab/src/internal/svg-icons/ReportProblemOutlined.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/Star.js b/packages/material-ui-lab/src/internal/svg-icons/Star.js index aa033c2e0d8426..b6c9c8c67d6245 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/Star.js +++ b/packages/material-ui-lab/src/internal/svg-icons/Star.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/SuccessOutlined.js b/packages/material-ui-lab/src/internal/svg-icons/SuccessOutlined.js index 4568f218fb05dc..353648f94e4980 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/SuccessOutlined.js +++ b/packages/material-ui-lab/src/internal/svg-icons/SuccessOutlined.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '@material-ui/core/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/createSvgIcon/createSvgIcon.d.ts b/packages/material-ui/src/createSvgIcon/createSvgIcon.d.ts new file mode 100644 index 00000000000000..9a9c973ff79cc1 --- /dev/null +++ b/packages/material-ui/src/createSvgIcon/createSvgIcon.d.ts @@ -0,0 +1,5 @@ +import SvgIcon from '@material-ui/core/SvgIcon'; + +declare function createSvgIcon(path: React.ReactNode, displayName: string): typeof SvgIcon; + +export default createSvgIcon; diff --git a/packages/material-ui-lab/src/internal/svg-icons/createSvgIcon.js b/packages/material-ui/src/createSvgIcon/createSvgIcon.js similarity index 76% rename from packages/material-ui-lab/src/internal/svg-icons/createSvgIcon.js rename to packages/material-ui/src/createSvgIcon/createSvgIcon.js index e98c7442ea6d6b..b6bd06e520c03f 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/createSvgIcon.js +++ b/packages/material-ui/src/createSvgIcon/createSvgIcon.js @@ -1,6 +1,9 @@ -import * as React from 'react'; -import SvgIcon from '@material-ui/core/SvgIcon'; +import React from 'react'; +import SvgIcon from '../SvgIcon'; +/** + * Private module reserved for @material-ui/x packages. + */ export default function createSvgIcon(path, displayName) { const Component = React.memo( React.forwardRef((props, ref) => ( diff --git a/packages/material-ui/src/createSvgIcon/index.d.ts b/packages/material-ui/src/createSvgIcon/index.d.ts new file mode 100644 index 00000000000000..06ec076af7fc00 --- /dev/null +++ b/packages/material-ui/src/createSvgIcon/index.d.ts @@ -0,0 +1,2 @@ +export { default } from './createSvgIcon'; +export * from './createSvgIcon'; diff --git a/packages/material-ui/src/createSvgIcon/index.js b/packages/material-ui/src/createSvgIcon/index.js new file mode 100644 index 00000000000000..9a9702dc4e6d17 --- /dev/null +++ b/packages/material-ui/src/createSvgIcon/index.js @@ -0,0 +1 @@ +export { default } from './createSvgIcon'; diff --git a/packages/material-ui/src/internal/svg-icons/ArrowDownward.js b/packages/material-ui/src/internal/svg-icons/ArrowDownward.js index 68800536c9a77c..4e491475f2c624 100644 --- a/packages/material-ui/src/internal/svg-icons/ArrowDownward.js +++ b/packages/material-ui/src/internal/svg-icons/ArrowDownward.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/ArrowDropDown.js b/packages/material-ui/src/internal/svg-icons/ArrowDropDown.js index 6deb6bd0a37aa2..4b3138c5cebe53 100644 --- a/packages/material-ui/src/internal/svg-icons/ArrowDropDown.js +++ b/packages/material-ui/src/internal/svg-icons/ArrowDropDown.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/Cancel.js b/packages/material-ui/src/internal/svg-icons/Cancel.js index 494617a88e5a18..7eb647354a63c3 100644 --- a/packages/material-ui/src/internal/svg-icons/Cancel.js +++ b/packages/material-ui/src/internal/svg-icons/Cancel.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/CheckBox.js b/packages/material-ui/src/internal/svg-icons/CheckBox.js index 3e7f5f58e73b91..49ee6d1d66869a 100644 --- a/packages/material-ui/src/internal/svg-icons/CheckBox.js +++ b/packages/material-ui/src/internal/svg-icons/CheckBox.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/CheckBoxOutlineBlank.js b/packages/material-ui/src/internal/svg-icons/CheckBoxOutlineBlank.js index bc8f424eec52a7..e68489c05c89fb 100644 --- a/packages/material-ui/src/internal/svg-icons/CheckBoxOutlineBlank.js +++ b/packages/material-ui/src/internal/svg-icons/CheckBoxOutlineBlank.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/CheckCircle.js b/packages/material-ui/src/internal/svg-icons/CheckCircle.js index 61c2cb61bbc28d..4d6c82623cd0a5 100644 --- a/packages/material-ui/src/internal/svg-icons/CheckCircle.js +++ b/packages/material-ui/src/internal/svg-icons/CheckCircle.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/Close.js b/packages/material-ui/src/internal/svg-icons/Close.js index 942d756074f25d..4c2f51f4afc7a1 100644 --- a/packages/material-ui/src/internal/svg-icons/Close.js +++ b/packages/material-ui/src/internal/svg-icons/Close.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/IndeterminateCheckBox.js b/packages/material-ui/src/internal/svg-icons/IndeterminateCheckBox.js index 7f68a2acbf4026..7716f676cb8198 100644 --- a/packages/material-ui/src/internal/svg-icons/IndeterminateCheckBox.js +++ b/packages/material-ui/src/internal/svg-icons/IndeterminateCheckBox.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/KeyboardArrowLeft.js b/packages/material-ui/src/internal/svg-icons/KeyboardArrowLeft.js index 250b3f26376f4e..a026cb17d2d38b 100644 --- a/packages/material-ui/src/internal/svg-icons/KeyboardArrowLeft.js +++ b/packages/material-ui/src/internal/svg-icons/KeyboardArrowLeft.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/KeyboardArrowRight.js b/packages/material-ui/src/internal/svg-icons/KeyboardArrowRight.js index dd661fc0adeb10..a169dca689e2bb 100644 --- a/packages/material-ui/src/internal/svg-icons/KeyboardArrowRight.js +++ b/packages/material-ui/src/internal/svg-icons/KeyboardArrowRight.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/MoreHoriz.js b/packages/material-ui/src/internal/svg-icons/MoreHoriz.js index 42d76208275e9a..f8fbaa9d1c7353 100644 --- a/packages/material-ui/src/internal/svg-icons/MoreHoriz.js +++ b/packages/material-ui/src/internal/svg-icons/MoreHoriz.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/Person.js b/packages/material-ui/src/internal/svg-icons/Person.js index a75080a35ac24d..5ccbde1a7bbd46 100644 --- a/packages/material-ui/src/internal/svg-icons/Person.js +++ b/packages/material-ui/src/internal/svg-icons/Person.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/RadioButtonChecked.js b/packages/material-ui/src/internal/svg-icons/RadioButtonChecked.js index 6bb3ece001e588..384553d144a43b 100644 --- a/packages/material-ui/src/internal/svg-icons/RadioButtonChecked.js +++ b/packages/material-ui/src/internal/svg-icons/RadioButtonChecked.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/RadioButtonUnchecked.js b/packages/material-ui/src/internal/svg-icons/RadioButtonUnchecked.js index 1f2b5745926628..294caaffd30635 100644 --- a/packages/material-ui/src/internal/svg-icons/RadioButtonUnchecked.js +++ b/packages/material-ui/src/internal/svg-icons/RadioButtonUnchecked.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/Warning.js b/packages/material-ui/src/internal/svg-icons/Warning.js index 2a5105aa8ab3f4..0b3c0852036feb 100644 --- a/packages/material-ui/src/internal/svg-icons/Warning.js +++ b/packages/material-ui/src/internal/svg-icons/Warning.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from './createSvgIcon'; +import createSvgIcon from '../../createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/createSvgIcon.js b/packages/material-ui/src/internal/svg-icons/createSvgIcon.js deleted file mode 100644 index adee28002f0b3d..00000000000000 --- a/packages/material-ui/src/internal/svg-icons/createSvgIcon.js +++ /dev/null @@ -1,20 +0,0 @@ -import * as React from 'react'; -import SvgIcon from '../../SvgIcon'; - -export default function createSvgIcon(path, displayName) { - const Component = React.memo( - React.forwardRef((props, ref) => ( - - {path} - - )), - ); - - if (process.env.NODE_ENV !== 'production') { - Component.displayName = `${displayName}Icon`; - } - - Component.muiName = SvgIcon.muiName; - - return Component; -} From e17db10cc780829648534f58d39d723589a0f5c6 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sat, 28 Mar 2020 20:59:52 +0100 Subject: [PATCH 2/2] sebastian review --- packages/material-ui-icons/src/utils/createSvgIcon.d.ts | 2 -- packages/material-ui-icons/src/utils/createSvgIcon.js | 2 +- packages/material-ui-lab/src/internal/svg-icons/Add.js | 2 +- .../material-ui-lab/src/internal/svg-icons/ArrowDropDown.js | 2 +- packages/material-ui-lab/src/internal/svg-icons/Close.js | 2 +- .../material-ui-lab/src/internal/svg-icons/ErrorOutline.js | 2 +- packages/material-ui-lab/src/internal/svg-icons/FirstPage.js | 2 +- .../material-ui-lab/src/internal/svg-icons/InfoOutlined.js | 2 +- packages/material-ui-lab/src/internal/svg-icons/LastPage.js | 2 +- .../material-ui-lab/src/internal/svg-icons/NavigateBefore.js | 2 +- .../material-ui-lab/src/internal/svg-icons/NavigateNext.js | 2 +- .../src/internal/svg-icons/ReportProblemOutlined.js | 2 +- packages/material-ui-lab/src/internal/svg-icons/Star.js | 2 +- .../material-ui-lab/src/internal/svg-icons/SuccessOutlined.js | 2 +- packages/material-ui/src/createSvgIcon/index.d.ts | 2 -- packages/material-ui/src/createSvgIcon/index.js | 1 - packages/material-ui/src/internal/svg-icons/ArrowDownward.js | 2 +- packages/material-ui/src/internal/svg-icons/ArrowDropDown.js | 2 +- packages/material-ui/src/internal/svg-icons/Cancel.js | 2 +- packages/material-ui/src/internal/svg-icons/CheckBox.js | 2 +- .../material-ui/src/internal/svg-icons/CheckBoxOutlineBlank.js | 2 +- packages/material-ui/src/internal/svg-icons/CheckCircle.js | 2 +- packages/material-ui/src/internal/svg-icons/Close.js | 2 +- .../src/internal/svg-icons/IndeterminateCheckBox.js | 2 +- .../material-ui/src/internal/svg-icons/KeyboardArrowLeft.js | 2 +- .../material-ui/src/internal/svg-icons/KeyboardArrowRight.js | 2 +- packages/material-ui/src/internal/svg-icons/MoreHoriz.js | 2 +- packages/material-ui/src/internal/svg-icons/Person.js | 2 +- .../material-ui/src/internal/svg-icons/RadioButtonChecked.js | 2 +- .../material-ui/src/internal/svg-icons/RadioButtonUnchecked.js | 2 +- packages/material-ui/src/internal/svg-icons/Warning.js | 2 +- .../src/{createSvgIcon => utils}/createSvgIcon.d.ts | 0 .../material-ui/src/{createSvgIcon => utils}/createSvgIcon.js | 0 packages/material-ui/src/utils/index.js | 3 ++- 34 files changed, 30 insertions(+), 34 deletions(-) delete mode 100644 packages/material-ui-icons/src/utils/createSvgIcon.d.ts delete mode 100644 packages/material-ui/src/createSvgIcon/index.d.ts delete mode 100644 packages/material-ui/src/createSvgIcon/index.js rename packages/material-ui/src/{createSvgIcon => utils}/createSvgIcon.d.ts (100%) rename packages/material-ui/src/{createSvgIcon => utils}/createSvgIcon.js (100%) diff --git a/packages/material-ui-icons/src/utils/createSvgIcon.d.ts b/packages/material-ui-icons/src/utils/createSvgIcon.d.ts deleted file mode 100644 index b30877a075c2f2..00000000000000 --- a/packages/material-ui-icons/src/utils/createSvgIcon.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { default } from '@material-ui/core/createSvgIcon'; -export * from '@material-ui/core/createSvgIcon'; diff --git a/packages/material-ui-icons/src/utils/createSvgIcon.js b/packages/material-ui-icons/src/utils/createSvgIcon.js index 1633e7af3cc2b3..835cefe7767391 100644 --- a/packages/material-ui-icons/src/utils/createSvgIcon.js +++ b/packages/material-ui-icons/src/utils/createSvgIcon.js @@ -1 +1 @@ -export { default } from '@material-ui/core/createSvgIcon'; +export { createSvgIcon as default } from '@material-ui/core/utils'; diff --git a/packages/material-ui-lab/src/internal/svg-icons/Add.js b/packages/material-ui-lab/src/internal/svg-icons/Add.js index 2336d1737df6ec..4655d6f7ffcc2d 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/Add.js +++ b/packages/material-ui-lab/src/internal/svg-icons/Add.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/ArrowDropDown.js b/packages/material-ui-lab/src/internal/svg-icons/ArrowDropDown.js index cea816c3f0e6d9..fdaa9c00cb395f 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/ArrowDropDown.js +++ b/packages/material-ui-lab/src/internal/svg-icons/ArrowDropDown.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/Close.js b/packages/material-ui-lab/src/internal/svg-icons/Close.js index 03a32449aad8d5..cd47ee13c9db3f 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/Close.js +++ b/packages/material-ui-lab/src/internal/svg-icons/Close.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/ErrorOutline.js b/packages/material-ui-lab/src/internal/svg-icons/ErrorOutline.js index fc6cb861d4e1de..b582fdc0787059 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/ErrorOutline.js +++ b/packages/material-ui-lab/src/internal/svg-icons/ErrorOutline.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/FirstPage.js b/packages/material-ui-lab/src/internal/svg-icons/FirstPage.js index c4f08c91286572..f9f936b1bb447a 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/FirstPage.js +++ b/packages/material-ui-lab/src/internal/svg-icons/FirstPage.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/InfoOutlined.js b/packages/material-ui-lab/src/internal/svg-icons/InfoOutlined.js index 515adb3750058b..0c3ed4e8e19cc8 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/InfoOutlined.js +++ b/packages/material-ui-lab/src/internal/svg-icons/InfoOutlined.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/LastPage.js b/packages/material-ui-lab/src/internal/svg-icons/LastPage.js index 549c44537ce600..d8038714c1b58f 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/LastPage.js +++ b/packages/material-ui-lab/src/internal/svg-icons/LastPage.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/NavigateBefore.js b/packages/material-ui-lab/src/internal/svg-icons/NavigateBefore.js index 934eb67d052feb..21eaa25defa4df 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/NavigateBefore.js +++ b/packages/material-ui-lab/src/internal/svg-icons/NavigateBefore.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/NavigateNext.js b/packages/material-ui-lab/src/internal/svg-icons/NavigateNext.js index 7c7a3ef6c363a2..4c8f04062ea688 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/NavigateNext.js +++ b/packages/material-ui-lab/src/internal/svg-icons/NavigateNext.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/ReportProblemOutlined.js b/packages/material-ui-lab/src/internal/svg-icons/ReportProblemOutlined.js index 8bafd6f2cb6b9b..11b860048db4bd 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/ReportProblemOutlined.js +++ b/packages/material-ui-lab/src/internal/svg-icons/ReportProblemOutlined.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/Star.js b/packages/material-ui-lab/src/internal/svg-icons/Star.js index b6c9c8c67d6245..511a39c75401ad 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/Star.js +++ b/packages/material-ui-lab/src/internal/svg-icons/Star.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui-lab/src/internal/svg-icons/SuccessOutlined.js b/packages/material-ui-lab/src/internal/svg-icons/SuccessOutlined.js index 353648f94e4980..bac970504d94a3 100644 --- a/packages/material-ui-lab/src/internal/svg-icons/SuccessOutlined.js +++ b/packages/material-ui-lab/src/internal/svg-icons/SuccessOutlined.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '@material-ui/core/createSvgIcon'; +import { createSvgIcon } from '@material-ui/core/utils'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/createSvgIcon/index.d.ts b/packages/material-ui/src/createSvgIcon/index.d.ts deleted file mode 100644 index 06ec076af7fc00..00000000000000 --- a/packages/material-ui/src/createSvgIcon/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { default } from './createSvgIcon'; -export * from './createSvgIcon'; diff --git a/packages/material-ui/src/createSvgIcon/index.js b/packages/material-ui/src/createSvgIcon/index.js deleted file mode 100644 index 9a9702dc4e6d17..00000000000000 --- a/packages/material-ui/src/createSvgIcon/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './createSvgIcon'; diff --git a/packages/material-ui/src/internal/svg-icons/ArrowDownward.js b/packages/material-ui/src/internal/svg-icons/ArrowDownward.js index 4e491475f2c624..627c0ffc81f911 100644 --- a/packages/material-ui/src/internal/svg-icons/ArrowDownward.js +++ b/packages/material-ui/src/internal/svg-icons/ArrowDownward.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/ArrowDropDown.js b/packages/material-ui/src/internal/svg-icons/ArrowDropDown.js index 4b3138c5cebe53..2c6a702fc7ccf8 100644 --- a/packages/material-ui/src/internal/svg-icons/ArrowDropDown.js +++ b/packages/material-ui/src/internal/svg-icons/ArrowDropDown.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/Cancel.js b/packages/material-ui/src/internal/svg-icons/Cancel.js index 7eb647354a63c3..c108adf4d6ab0e 100644 --- a/packages/material-ui/src/internal/svg-icons/Cancel.js +++ b/packages/material-ui/src/internal/svg-icons/Cancel.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/CheckBox.js b/packages/material-ui/src/internal/svg-icons/CheckBox.js index 49ee6d1d66869a..8ad1bf344664b4 100644 --- a/packages/material-ui/src/internal/svg-icons/CheckBox.js +++ b/packages/material-ui/src/internal/svg-icons/CheckBox.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/CheckBoxOutlineBlank.js b/packages/material-ui/src/internal/svg-icons/CheckBoxOutlineBlank.js index e68489c05c89fb..787cf408fc20a7 100644 --- a/packages/material-ui/src/internal/svg-icons/CheckBoxOutlineBlank.js +++ b/packages/material-ui/src/internal/svg-icons/CheckBoxOutlineBlank.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/CheckCircle.js b/packages/material-ui/src/internal/svg-icons/CheckCircle.js index 4d6c82623cd0a5..9368897aa24b30 100644 --- a/packages/material-ui/src/internal/svg-icons/CheckCircle.js +++ b/packages/material-ui/src/internal/svg-icons/CheckCircle.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/Close.js b/packages/material-ui/src/internal/svg-icons/Close.js index 4c2f51f4afc7a1..a4459a8af1e117 100644 --- a/packages/material-ui/src/internal/svg-icons/Close.js +++ b/packages/material-ui/src/internal/svg-icons/Close.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/IndeterminateCheckBox.js b/packages/material-ui/src/internal/svg-icons/IndeterminateCheckBox.js index 7716f676cb8198..fa7ac9b644d19f 100644 --- a/packages/material-ui/src/internal/svg-icons/IndeterminateCheckBox.js +++ b/packages/material-ui/src/internal/svg-icons/IndeterminateCheckBox.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/KeyboardArrowLeft.js b/packages/material-ui/src/internal/svg-icons/KeyboardArrowLeft.js index a026cb17d2d38b..fbb4c9889df4b7 100644 --- a/packages/material-ui/src/internal/svg-icons/KeyboardArrowLeft.js +++ b/packages/material-ui/src/internal/svg-icons/KeyboardArrowLeft.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/KeyboardArrowRight.js b/packages/material-ui/src/internal/svg-icons/KeyboardArrowRight.js index a169dca689e2bb..10737eb426bef0 100644 --- a/packages/material-ui/src/internal/svg-icons/KeyboardArrowRight.js +++ b/packages/material-ui/src/internal/svg-icons/KeyboardArrowRight.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/MoreHoriz.js b/packages/material-ui/src/internal/svg-icons/MoreHoriz.js index f8fbaa9d1c7353..a2a9e61a9f8407 100644 --- a/packages/material-ui/src/internal/svg-icons/MoreHoriz.js +++ b/packages/material-ui/src/internal/svg-icons/MoreHoriz.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/Person.js b/packages/material-ui/src/internal/svg-icons/Person.js index 5ccbde1a7bbd46..ade5e396968bbf 100644 --- a/packages/material-ui/src/internal/svg-icons/Person.js +++ b/packages/material-ui/src/internal/svg-icons/Person.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/RadioButtonChecked.js b/packages/material-ui/src/internal/svg-icons/RadioButtonChecked.js index 384553d144a43b..c03337872b7bed 100644 --- a/packages/material-ui/src/internal/svg-icons/RadioButtonChecked.js +++ b/packages/material-ui/src/internal/svg-icons/RadioButtonChecked.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/RadioButtonUnchecked.js b/packages/material-ui/src/internal/svg-icons/RadioButtonUnchecked.js index 294caaffd30635..780034ab5db976 100644 --- a/packages/material-ui/src/internal/svg-icons/RadioButtonUnchecked.js +++ b/packages/material-ui/src/internal/svg-icons/RadioButtonUnchecked.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/internal/svg-icons/Warning.js b/packages/material-ui/src/internal/svg-icons/Warning.js index 0b3c0852036feb..eccf1c6cae247f 100644 --- a/packages/material-ui/src/internal/svg-icons/Warning.js +++ b/packages/material-ui/src/internal/svg-icons/Warning.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import createSvgIcon from '../../createSvgIcon'; +import createSvgIcon from '../../utils/createSvgIcon'; /** * @ignore - internal component. diff --git a/packages/material-ui/src/createSvgIcon/createSvgIcon.d.ts b/packages/material-ui/src/utils/createSvgIcon.d.ts similarity index 100% rename from packages/material-ui/src/createSvgIcon/createSvgIcon.d.ts rename to packages/material-ui/src/utils/createSvgIcon.d.ts diff --git a/packages/material-ui/src/createSvgIcon/createSvgIcon.js b/packages/material-ui/src/utils/createSvgIcon.js similarity index 100% rename from packages/material-ui/src/createSvgIcon/createSvgIcon.js rename to packages/material-ui/src/utils/createSvgIcon.js diff --git a/packages/material-ui/src/utils/index.js b/packages/material-ui/src/utils/index.js index 3bd4e09f1e476a..a8dbc9203cf0da 100644 --- a/packages/material-ui/src/utils/index.js +++ b/packages/material-ui/src/utils/index.js @@ -1,12 +1,13 @@ export { default as capitalize } from './capitalize'; export { default as deprecatedPropType } from './deprecatedPropType'; export { default as isMuiElement } from './isMuiElement'; +export { default as createSvgIcon } from './createSvgIcon'; export { default as ownerDocument } from './ownerDocument'; export { default as ownerWindow } from './ownerWindow'; export { default as requirePropFactory } from './requirePropFactory'; export { default as setRef } from './setRef'; export { default as unsupportedProp } from './unsupportedProp'; +export { default as useControlled } from './useControlled'; export { default as useEventCallback } from './useEventCallback'; export { default as useForkRef } from './useForkRef'; -export { default as useControlled } from './useControlled'; export { useIsFocusVisible } from './focusVisible';