Merge pull request #316 from AmbireTech/fix/icons-default-props

fix: superseded defaultProperty on icons
AmbireTech · Dec 9, 2024 · 5778b65 · 5778b65
2 parents b0ea1b3 + b66ce33
commit 5778b65
Show file tree

Hide file tree

Showing 63 changed files with 343 additions and 189 deletions.
diff --git a/src/resources/icons/Active.tsx b/src/resources/icons/Active.tsx
@@ -1,7 +1,11 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const ActiveIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const ActiveIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 8.494 9.03"
@@ -21,6 +25,4 @@ const ActiveIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest
   )
 }
 
-ActiveIcon.defaultProps = defaultProps
-
 export default ActiveIcon
diff --git a/src/resources/icons/AddCart.tsx b/src/resources/icons/AddCart.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const AddCartIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const AddCartIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 24 24"
@@ -44,6 +49,4 @@ const AddCartIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest
   )
 }
 
-AddCartIcon.defaultProps = defaultProps
-
 export default AddCartIcon
diff --git a/src/resources/icons/AddSigner.tsx b/src/resources/icons/AddSigner.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const AddSignerIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const AddSignerIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 21.5 21.5"
@@ -33,6 +38,4 @@ const AddSignerIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...re
   )
 }
 
-AddSignerIcon.defaultProps = defaultProps
-
 export default AddSignerIcon
diff --git a/src/resources/icons/Analytics.tsx b/src/resources/icons/Analytics.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const AnalyticsIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const AnalyticsIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 21.5 21.5"
@@ -31,6 +36,4 @@ const AnalyticsIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...re
   )
 }
 
-AnalyticsIcon.defaultProps = defaultProps
-
 export default AnalyticsIcon
diff --git a/src/resources/icons/Archived.tsx b/src/resources/icons/Archived.tsx
@@ -1,7 +1,11 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const ArchivedIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const ArchivedIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  ...rest
+}) => {
   return (
     <svg viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg" width={size} height={size} {...rest}>
       <g fill="none" stroke={color} strokeLinecap="round" data-name="archived icon">
@@ -19,6 +23,4 @@ const ArchivedIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...res
   )
 }
 
-ArchivedIcon.defaultProps = defaultProps
-
 export default ArchivedIcon
diff --git a/src/resources/icons/Attention.tsx b/src/resources/icons/Attention.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const AttentionIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const AttentionIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 27.051 25.5"
@@ -23,6 +28,4 @@ const AttentionIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...re
   )
 }
 
-AttentionIcon.defaultProps = defaultProps
-
 export default AttentionIcon
diff --git a/src/resources/icons/Bell.tsx b/src/resources/icons/Bell.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const BellIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const BellIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 17.565 21.62"
@@ -27,6 +32,4 @@ const BellIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest })
   )
 }
 
-BellIcon.defaultProps = defaultProps
-
 export default BellIcon
diff --git a/src/resources/icons/Billing.tsx b/src/resources/icons/Billing.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const BillingIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const BillingIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 26 26"
@@ -33,6 +38,4 @@ const BillingIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest
   )
 }
 
-BillingIcon.defaultProps = defaultProps
-
 export default BillingIcon
diff --git a/src/resources/icons/BillingDetails.tsx b/src/resources/icons/BillingDetails.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const BillingDetailsIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const BillingDetailsIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 23.459 25.85"
@@ -33,6 +38,4 @@ const BillingDetailsIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth,
   )
 }
 
-BillingDetailsIcon.defaultProps = defaultProps
-
 export default BillingDetailsIcon
diff --git a/src/resources/icons/Block.tsx b/src/resources/icons/Block.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const ActiveIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const ActiveIcon: React.FC<AppIconProps> = ({ size = defaultProps.size, ...rest }) => {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -36,6 +36,4 @@ const ActiveIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest
   )
 }
 
-ActiveIcon.defaultProps = defaultProps
-
 export default ActiveIcon
diff --git a/src/resources/icons/Calendar.tsx b/src/resources/icons/Calendar.tsx
@@ -1,7 +1,11 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const CalendarIcon: React.FC<AppIconProps> = ({ color, size, ...rest }) => {
+const CalendarIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 21.767 24"
@@ -50,6 +54,4 @@ const CalendarIcon: React.FC<AppIconProps> = ({ color, size, ...rest }) => {
   )
 }
 
-CalendarIcon.defaultProps = defaultProps
-
 export default CalendarIcon
diff --git a/src/resources/icons/Campaign.tsx b/src/resources/icons/Campaign.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const CampaignIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const CampaignIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 36 36"
@@ -24,6 +29,4 @@ const CampaignIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...res
   )
 }
 
-CampaignIcon.defaultProps = defaultProps
-
 export default CampaignIcon
diff --git a/src/resources/icons/CheckMark.tsx b/src/resources/icons/CheckMark.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const CheckMarkIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const CheckMarkIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 21.5 21.5"
@@ -22,6 +27,4 @@ const CheckMarkIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...re
   )
 }
 
-CheckMarkIcon.defaultProps = defaultProps
-
 export default CheckMarkIcon
diff --git a/src/resources/icons/CheckMarkFilled.tsx b/src/resources/icons/CheckMarkFilled.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const CheckMarkFilledIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const CheckMarkFilledIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 20 20"
@@ -29,6 +34,4 @@ const CheckMarkFilledIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth,
   )
 }
 
-CheckMarkFilledIcon.defaultProps = defaultProps
-
 export default CheckMarkFilledIcon
diff --git a/src/resources/icons/Close.tsx b/src/resources/icons/Close.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const CloseIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const CloseIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 32 32"
@@ -37,6 +42,4 @@ const CloseIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }
   )
 }
 
-CloseIcon.defaultProps = defaultProps
-
 export default CloseIcon
diff --git a/src/resources/icons/CompletedIcon.tsx b/src/resources/icons/CompletedIcon.tsx
@@ -1,7 +1,11 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const CompletedIcon: React.FC<AppIconProps> = ({ color, size, ...rest }) => {
+const CompletedIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 14 14"
@@ -27,6 +31,4 @@ const CompletedIcon: React.FC<AppIconProps> = ({ color, size, ...rest }) => {
   )
 }
 
-CompletedIcon.defaultProps = defaultProps
-
 export default CompletedIcon
diff --git a/src/resources/icons/Copy.tsx b/src/resources/icons/Copy.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const CopyIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const CopyIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 25.5 25.5"
@@ -30,6 +35,4 @@ const CopyIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest })
   )
 }
 
-CopyIcon.defaultProps = defaultProps
-
 export default CopyIcon
diff --git a/src/resources/icons/Dashboard.tsx b/src/resources/icons/Dashboard.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const DashboardIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const DashboardIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 26 26"
@@ -28,6 +33,4 @@ const DashboardIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...re
   )
 }
 
-DashboardIcon.defaultProps = defaultProps
-
 export default DashboardIcon
diff --git a/src/resources/icons/Delete.tsx b/src/resources/icons/Delete.tsx
@@ -1,7 +1,12 @@
 import React from 'react'
 import { AppIconProps, defaultProps } from 'types/components/Icon'
 
-const DeleteIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest }) => {
+const DeleteIcon: React.FC<AppIconProps> = ({
+  color = defaultProps.color,
+  size = defaultProps.size,
+  strokeWidth = defaultProps.strokeWidth,
+  ...rest
+}) => {
   return (
     <svg
       viewBox="0 0 19.64 21.5"
@@ -36,6 +41,4 @@ const DeleteIcon: React.FC<AppIconProps> = ({ color, size, strokeWidth, ...rest
   )
 }
 
-DeleteIcon.defaultProps = defaultProps
-
 export default DeleteIcon