feat: simplified implementation custom Icon svg

chornos13 · Mar 6, 2021 · bcef150 · bcef150
1 parent e380715
commit bcef150
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 36 deletions.
diff --git a/src/icons/IconArrowLeft.js b/src/icons/IconArrowLeft.js
diff --git a/src/icons/IconClose.js b/src/icons/IconClose.js
diff --git a/src/icons/IconClose/Close.svg b/src/icons/IconClose/Close.svg
diff --git a/src/icons/IconClose/index.tsx b/src/icons/IconClose/index.tsx
@@ -0,0 +1,6 @@
+import withCustomIcon from 'icons/withCustomIcon'
+import Close from 'icons/IconClose/Close.svg'
+
+const IconClose = withCustomIcon(Close)
+
+export default IconClose
diff --git a/src/icons/withCustomIcon.tsx b/src/icons/withCustomIcon.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react'
+import Icon, {
+  CustomIconComponentProps,
+  IconComponentProps,
+} from '@ant-design/icons/lib/components/Icon'
+
+type WithCustomIconProps = Omit<IconComponentProps, 'ref'>
+type SvgIcon = React.ComponentType<
+  CustomIconComponentProps | React.SVGProps<SVGSVGElement>
+>
+
+function withCustomIcon(svgIcon: SvgIcon) {
+  return (props: WithCustomIconProps) => {
+    const { style, ...otherProps } = props
+    return (
+      <Icon
+        component={svgIcon}
+        style={{
+          ...style,
+        }}
+        {...otherProps}
+      />
+    )
+  }
+}
+
+export default withCustomIcon
diff --git a/src/svgs/ArrowLeft.svg b/src/svgs/ArrowLeft.svg
diff --git a/src/svgs/Close.svg b/src/svgs/Close.svg