Merged in feat/SW-1711-SW-2077-icons (pull request #1709)

Fix(SW-1711)/(SW-2077): Export icons individually

* fix(SW-1711): export icons individually


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra

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

@@ -1,12 +1,10 @@
-import {
-  DowntownCamperIcon,
-  GrandHotelOsloLogoIcon,
-  HaymarketIcon,
-  HotelNorgeIcon,
-  MarskiLogoIcon,
-  ScandicGoLogoIcon,
-  ScandicLogoIcon,
-} from '..'
+import DowntownCamperIcon from './DowntownCamper'
+import GrandHotelOsloLogoIcon from './GrandHotelOslo'
+import HaymarketIcon from './Haymarket'
+import HotelNorgeIcon from './HotelNorge'
+import MarskiLogoIcon from './Marski'
+import ScandicGoLogoIcon from './ScandicGoLogo'
+import ScandicLogoIcon from './ScandicLogo'
 
 type HotelLogoProps = {
   hotelId: string
@@ -27,7 +25,7 @@ enum SignatureHotelEnum {
   Marski = '605',
 }
 
-export default function HotelLogo({ hotelId, hotelType }: HotelLogoProps) {
+export default function HotelLogoIcon({ hotelId, hotelType }: HotelLogoProps) {
   if (hotelType === HotelTypeEnum.ScandicGo) {
     return <ScandicGoLogoIcon />
   }

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

@@ -0,0 +1,6 @@
+export type {
+  IconProps,
+  IllustrationProps as LogoAndIllustrationProps,
+  LogoProps,
+  NucleoIconProps,
+} from './icon'

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

@@ -1,85 +0,0 @@
-export { default as BedHotelIcon } from './Customised/Amenities&Facilities/BedHotel'
-export { default as CoolingIcon } from './Customised/Amenities&Facilities/Cooling'
-export { default as CouchTableIcon } from './Customised/Amenities&Facilities/CouchTable'
-export { default as FootStoolIcon } from './Customised/Amenities&Facilities/FootStool'
-export { default as HairDryerIcon } from './Customised/Amenities&Facilities/Hairdryer'
-export { default as HandSoapIcon } from './Customised/Amenities&Facilities/HandSoap'
-export { default as IceMachineIcon } from './Customised/Amenities&Facilities/IceMachine'
-export { default as MassageIcon } from './Customised/Amenities&Facilities/Massage'
-export { default as MdiBunkBedIcon } from './Customised/Amenities&Facilities/MdiBunkBedOutline'
-export { default as MirrorIcon } from './Customised/Amenities&Facilities/Mirror'
-export { default as MovingBedsIcon } from './Customised/Amenities&Facilities/MovingBeds'
-export { default as RoadIcon } from './Customised/Amenities&Facilities/Road'
-export { default as RugIcon } from './Customised/Amenities&Facilities/Rug'
-export { default as SafetyBoxIcon } from './Customised/Amenities&Facilities/SafetyBox'
-export { default as SlippersIcon } from './Customised/Amenities&Facilities/Slippers'
-export { default as TowelIcon } from './Customised/Amenities&Facilities/Towel'
-export { default as ViewIcon } from './Customised/Amenities&Facilities/View'
-export { default as WardIcon } from './Customised/Amenities&Facilities/Ward'
-export { default as WindowNotAvailableIcon } from './Customised/Amenities&Facilities/WindowNotAvailable'
-export { default as WoodFloorIcon } from './Customised/Amenities&Facilities/WoodFloor'
-export { default as DiamondAddIcon } from './Customised/Benefits/DiamondAdd'
-export { default as FacebookIcon } from './Customised/Socials/Facebook'
-export { default as InstagramIcon } from './Customised/Socials/Instagram'
-export { default as TripadvisorIcon } from './Customised/Socials/Tripadvisor'
-export { default as MinimizeIcon } from './Customised/UI/Minimize'
-export { default as BedIcon } from './Illustrations/Bed'
-export { default as BedBunkIcon } from './Illustrations/BedBunk'
-export { default as BedBunkExtraIcon } from './Illustrations/BedBunkExtra'
-export { default as BedGenericIcon } from './Illustrations/BedGeneric'
-export { default as BedKingIcon } from './Illustrations/BedKing'
-export { default as BedPullOutIcon } from './Illustrations/BedPullOut'
-export { default as BedPullOutExtraIcon } from './Illustrations/BedPullOutExtra'
-export { default as BedQueenIcon } from './Illustrations/BedQueen'
-export { default as BedSingleIcon } from './Illustrations/BedSingle'
-export { default as BedSofaIcon } from './Illustrations/BedSofa'
-export { default as BedSofaExtraIcon } from './Illustrations/BedSofaExtra'
-export { default as BedTwinIcon } from './Illustrations/BedTwin'
-export { default as BedWallExtraIcon } from './Illustrations/BedWallExtra'
-export { default as BreakfastBuffetIcon } from './Illustrations/BreakfastBuffet'
-export { default as NoBreakfastBuffetIcon } from './Illustrations/NoBreakfastBuffet'
-export { default as CoinIcon } from './Illustrations/Coin'
-export { default as CroissantCoffeeEggIcon } from './Illustrations/CroissantCoffeeEgg'
-export { default as CutleryOneIcon } from './Illustrations/CutleryOne'
-export { default as CutleryTwoIcon } from './Illustrations/CutleryTwo'
-export { default as GiftOpenIcon } from './Illustrations/GiftOpen'
-export { default as HandKeyIcon } from './Illustrations/HandKey'
-export { default as HotelNightIcon } from './Illustrations/HotelNight'
-export { default as KidsIcon } from './Illustrations/Kids'
-export { default as KidsMocktailIcon } from './Illustrations/KidsMocktail'
-export { default as MagicWandIcon } from './Illustrations/MagicWand'
-export { default as MoneyHandIcon } from './Illustrations/MoneyHand'
-export { default as SurpriseIcon } from './Illustrations/Surprise'
-export { default as VoucherIcon } from './Illustrations/Voucher'
-export { default as HotelLogo } from './Logos'
-export { default as DowntownCamperIcon } from './Logos/DowntownCamper'
-export { default as GrandHotelOsloLogoIcon } from './Logos/GrandHotelOslo'
-export { default as HaymarketIcon } from './Logos/Haymarket'
-export { default as HotelNorgeIcon } from './Logos/HotelNorge'
-export { default as MarskiLogoIcon } from './Logos/Marski'
-export { default as ScandicGoLogoIcon } from './Logos/ScandicGoLogo'
-export { default as ScandicLogoIcon } from './Logos/ScandicLogo'
-export { MaterialIcon } from './MaterialIcon'
-export { default as BathroomCabinet2Icon } from './Nucleo/Amenities&Facilities/bathroom-cabinet-2'
-export { default as ConferenceRoomIcon } from './Nucleo/Amenities&Facilities/conference-room'
-export { default as Door2Icon } from './Nucleo/Amenities&Facilities/door-2'
-export { default as Hairdresser1Icon } from './Nucleo/Amenities&Facilities/hairdresser-1'
-export { default as RecordPlayer3Icon } from './Nucleo/Amenities&Facilities/record-player-3'
-export { default as Toilet2Icon } from './Nucleo/Amenities&Facilities/toilet-2'
-export { default as UserPolice2Icon } from './Nucleo/Amenities&Facilities/user-police-2'
-export { default as BouquetIcon } from './Nucleo/Benefits/bouquet'
-export { default as Discount22Icon } from './Nucleo/Benefits/discount-2-2'
-export { default as BowlingPinsIcon } from './Nucleo/Experiences/bowling-pins'
-export { default as PalmTree2Icon } from './Nucleo/Experiences/palm-tree-2'
-export { default as Chips3Icon } from './Nucleo/Food/chips-3'
-export { default as Popcorn2Icon } from './Nucleo/Food/popcorn-2'
-
-export type {
-  IconProps,
-  IllustrationProps as LogoAndIllustrationProps,
-  NucleoIconProps,
-} from './icon'
-export type {
-  MaterialIconProps,
-  MaterialIconSetIconProps,
-} from './MaterialIcon'

packages/design-system/lib/components/RateCard/Campaign/index.tsx

@@ -4,7 +4,7 @@ import { Rate, RateTermDetails } from '../types'
 import styles from '../rate-card.module.css'
 import { Button } from '../../Button'
 import { variants } from '../variants'
-import { MaterialIcon } from '../../Icons'
+import { MaterialIcon } from '../../Icons/MaterialIcon'
 import Modal from '../Modal'
 
 interface CampaignRateCardProps {

packages/design-system/lib/components/RateCard/Code/index.tsx

@@ -4,7 +4,7 @@ import styles from '../rate-card.module.css'
 import { Typography } from '../../Typography'
 import { Button } from '../../Button'
 import { variants } from '../variants'
-import { MaterialIcon } from '../../Icons'
+import { MaterialIcon } from '../../Icons/MaterialIcon'
 import Modal from '../Modal'
 
 interface CodeRateCardProps {

packages/design-system/lib/components/RateCard/Modal/index.tsx

@@ -19,7 +19,7 @@ import { fade, slideInOut } from './motionVariants'
 
 import styles from './modal.module.css'
 import { Typography } from '../../Typography'
-import { MaterialIcon } from '../../Icons'
+import { MaterialIcon } from '../../Icons/MaterialIcon'
 
 const MotionOverlay = motion(ModalOverlay)
 const MotionModal = motion(AriaModal)

packages/design-system/lib/components/RateCard/NoRateAvailable/index.tsx

@@ -2,7 +2,7 @@ import styles from '../rate-card.module.css'
 import { Typography } from '../../Typography'
 import { Button } from '../../Button'
 import { variants } from '../variants'
-import { MaterialIcon } from '../../Icons'
+import { MaterialIcon } from '../../Icons/MaterialIcon'
 
 interface NoRateAvailableCardProps {
   variant: 'Regular' | 'Campaign' | 'Code' | 'Points'

packages/design-system/lib/components/RateCard/Points/index.tsx

@@ -6,7 +6,7 @@ import { Button } from '../../Button'
 import { Radio } from '../../Radio'
 import { RadioGroup } from 'react-aria-components'
 import { variants } from '../variants'
-import { MaterialIcon } from '../../Icons'
+import { MaterialIcon } from '../../Icons/MaterialIcon'
 import Modal from '../Modal'
 
 interface PointsRateCardProps {

packages/design-system/lib/components/RateCard/Regular/index.tsx

@@ -4,7 +4,7 @@ import styles from '../rate-card.module.css'
 import { Typography } from '../../Typography'
 import { Button } from '../../Button'
 import { variants } from '../variants'
-import { MaterialIcon } from '../../Icons'
+import { MaterialIcon } from '../../Icons/MaterialIcon'
 import Modal from '../Modal'
 
 interface RegularRateCardProps {

packages/design-system/package.json

@@ -9,13 +9,88 @@
     "./ChipButton": "./dist/components/ChipButton/index.js",
     "./ChipLink": "./dist/components/ChipLink/index.js",
     "./Chips": "./dist/components/Chips/index.js",
-    "./Icons": "./dist/components/Icons/index.js",
     "./Typography": "./dist/components/Typography/index.js",
     "./RegularRateCard": "./dist/components/RateCard/Regular/index.js",
     "./CampaignRateCard": "./dist/components/RateCard/Campaign/index.js",
     "./CodeRateCard": "./dist/components/RateCard/Code/index.js",
     "./PointsRateCard": "./dist/components/RateCard/Points/index.js",
     "./NoRateAvailableCard": "./dist/components/RateCard/NoRateAvailable/index.js",
+    "./Icons": "./dist/components/Icons/index.js",
+    "./Icons/BathroomCabinetIcon": "./dist/components/Icons/Nucleo/Amenities_Facilities/bathroom-cabinet-2.js",
+    "./Icons/BedHotelIcon": "./dist/components/Icons/Customised/Amenities_Facilities/BedHotel.js",
+    "./Icons/BedIcon": "./dist/components/Icons/Illustrations/Bed.js",
+    "./Icons/BouquetIcon": "./dist/components/Icons/Nucleo/Benefits/bouquet.js",
+    "./Icons/BowlingPinsIcon": "./dist/components/Icons/Nucleo/Experiences/bowling-pins.js",
+    "./Icons/BunkBedIcon": "./dist/components/Icons/Customised/Amenities_Facilities/MdiBunkBedOutline.js",
+    "./Icons/ChipsIcon": "./dist/components/Icons/Nucleo/Food/chips-3.js",
+    "./Icons/CoinIcon": "./dist/components/Icons/Illustrations/Coin.js",
+    "./Icons/ConferenceRoomIcon": "./dist/components/Icons/Nucleo/Amenities_Facilities/conference-room.js",
+    "./Icons/CoolingIcon": "./dist/components/Icons/Customised/Amenities_Facilities/Cooling.js",
+    "./Icons/CouchTableIcon": "./dist/components/Icons/Customised/Amenities_Facilities/CouchTable.js",
+    "./Icons/CroissantCoffeeEggIcon": "./dist/components/Icons/Illustrations/CroissantCoffeeEgg.js",
+    "./Icons/CutleryOneIcon": "./dist/components/Icons/Illustrations/CutleryOne.js",
+    "./Icons/CutleryTwoIcon": "./dist/components/Icons/Illustrations/CutleryTwo.js",
+    "./Icons/DiamondAddIcon": "./dist/components/Icons/Customised/Benefits/DiamondAdd.js",
+    "./Icons/DiscountIcon": "./dist/components/Icons/Nucleo/Benefits/discount-2-2.js",
+    "./Icons/DoorIcon": "./dist/components/Icons/Nucleo/Amenities_Facilities/door-2.js",
+    "./Icons/DowntownCamperIcon": "./dist/components/Icons/Logos/DowntownCamper.js",
+    "./Icons/FacebookIcon": "./dist/components/Icons/Customised/Socials/Facebook.js",
+    "./Icons/FootStoolIcon": "./dist/components/Icons/Customised/Amenities_Facilities/FootStool.js",
+    "./Icons/GiftOpenIcon": "./dist/components/Icons/Illustrations/GiftOpen.js",
+    "./Icons/GrandHotelOsloIcon": "./dist/components/Icons/Logos/GrandHotelOslo.js",
+    "./Icons/HairdryerIcon": "./dist/components/Icons/Customised/Amenities_Facilities/Hairdryer.js",
+    "./Icons/HairdresserIcon": "./dist/components/Icons/Nucleo/Amenities_Facilities/hairdresser-1.js",
+    "./Icons/HandKeyIcon": "./dist/components/Icons/Illustrations/HandKey.js",
+    "./Icons/HandSoapIcon": "./dist/components/Icons/Customised/Amenities_Facilities/HandSoap.js",
+    "./Icons/HaymarketIcon": "./dist/components/Icons/Logos/Haymarket.js",
+    "./Icons/HotelNightIcon": "./dist/components/Icons/Illustrations/HotelNight.js",
+    "./Icons/HotelNorgeIcon": "./dist/components/Icons/Logos/HotelNorge.js",
+    "./Icons/IceMachineIcon": "./dist/components/Icons/Customised/Amenities_Facilities/IceMachine.js",
+    "./Icons/InstagramIcon": "./dist/components/Icons/Customised/Socials/Instagram.js",
+    "./Icons/KidsIcon": "./dist/components/Icons/Illustrations/Kids.js",
+    "./Icons/KidsMocktailIcon": "./dist/components/Icons/Illustrations/KidsMocktail.js",
+    "./Icons/MagicWandIcon": "./dist/components/Icons/Illustrations/MagicWand.js",
+    "./Icons/MarskiLogoIcon": "./dist/components/Icons/Logos/MarskiLogo.js",
+    "./Icons/MassageIcon": "./dist/components/Icons/Customised/Amenities_Facilities/Massage.js",
+    "./Icons/MaterialIcon": "./dist/components/Icons/MaterialIcon/index.js",
+    "./Icons/MinimizeIcon": "./dist/components/Icons/Customised/UI/Minimize.js",
+    "./Icons/MirrorIcon": "./dist/components/Icons/Customised/Amenities_Facilities/Mirror.js",
+    "./Icons/MoneyHandIcon": "./dist/components/Icons/Illustrations/MoneyHand.js",
+    "./Icons/BedBunkExtraIcon": "./dist/components/Icons/Illustrations/BedBunkExtra.js",
+    "./Icons/BedGenericIcon": "./dist/components/Icons/Illustrations/BedGeneric.js",
+    "./Icons/BedBunkIcon": "./dist/components/Icons/Illustrations/BedBunk.js",
+    "./Icons/HotelLogoIcon": "./dist/components/Icons/Logos/index.js",
+    "./Icons/BedKingIcon": "./dist/components/Icons/Illustrations/BedKing.js",
+    "./Icons/BedQueenIcon": "./dist/components/Icons/Illustrations/BedQueen.js",
+    "./Icons/BedSofaIcon": "./dist/components/Icons/Illustrations/BedSofa.js",
+    "./Icons/BedSofaExtraIcon": "./dist/components/Icons/Illustrations/BedSofaExtra.js",
+    "./Icons/BedTwinIcon": "./dist/components/Icons/Illustrations/BedTwin.js",
+    "./Icons/BedWallExtraIcon": "./dist/components/Icons/Illustrations/BedWallExtra.js",
+    "./Icons/BreakfastBuffetIcon": "./dist/components/Icons/Illustrations/BreakfastBuffet.js",
+    "./Icons/NoBreakfastBuffetIcon": "./dist/components/Icons/Illustrations/NoBreakfastBuffet.js",
+    "./Icons/BedSingleIcon": "./dist/components/Icons/Illustrations/BedSingle.js",
+    "./Icons/BedPullOutIcon": "./dist/components/Icons/Illustrations/BedPullOut.js",
+    "./Icons/BedPullOutExtraIcon": "./dist/components/Icons/Illustrations/BedPullOutExtra.js",
+    "./Icons/MovingBedsIcon": "./dist/components/Icons/Customised/Amenities_Facilities/MovingBeds.js",
+    "./Icons/PalmTreeIcon": "./dist/components/Icons/Nucleo/Experiences/palm-tree-2.js",
+    "./Icons/PopcornIcon": "./dist/components/Icons/Nucleo/Food/popcorn-2.js",
+    "./Icons/RecordPlayerIcon": "./dist/components/Icons/Nucleo/Amenities_Facilities/record-player-3.js",
+    "./Icons/RoadIcon": "./dist/components/Icons/Customised/Amenities_Facilities/Road.js",
+    "./Icons/RugIcon": "./dist/components/Icons/Customised/Amenities_Facilities/Rug.js",
+    "./Icons/SafetyBoxIcon": "./dist/components/Icons/Customised/Amenities_Facilities/SafetyBox.js",
+    "./Icons/ScandicGoIcon": "./dist/components/Icons/Logos/ScandicGoLogo.js",
+    "./Icons/ScandicLogoIcon": "./dist/components/Icons/Logos/ScandicLogo.js",
+    "./Icons/SlippersIcon": "./dist/components/Icons/Customised/Amenities_Facilities/Slippers.js",
+    "./Icons/SurpriseIcon": "./dist/components/Icons/Illustrations/Surprise.js",
+    "./Icons/ToiletIcon": "./dist/components/Icons/Nucleo/Amenities_Facilities/toilet-2.js",
+    "./Icons/TowelIcon": "./dist/components/Icons/Customised/Amenities_Facilities/Towel.js",
+    "./Icons/TripadvisorIcon": "./dist/components/Icons/Customised/Socials/Tripadvisor.js",
+    "./Icons/UserPoliceIcon": "./dist/components/Icons/Nucleo/Amenities_Facilities/user-police-2.js",
+    "./Icons/ViewIcon": "./dist/components/Icons/Customised/Amenities_Facilities/View.js",
+    "./Icons/VoucherIcon": "./dist/components/Icons/Illustrations/Voucher.js",
+    "./Icons/WardIcon": "./dist/components/Icons/Customised/Amenities_Facilities/Ward.js",
+    "./Icons/WindowNotAvailableIcon": "./dist/components/Icons/Customised/Amenities_Facilities/WindowNotAvailable.js",
+    "./Icons/WoodFloorIcon": "./dist/components/Icons/Customised/Amenities_Facilities/WoodFloor.js",
     "./style.css": "./dist/style.css",
     "./base.css": "./dist/base.css",
     "./globals.css": "./dist/globals.css",