fix: spread default props instead of Object.assign

lsst-epo · Sep 12, 2024 · e60e1ca · e60e1ca
1 parent 2df6906
commit e60e1ca
Show file tree

Hide file tree

Showing 70 changed files with 72 additions and 144 deletions.
diff --git a/packages/epo-react-lib/src/svg/IconComposer/IconComposer.stories.tsx b/packages/epo-react-lib/src/svg/IconComposer/IconComposer.stories.tsx
@@ -50,14 +50,15 @@ export default meta;
 const IconGrid = styled.div`
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(var(--grid-size, 36px), 1fr));
-  gap: 0.5rem;
+  grid-auto-rows: minmax(var(--grid-size, 36px), 1fr);
+  gap: 0.5em;
   width: 100%;
 `;
 
 const Template: StoryFn<typeof IconComposer> = (args) => {
   const { size = 36 } = args;
   return (
-    <IconGrid style={{ "--grid-size": Number(size) ? size : `${size}px` }}>
+    <IconGrid style={{ "--grid-size": Number(size) ? `${size}px` : size }}>
       {Object.keys(Icons).map((key) => (
         <IconComposer key={key} {...args} size={size} icon={key} />
       ))}

diff --git a/packages/epo-react-lib/src/svg/icons/Account.tsx b/packages/epo-react-lib/src/svg/icons/Account.tsx
@@ -15,10 +15,8 @@ const Account: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
-
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M10 0a10 10 0 1 0 10 10A10 10 0 0 0 10 0Zm0 3a3 3 0 1 1-3 3 3 3 0 0 1 3-3Zm0 14.2a7.2 7.2 0 0 1-6-3.22c.03-1.99 4-3.08 6-3.08s5.97 1.09 6 3.08a7.2 7.2 0 0 1-6 3.22Z"
         fill="currentColor"

diff --git a/packages/epo-react-lib/src/svg/icons/ArrowUpFromBracket.tsx b/packages/epo-react-lib/src/svg/icons/ArrowUpFromBracket.tsx
@@ -17,9 +17,8 @@ const ArrowUpFromBracket: FunctionComponent<SVGProps> = ({
     stroke,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(1 1)">
         <path
           d="M6,18v7.153a1.788,1.788,0,0,0,1.788,1.788h10.73a1.788,1.788,0,0,0,1.788-1.788V18"

diff --git a/packages/epo-react-lib/src/svg/icons/Backward.tsx b/packages/epo-react-lib/src/svg/icons/Backward.tsx
@@ -15,9 +15,8 @@ const Backward: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M4.5,0,9,8H0Z" transform="translate(7 9) rotate(-90)" />
       <path d="M4.5,0,9,8H0Z" transform="translate(0 9) rotate(-90)" />
     </svg>

diff --git a/packages/epo-react-lib/src/svg/icons/BackwardStep.tsx b/packages/epo-react-lib/src/svg/icons/BackwardStep.tsx
@@ -15,9 +15,8 @@ const BackwardStep: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M8.972,6.862v3.876L15.41,6.809A.226.226,0,0,1,15.75,7V15.5a.226.226,0,0,1-.34.194L8.972,11.762v3.876a.113.113,0,0,1-.113.113h-2a.113.113,0,0,1-.113-.113V6.862a.113.113,0,0,1,.113-.112h2A.113.113,0,0,1,8.972,6.862Z"
         transform="translate(-6.75 -6.75)"

diff --git a/packages/epo-react-lib/src/svg/icons/Calendar.tsx b/packages/epo-react-lib/src/svg/icons/Calendar.tsx
@@ -15,9 +15,8 @@ const Calendar: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m6.8 4.8c0.3 0 0.6-0.3 0.6-0.6v-3.5c0-0.3-0.2-0.6-0.5-0.6s-0.6 0.2-0.7 0.5v0.1 3.6c0 0.3 0.3 0.5 0.6 0.5" />
       <path d="m20.2 21.6h-16.2v-14.4h16.2v14.4zm0.6-20h-2.6v1.8c0.5 0.5 0.4 1.2 0 1.7-0.5 0.5-1.2 0.4-1.7 0-0.2-0.2-0.3-0.5-0.3-0.8s0.1-0.6 0.3-0.8v-1.9h-8.9v1.8c0.5 0.5 0.4 1.2 0 1.7-0.5 0.5-1.2 0.4-1.7 0-0.2-0.3-0.3-0.5-0.3-0.8s0.1-0.6 0.4-0.9v-1.8h-2.6c-0.8 0-1.4 0.6-1.4 1.4v19.2c0 0.8 0.6 1.4 1.4 1.4h17.4c0.8 0 1.4-0.6 1.4-1.4v-19.2c0-0.8-0.6-1.4-1.4-1.4" />
       <path d="m17.4 4.8c0.3 0 0.6-0.3 0.6-0.6v-3.5c0-0.3-0.2-0.6-0.5-0.6s-0.6 0.2-0.6 0.5v0.1 3.6c-0.1 0.3 0.2 0.5 0.5 0.5" />

diff --git a/packages/epo-react-lib/src/svg/icons/Cancel.tsx b/packages/epo-react-lib/src/svg/icons/Cancel.tsx
@@ -15,9 +15,8 @@ const Cancel: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         fill="#ed4c4c"
         transform="translate(-.57 -.57)"

diff --git a/packages/epo-react-lib/src/svg/icons/CaretDown.tsx b/packages/epo-react-lib/src/svg/icons/CaretDown.tsx
@@ -16,9 +16,8 @@ const CaretDown: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M0,0,9,9l9-9Z" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/CheckeredFlag.tsx b/packages/epo-react-lib/src/svg/icons/CheckeredFlag.tsx
@@ -15,9 +15,8 @@ const CheckeredFlag: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(-3 29)">
         <g transform="translate(7.169 -25.817)">
           <path

diff --git a/packages/epo-react-lib/src/svg/icons/Checkmark.tsx b/packages/epo-react-lib/src/svg/icons/Checkmark.tsx
@@ -15,9 +15,8 @@ const Checkmark: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M8.282,14.423,5.9,12.036l-.8.8,3.182,3.182L15.1,9.2l-.8-.8Z"
         transform="translate(-5.1 -8.4)"

diff --git a/packages/epo-react-lib/src/svg/icons/CheckmarkCircle.tsx b/packages/epo-react-lib/src/svg/icons/CheckmarkCircle.tsx
@@ -15,9 +15,8 @@ const CheckmarkCircle: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M15.563,8.063a7.5,7.5,0,1,1-7.5-7.5A7.5,7.5,0,0,1,15.563,8.063ZM7.195,12.034l5.565-5.565a.484.484,0,0,0,0-.684L12.075,5.1a.484.484,0,0,0-.684,0L6.853,9.639,4.734,7.52a.484.484,0,0,0-.684,0L3.366,8.2a.484.484,0,0,0,0,.684l3.145,3.145a.484.484,0,0,0,.684,0Z"
         transform="translate(-0.563 -0.563)"

diff --git a/packages/epo-react-lib/src/svg/icons/Chevron.tsx b/packages/epo-react-lib/src/svg/icons/Chevron.tsx
@@ -15,9 +15,8 @@ const Chevron: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <polygon points="15.212 22.283 5.204 12 15.212 1.717 18.796 5.203 12.181 12 18.796 18.797 15.212 22.283" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/ChevronLeftElongated.tsx b/packages/epo-react-lib/src/svg/icons/ChevronLeftElongated.tsx
@@ -24,9 +24,8 @@ const ChevronLeftElongated: FunctionComponent<SVGProps> = ({
     stroke,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <line y1="11" x2="6" transform="translate(0.439 0.239)" strokeWidth="1" />
       <line
         x2="6"

diff --git a/packages/epo-react-lib/src/svg/icons/ChevronRightElongated.tsx b/packages/epo-react-lib/src/svg/icons/ChevronRightElongated.tsx
@@ -24,9 +24,8 @@ const ChevronRightElongated: FunctionComponent<SVGProps> = ({
     stroke,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="scale(-1, 1) translate(-5)">
         <line
           y1="11"

diff --git a/packages/epo-react-lib/src/svg/icons/ChevronThin.tsx b/packages/epo-react-lib/src/svg/icons/ChevronThin.tsx
@@ -15,9 +15,8 @@ const ChevronThin: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M10.16326,12.004l6.123,6.119a1.151,1.151,0,0,1,.00525,1.62775l-.00525.00525a1.166,1.166,0,0,1-1.638,0l-6.937-6.933a1.154,1.154,0,0,1-.034-1.595l6.966-6.98a1.15647,1.15647,0,1,1,1.638,1.633h0Z" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/CircularLoader.tsx b/packages/epo-react-lib/src/svg/icons/CircularLoader.tsx
@@ -15,9 +15,8 @@ const CircularLoader: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M36.4,3.5c0.9,0.2,1.8,0.4,2.7,0.7v8.4c0,0.1,0,0.3,0.1,0.4c0.1,0.4,0.3,0.8,0.7,1c1.5,0.8,2.9,1.8,4.1,3
 			c0,0.2-0.1,0.4-0.1,0.7c0,1.6,1.3,2.9,2.9,2.9s2.9-1.3,2.9-2.9s-1.3-2.9-2.9-2.9c-0.3,0-0.5,0-0.7,0.1c-1.2-1.2-2.5-2.2-4-3V5.3

diff --git a/packages/epo-react-lib/src/svg/icons/Close.tsx b/packages/epo-react-lib/src/svg/icons/Close.tsx
@@ -17,10 +17,8 @@ const Close: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
-
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g strokeWidth={2}>
         <path d="m.707 16.707 16-16" />
         <path d="m.707.707 16 16" />

diff --git a/packages/epo-react-lib/src/svg/icons/CloseCircle.tsx b/packages/epo-react-lib/src/svg/icons/CloseCircle.tsx
@@ -15,10 +15,8 @@ const CloseCircle: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
-
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <circle cx="10" cy="10" r="10" />
       <g transform="translate(5 5)">
         <path

diff --git a/packages/epo-react-lib/src/svg/icons/Cloud.tsx b/packages/epo-react-lib/src/svg/icons/Cloud.tsx
@@ -15,9 +15,8 @@ const Cloud: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m20.8 12.1h-1.1c-0.3-1.8-1.9-3.1-3.7-3.2-0.8 0-1.6 0.3-2.3 0.8-0.9-2.8-3.8-4.4-6.6-3.5-2.2 0.7-3.7 2.7-3.7 5-1.7 0.2-2.9 1.8-2.7 3.5 0.2 1.5 1.4 2.6 2.9 2.7h17.2c1.5 0 2.7-1.2 2.7-2.7s-1.2-2.6-2.7-2.6z" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/Doc.tsx b/packages/epo-react-lib/src/svg/icons/Doc.tsx
@@ -15,9 +15,8 @@ const Doc: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m4.6 21.6v-19.3h9.4v5.4h5.4v14l-14.8-0.1zm16.8-14c0-0.5-0.2-1.1-0.6-1.5l-5.4-5.4c-0.4-0.4-0.9-0.6-1.5-0.6h-9.3c-1.1 0-2.1 0.9-2.1 2.1v19.4c0 1.1 0.9 2.1 2.1 2.1h14.7c1.1 0 2.1-0.9 2.1-2.1v-14z" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/DocArrowRight.tsx b/packages/epo-react-lib/src/svg/icons/DocArrowRight.tsx
@@ -15,9 +15,8 @@ const DocArrowRight: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M12.084,3.571a.677.677,0,0,0-.22-.5L8.783.205A.784.784,0,0,0,8.248,0H8.056V3.75h4.028Zm5.885,5.452L14.957,6.2a.51.51,0,0,0-.862.331V8.438H12.081v1.875h2.014v1.91a.51.51,0,0,0,.862.331l3.012-2.827A.475.475,0,0,0,17.968,9.023Zm-11.926.82V8.906a.488.488,0,0,1,.5-.469h5.538V4.688H7.8a.733.733,0,0,1-.755-.7V0H.755A.729.729,0,0,0,0,.7V14.3a.729.729,0,0,0,.755.7H11.329a.729.729,0,0,0,.755-.7V10.313H6.545A.488.488,0,0,1,6.042,9.844Z" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/DocInverted.tsx b/packages/epo-react-lib/src/svg/icons/DocInverted.tsx
@@ -15,9 +15,8 @@ const DocInverted: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M14.936,3H7.787A1.8,1.8,0,0,0,6.009,4.812L6,19.305a1.8,1.8,0,0,0,1.778,1.812H18.51A1.8,1.8,0,0,0,20.3,19.305V8.435Z"
         transform="translate(-6 -3)"

diff --git a/packages/epo-react-lib/src/svg/icons/Email.tsx b/packages/epo-react-lib/src/svg/icons/Email.tsx
@@ -15,9 +15,8 @@ const Email: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M21.2026,24.0003l-9.018,7.297V16.7023Zm3.3302,1.8315a.84747.84747,0,0,1-1.067,0l-.915-.74-9.017,7.297h20.932l-9.017-7.298ZM23.9995.3695a23.6305,23.6305,0,1,1-23.63,23.63,23.63084,23.63084,0,0,1,23.63-23.63m14.561,15.241a2.745,2.745,0,0,0-2.745-2.745H12.1845a2.745,2.745,0,0,0-2.745,2.745v16.778a2.745,2.745,0,0,0,2.745,2.745h23.631a2.745,2.745,0,0,0,2.745-2.745Zm-4.094.0003H13.5335l10.466,8.47Zm1.3486,15.6864V16.7022l-9.018,7.297Z" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/Expand.tsx b/packages/epo-react-lib/src/svg/icons/Expand.tsx
@@ -15,9 +15,8 @@ const Expand: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M10.94,16V13.538h2.6v-2.6H16V16ZM0,16V10.94H2.462v2.6h2.6V16ZM13.538,5.06v-2.6h-2.6V0H16V5.06ZM0,5.06V0H5.06V2.462h-2.6v2.6Z"
         transform="translate(0.5 0.5)"

diff --git a/packages/epo-react-lib/src/svg/icons/Eye.tsx b/packages/epo-react-lib/src/svg/icons/Eye.tsx
@@ -15,9 +15,8 @@ const Eye: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M40.255 12.473A22.552 22.552 0 0 0 20.25 0 22.555 22.555 0 0 0 .245 12.474a2.275 2.275 0 0 0 0 2.052A22.552 22.552 0 0 0 20.25 27a22.555 22.555 0 0 0 20.005-12.474 2.275 2.275 0 0 0 0-2.053ZM20.25 23.625A10.125 10.125 0 1 1 30.375 13.5 10.125 10.125 0 0 1 20.25 23.625Zm0-16.875a6.7 6.7 0 0 0-1.78.266 3.364 3.364 0 0 1-4.7 4.7 6.735 6.735 0 1 0 6.484-4.97Z"
         fill="currentColor"

diff --git a/packages/epo-react-lib/src/svg/icons/Facebook.tsx b/packages/epo-react-lib/src/svg/icons/Facebook.tsx
@@ -15,9 +15,8 @@ const Facebook: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M24.0005.3695a23.6305,23.6305,0,1,0,23.63,23.631A23.63105,23.63105,0,0,0,24.0005.3695m6.624,13.791-2.756.001c-2.175,0-2.579,1.033-2.579,2.55v3.332h5.156l-.675,5.252h-4.481v13.421h-5.419V25.2955h-4.501v-5.252h4.501v-3.851c0-4.482,2.726-6.922,6.724-6.922a37.13957,37.13957,0,0,1,4.03.206Z" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/FloppyDisk.tsx b/packages/epo-react-lib/src/svg/icons/FloppyDisk.tsx
@@ -15,9 +15,8 @@ const FloppyDisk: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M15.683,5.79,12.651,2.758a1.735,1.735,0,0,0-1.227-.508H1.735A1.735,1.735,0,0,0,0,3.985V16.706a1.735,1.735,0,0,0,1.735,1.735H14.456a1.735,1.735,0,0,0,1.735-1.735V7.016a1.735,1.735,0,0,0-.508-1.227ZM8.1,16.128a2.313,2.313,0,1,1,2.313-2.313A2.313,2.313,0,0,1,8.1,16.128ZM11.565,5.122V8.755a.434.434,0,0,1-.434.434H2.747a.434.434,0,0,1-.434-.434V5a.434.434,0,0,1,.434-.434h8.259a.434.434,0,0,1,.307.127l.126.126a.434.434,0,0,1,.127.307Z"
         transform="translate(0 -2.25)"

diff --git a/packages/epo-react-lib/src/svg/icons/Forward.tsx b/packages/epo-react-lib/src/svg/icons/Forward.tsx
@@ -15,9 +15,8 @@ const Forward: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(-2737 -1072)">
         <path
           d="M4.5,0,9,8H0Z"

diff --git a/packages/epo-react-lib/src/svg/icons/ForwardStep.tsx b/packages/epo-react-lib/src/svg/icons/ForwardStep.tsx
@@ -15,9 +15,8 @@ const ForwardStep: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M13.528,6.862v3.876L7.09,6.809A.226.226,0,0,0,6.75,7V15.5a.226.226,0,0,0,.34.194l6.438-3.929v3.876a.113.113,0,0,0,.113.113h2a.113.113,0,0,0,.113-.113V6.862a.113.113,0,0,0-.113-.112h-2A.113.113,0,0,0,13.528,6.862Z"
         transform="translate(-6.75 -6.75)"

diff --git a/packages/epo-react-lib/src/svg/icons/Globe.tsx b/packages/epo-react-lib/src/svg/icons/Globe.tsx
@@ -15,9 +15,8 @@ const Globe: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M11.933,3a8.941,8.941,0,1,0,8.95,8.941A8.937,8.937,0,0,0,11.933,3Zm6.2,5.365H15.491a13.993,13.993,0,0,0-1.234-3.183A7.18,7.18,0,0,1,18.129,8.365ZM11.941,4.824a12.6,12.6,0,0,1,1.708,3.541H10.234A12.6,12.6,0,0,1,11.941,4.824ZM5.021,13.73a6.994,6.994,0,0,1,0-3.577H8.043a14.767,14.767,0,0,0-.125,1.788,14.767,14.767,0,0,0,.125,1.788Zm.733,1.788H8.392A13.993,13.993,0,0,0,9.626,18.7,7.141,7.141,0,0,1,5.754,15.518ZM8.392,8.365H5.754A7.141,7.141,0,0,1,9.626,5.182,13.993,13.993,0,0,0,8.392,8.365Zm3.55,10.694a12.6,12.6,0,0,1-1.708-3.541h3.416A12.6,12.6,0,0,1,11.941,19.059Zm2.092-5.329H9.849a13.155,13.155,0,0,1-.143-1.788,13.041,13.041,0,0,1,.143-1.788h4.185a13.041,13.041,0,0,1,.143,1.788A13.155,13.155,0,0,1,14.034,13.73Zm.224,4.971a13.993,13.993,0,0,0,1.234-3.183h2.638A7.18,7.18,0,0,1,14.257,18.7ZM15.84,13.73a14.767,14.767,0,0,0,.125-1.788,14.767,14.767,0,0,0-.125-1.788h3.022a6.994,6.994,0,0,1,0,3.577Z"
         transform="translate(-3 -3)"

diff --git a/packages/epo-react-lib/src/svg/icons/Google.tsx b/packages/epo-react-lib/src/svg/icons/Google.tsx
@@ -15,9 +15,8 @@ const Google: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M30 15.602c0 8.7-5.957 14.889-14.754 14.889a15.246 15.246 0 1 1 0-30.492 14.661 14.661 0 0 1 10.223 3.99l-4.15 3.99C15.891 2.737 5.8 6.676 5.8 15.245a9.55 9.55 0 0 0 9.449 9.627c6.037 0 8.3-4.328 8.656-6.572h-8.659v-5.243H29.76a13.365 13.365 0 0 1 .24 2.545Z" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/Hamburger.tsx b/packages/epo-react-lib/src/svg/icons/Hamburger.tsx
@@ -15,9 +15,8 @@ const Hamburger: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <rect x="0.99996" y="1.00024" width="34" height="3.13818" />
       <rect x="0.99996" y="16.43042" width="34" height="3.13867" />
       <rect x="0.99996" y="31.86108" width="34" height="3.13867" />

diff --git a/packages/epo-react-lib/src/svg/icons/Info.tsx b/packages/epo-react-lib/src/svg/icons/Info.tsx
@@ -15,9 +15,8 @@ const Info: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m15.6 7.1c-0.3 1.1-1.4 1.7-2.5 1.4s-1.7-1.4-1.4-2.5 1.4-1.7 2.5-1.4c1 0.3 1.7 1.4 1.4 2.5m-1.9 11.2-0.3 0.7c-4 1.5-5.3-0.7-4.5-2.7l1.7-4.1c0.3-0.8 0.2-1.7-1.8-1.7l0.3-0.7c4-1.5 5.3 0.7 4.5 2.7l-1.7 4.1c-0.4 0.8-0.3 1.6 1.8 1.7m-1.8-17.4c-6.1 0-11 4.9-11 11s4.9 11 11 11 11-4.9 11-11-4.9-11-11-11" />
     </svg>
   );

diff --git a/packages/epo-react-lib/src/svg/icons/InfoCircle.tsx b/packages/epo-react-lib/src/svg/icons/InfoCircle.tsx
@@ -13,11 +13,11 @@ const InfoCircle: FunctionComponent<SVGProps> = ({
     height: size,
     fill,
     className,
+    stroke: "currentColor",
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M20.883,11.941A8.941,8.941,0,1,1,11.941,3a8.941,8.941,0,0,1,8.941,8.941Z"
         transform="translate(-3 -3)"

diff --git a/packages/epo-react-lib/src/svg/icons/Instagram.tsx b/packages/epo-react-lib/src/svg/icons/Instagram.tsx
@@ -15,9 +15,8 @@ const Instagram: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M29.9455,11.368H18.0475a6.26316,6.26316,0,0,0-6.263,6.264V30.28a6.263,6.263,0,0,0,6.263,6.263h11.898a6.2638,6.2638,0,0,0,6.264-6.263V17.632a6.264,6.264,0,0,0-6.264-6.264m1.873,12.597a7.83453,7.83453,0,0,1-15.669-.029,7.9667,7.9667,0,0,1,2.402-5.684,7.50818,7.50818,0,0,1,5.471-2.15c4.837.141,7.897,3.227,7.796,7.863m.19-6.257a1.827,1.827,0,1,1,1.827-1.827,1.827,1.827,0,0,1-1.827,1.827m-8.0626,1.033c3.346.097,5.302,2.029,5.233,5.166a5.19454,5.19454,0,1,1-10.389.029,5.316,5.316,0,0,1,1.601-3.791,4.87382,4.87382,0,0,1,3.413-1.406c.047,0,.095.001.142.002M23.9995.3695a23.6305,23.6305,0,1,0,23.631,23.631A23.6302,23.6302,0,0,0,23.9995.3695m14.294,29.969a8.42131,8.42131,0,0,1-8.388,8.456H18.0885a8.49239,8.49239,0,0,1-8.472-8.456V17.6675a8.50181,8.50181,0,0,1,8.472-8.467h11.817a8.43075,8.43075,0,0,1,8.388,8.467Z" />
     </svg>
   );