Merged in fix/lint-issues (pull request #1678)

Fix lint issues in design-system and scandic-web

* Remove unused color prop from LogoAndIllustrationProps to fix lint issues

* Fix lint issues in web

* Fix logos type


Approved-by: Joakim Jäderberg

apps/scandic-web/components/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx

@@ -31,13 +31,9 @@ export default async function ContactRow({ contact }: ContactRowProps) {
 
   let Icon = null
   if (contact.contact_field.includes("email")) {
-    Icon = function MailIcon(props: MaterialIconSetIconProps) {
+    Icon = MailIcon
-      return <MaterialIcon icon="mail" {...props} />
-    }
   } else if (contact.contact_field.includes("phone")) {
-    Icon = function PhoneIcone(props: MaterialIconSetIconProps) {
+    Icon = PhoneIcon
-      return <MaterialIcon icon="phone" {...props} />
-    }
   }
 
   let openableLink = val
@@ -66,3 +62,10 @@ export default async function ContactRow({ contact }: ContactRowProps) {
     </div>
   )
 }
+
+function PhoneIcon(props: MaterialIconSetIconProps) {
+  return <MaterialIcon icon="phone" {...props} />
+}
+function MailIcon(props: MaterialIconSetIconProps) {
+  return <MaterialIcon icon="mail" {...props} />
+}

packages/design-system/lib/components/Icons/Customised/Amenities&Facilities/Cooling.tsx

@@ -2,12 +2,7 @@ import { iconVariants } from '../../variants'
 
 import type { IconProps } from '../../icon'
 
-export default function CoolingIcon({
+export default function CoolingIcon({ className, color, ...props }: IconProps) {
-  className,
-  color,
-  size,
-  ...props
-}: IconProps) {
   const classNames = iconVariants({ className, color })
   return (
     <svg

packages/design-system/lib/components/Icons/Illustrations/Bed.tsx

@@ -1,6 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedIcon({ color, ...props }: LogoAndIllustrationProps) {
+export default function BedIcon(props: IllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedBunk.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedBunkIcon({
+export default function BedBunkIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedBunkExtra.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedBunkExtraIcon({
+export default function BedBunkExtraIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedGeneric.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedGenericIcon({
+export default function BedGenericIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedKing.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedKingIcon({
+export default function BedKingIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedPullOut.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedPullOutIcon({
+export default function BedPullOutIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedPullOutExtra.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedPullOutExtraIcon({
+export default function BedPullOutExtraIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedQueen.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedQueenIcon({
+export default function BedQueenIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedSingle.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedSingleIcon({
+export default function BedSingleIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedSofa.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedSofaIcon({
+export default function BedSofaIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedSofaExtra.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedSofaExtraIcon({
+export default function BedSofaExtraIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedTwin.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedTwinIcon({
+export default function BedTwinIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/BedWallExtra.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function BedWallExtraIcon({
+export default function BedWallExtraIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/Coin.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function CoinIcon({
+export default function CoinIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/CroissantCoffeeEgg.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function CroissantCoffeeEggIcon({
+export default function CroissantCoffeeEggIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/CutleryOne.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function CutleryOneIcon({
+export default function CutleryOneIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/CutleryTwo.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function CutleryTwoIcon({
+export default function CutleryTwoIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/GiftOpen.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function GiftOpenIcon({
+export default function GiftOpenIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/HandKey.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function HandKeyIcon({
+export default function HandKeyIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/HotelNight.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function HotelNightIcon({
+export default function HotelNightIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/Kids.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function KidsIcon({
+export default function KidsIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/KidsMocktail.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function KidsMocktailIcon({
+export default function KidsMocktailIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/MagicWand.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function MagicWandIcon({
+export default function MagicWandIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/MoneyHand.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function MoneyHandIcon({
+export default function MoneyHandIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/Surprise.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function SurpriseIcon({
+export default function SurpriseIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Illustrations/Voucher.tsx

@@ -1,9 +1,6 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { IllustrationProps } from '../icon'
 
-export default function VoucherIcon({
+export default function VoucherIcon(props: IllustrationProps) {
-  color,
-  ...props
-}: LogoAndIllustrationProps) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"

packages/design-system/lib/components/Icons/Logos/DowntownCamper.tsx

@@ -1,11 +1,11 @@
-import type { LogoAndIllustrationProps } from '../icon'
+import type { LogoProps } from '../icon'
 import { iconVariants } from '../variants'
 
 export default function DowntownCamperIcon({
   className,
   color,
   ...props
-}: LogoAndIllustrationProps) {
+}: LogoProps) {
   const classNames = iconVariants({ className, color })
   return (
     <svg

packages/design-system/lib/components/Icons/Logos/GrandHotelOslo.tsx

@@ -1,12 +1,12 @@
 import { iconVariants } from '../variants'
 
-import type { LogoAndIllustrationProps } from '../icon'
+import type { LogoProps } from '../icon'
 
 export default function GrandHotelOsloLogoIcon({
   className,
   color,
   ...props
-}: LogoAndIllustrationProps) {
+}: LogoProps) {
   const classNames = iconVariants({ className, color })
   return (
     <svg

packages/design-system/lib/components/Icons/Logos/Haymarket.tsx

@@ -1,12 +1,12 @@
 import { iconVariants } from '../variants'
 
-import type { LogoAndIllustrationProps } from '../icon'
+import type { LogoProps } from '../icon'
 
 export default function HaymarketIcon({
   className,
   color,
   ...props
-}: LogoAndIllustrationProps) {
+}: LogoProps) {
   const classNames = iconVariants({ className, color })
   return (
     <svg

packages/design-system/lib/components/Icons/Logos/HotelNorge.tsx

@@ -1,12 +1,12 @@
 import { iconVariants } from '../variants'
 
-import type { LogoAndIllustrationProps } from '../icon'
+import type { LogoProps } from '../icon'
 
 export default function HotelNorgeIcon({
   className,
   color,
   ...props
-}: LogoAndIllustrationProps) {
+}: LogoProps) {
   const classNames = iconVariants({ className, color })
   return (
     <svg

packages/design-system/lib/components/Icons/Logos/Marski.tsx

@@ -1,12 +1,12 @@
 import { iconVariants } from '../variants'
 
-import type { LogoAndIllustrationProps } from '../icon'
+import type { LogoProps } from '../icon'
 
 export default function MarskiLogoIcon({
   className,
   color,
   ...props
-}: LogoAndIllustrationProps) {
+}: LogoProps) {
   const classNames = iconVariants({ className, color })
   return (
     <svg

packages/design-system/lib/components/Icons/Logos/ScandicGoLogo.tsx

@@ -1,12 +1,12 @@
 import { iconVariants } from '../variants'
 
-import type { LogoAndIllustrationProps } from '../icon'
+import type { LogoProps } from '../icon'
 
 export default function ScandicGoLogoIcon({
   className,
   color,
   ...props
-}: LogoAndIllustrationProps) {
+}: LogoProps) {
   const classNames = iconVariants({ className, color })
   return (
     <svg

packages/design-system/lib/components/Icons/Logos/ScandicLogo.tsx

@@ -1,12 +1,12 @@
 import { iconVariants } from '../variants'
 
-import type { LogoAndIllustrationProps } from '../icon'
+import type { LogoProps } from '../icon'
 
 export default function ScandicLogoIcon({
   className,
   color,
   ...props
-}: LogoAndIllustrationProps) {
+}: LogoProps) {
   const classNames = iconVariants({ className, color })
   return (
     <svg

packages/design-system/lib/components/Icons/icon.ts

@@ -7,7 +7,14 @@ export interface IconProps
   size?: number
 }
 
-export interface LogoAndIllustrationProps
+export interface IllustrationProps
+  extends Omit<React.SVGAttributes<HTMLOrSVGElement>, 'color'>,
+    Omit<VariantProps<typeof iconVariants>, 'color'> {
+  width?: string | number
+  height?: string | number
+}
+
+export interface LogoProps
   extends Omit<React.SVGAttributes<HTMLOrSVGElement>, 'color'>,
     VariantProps<typeof iconVariants> {
   width?: string | number

packages/design-system/lib/components/Icons/index.tsx

@@ -74,7 +74,7 @@ export { default as Popcorn2Icon } from './Nucleo/Food/popcorn-2'
 
 export type {
   IconProps,
-  LogoAndIllustrationProps,
+  IllustrationProps as LogoAndIllustrationProps,
   NucleoIconProps,
 } from './icon'
 export type {