[core] Remove createSvgIcon duplication (#20308)

mui · Mar 29, 2020 · 8ea2df8 · 8ea2df8
1 parent 9573e82
commit 8ea2df8
Show file tree

Hide file tree

Showing 32 changed files with 35 additions and 70 deletions.
diff --git 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) => (
-      <SvgIcon data-mui-test={`${displayName}Icon`} ref={ref} {...props}>
-        {path}
-      </SvgIcon>
-    )),
-  );
-
-  if (process.env.NODE_ENV !== 'production') {
-    Component.displayName = `${displayName}Icon`;
-  }
-
-  Component.muiName = SvgIcon.muiName;
-
-  return Component;
-}
+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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './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
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import createSvgIcon from './createSvgIcon';
+import { createSvgIcon } from '@material-ui/core/utils';
 
 /**
  * @ignore - internal component.

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/createSvgIcon.js b/packages/material-ui/src/internal/svg-icons/createSvgIcon.js
diff --git a/...ial-ui-icons/src/utils/createSvgIcon.d.ts → .../material-ui/src/utils/createSvgIcon.d.ts b/...ial-ui-icons/src/utils/createSvgIcon.d.ts → .../material-ui/src/utils/createSvgIcon.d.ts
diff --git a/...b/src/internal/svg-icons/createSvgIcon.js → ...es/material-ui/src/utils/createSvgIcon.js b/...b/src/internal/svg-icons/createSvgIcon.js → ...es/material-ui/src/utils/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/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';