From 67a7a0d571eccf8fbc4f912f2ec7f26c5b9d9a00 Mon Sep 17 00:00:00 2001 From: Anton Gunnarsson Date: Tue, 19 Aug 2025 07:04:01 +0000 Subject: [PATCH] Merged in feat/sw-3271-move-chip-to-design-system (pull request #2659) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(SW-3271): Move Chip to design-system * Move Chip to design-system Approved-by: Joakim Jäderberg --- .../Blocks/DynamicContent/Rewards/NextLevel/index.tsx | 2 +- apps/scandic-web/components/ContentCard/index.tsx | 3 +-- .../DestinationPage/ExperienceList/index.tsx | 2 +- .../DestinationPage/HotelMapCard/DialogImage/index.tsx | 3 +-- .../HotelCardDialog/HotelCardDialogImage/index.tsx | 3 +-- .../Rooms/MultiRoomWrapper/SelectedRoomPanel/index.tsx | 2 +- .../components/TempDesignSystem/Chip/chip.ts | 7 ------- .../design-system/lib/components}/Chip/chip.module.css | 0 .../design-system/lib/components}/Chip/index.tsx | 10 +++++++--- .../design-system/lib/components}/Chip/variants.ts | 8 ++++---- packages/design-system/package.json | 1 + 11 files changed, 18 insertions(+), 23 deletions(-) delete mode 100644 apps/scandic-web/components/TempDesignSystem/Chip/chip.ts rename {apps/scandic-web/components/TempDesignSystem => packages/design-system/lib/components}/Chip/chip.module.css (100%) rename {apps/scandic-web/components/TempDesignSystem => packages/design-system/lib/components}/Chip/index.tsx (52%) rename {apps/scandic-web/components/TempDesignSystem => packages/design-system/lib/components}/Chip/variants.ts (74%) diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Rewards/NextLevel/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Rewards/NextLevel/index.tsx index d4895fe3f..68fd722c4 100644 --- a/apps/scandic-web/components/Blocks/DynamicContent/Rewards/NextLevel/index.tsx +++ b/apps/scandic-web/components/Blocks/DynamicContent/Rewards/NextLevel/index.tsx @@ -2,6 +2,7 @@ import { Lock } from "react-feather" import { MembershipLevelEnum } from "@scandic-hotels/common/constants/membershipLevels" import Body from "@scandic-hotels/design-system/Body" +import Chip from "@scandic-hotels/design-system/Chip" import Title from "@scandic-hotels/design-system/Title" import { getMembershipLevel } from "@/lib/trpc/memoizedRequests" @@ -10,7 +11,6 @@ import { serverClient } from "@/lib/trpc/server" import SectionContainer from "@/components/Section/Container" import SectionHeader from "@/components/Section/Header" import SectionLink from "@/components/Section/Link" -import Chip from "@/components/TempDesignSystem/Chip" import Grids from "@/components/TempDesignSystem/Grids" import { getIntl } from "@/i18n" diff --git a/apps/scandic-web/components/ContentCard/index.tsx b/apps/scandic-web/components/ContentCard/index.tsx index 618716615..4494115c8 100644 --- a/apps/scandic-web/components/ContentCard/index.tsx +++ b/apps/scandic-web/components/ContentCard/index.tsx @@ -1,10 +1,9 @@ import Body from "@scandic-hotels/design-system/Body" +import Chip from "@scandic-hotels/design-system/Chip" import Image from "@scandic-hotels/design-system/Image" import Link from "@scandic-hotels/design-system/Link" import Subtitle from "@scandic-hotels/design-system/Subtitle" -import Chip from "@/components/TempDesignSystem/Chip" - import styles from "./contentCard.module.css" import type { ContentCardProps } from "./contentCard" diff --git a/apps/scandic-web/components/ContentType/DestinationPage/ExperienceList/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/ExperienceList/index.tsx index 44c95d1e4..b1018121d 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/ExperienceList/index.tsx +++ b/apps/scandic-web/components/ContentType/DestinationPage/ExperienceList/index.tsx @@ -2,7 +2,7 @@ import { useIntl } from "react-intl" -import Chip from "@/components/TempDesignSystem/Chip" +import Chip from "@scandic-hotels/design-system/Chip" import { mapExperiencesToListData } from "./utils" diff --git a/apps/scandic-web/components/ContentType/DestinationPage/HotelMapCard/DialogImage/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/HotelMapCard/DialogImage/index.tsx index 661be3ca2..0e5fbe937 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/HotelMapCard/DialogImage/index.tsx +++ b/apps/scandic-web/components/ContentType/DestinationPage/HotelMapCard/DialogImage/index.tsx @@ -1,9 +1,8 @@ +import Chip from "@scandic-hotels/design-system/Chip" import TripadvisorIcon from "@scandic-hotels/design-system/Icons/TripadvisorIcon" import Image from "@scandic-hotels/design-system/Image" import { Typography } from "@scandic-hotels/design-system/Typography" -import Chip from "@/components/TempDesignSystem/Chip" - import styles from "./dialogImage.module.css" interface DialogImageProps { diff --git a/apps/scandic-web/components/HotelReservation/HotelCardDialog/HotelCardDialogImage/index.tsx b/apps/scandic-web/components/HotelReservation/HotelCardDialog/HotelCardDialogImage/index.tsx index aec7a045b..1292dbf7f 100644 --- a/apps/scandic-web/components/HotelReservation/HotelCardDialog/HotelCardDialogImage/index.tsx +++ b/apps/scandic-web/components/HotelReservation/HotelCardDialog/HotelCardDialogImage/index.tsx @@ -1,8 +1,7 @@ +import Chip from "@scandic-hotels/design-system/Chip" import TripadvisorIcon from "@scandic-hotels/design-system/Icons/TripadvisorIcon" import Image from "@scandic-hotels/design-system/Image" -import Chip from "@/components/TempDesignSystem/Chip" - import { hotelCardDialogImageVariants } from "./variants" import styles from "./hotelCardDialogImage.module.css" diff --git a/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/MultiRoomWrapper/SelectedRoomPanel/index.tsx b/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/MultiRoomWrapper/SelectedRoomPanel/index.tsx index 3ac188e8e..d3eaa07b8 100644 --- a/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/MultiRoomWrapper/SelectedRoomPanel/index.tsx +++ b/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/MultiRoomWrapper/SelectedRoomPanel/index.tsx @@ -5,13 +5,13 @@ import { CurrencyEnum } from "@scandic-hotels/common/constants/currency" import { logger } from "@scandic-hotels/common/logger" import Body from "@scandic-hotels/design-system/Body" import Caption from "@scandic-hotels/design-system/Caption" +import Chip from "@scandic-hotels/design-system/Chip" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import Image from "@scandic-hotels/design-system/Image" import { OldDSButton as Button } from "@scandic-hotels/design-system/OldDSButton" import Subtitle from "@scandic-hotels/design-system/Subtitle" import { RateEnum } from "@scandic-hotels/trpc/enums/rate" -import Chip from "@/components/TempDesignSystem/Chip" import { useSelectRateContext } from "@/contexts/SelectRate/SelectRateContext" import { useIsUserLoggedIn } from "@/hooks/useIsUserLoggedIn" diff --git a/apps/scandic-web/components/TempDesignSystem/Chip/chip.ts b/apps/scandic-web/components/TempDesignSystem/Chip/chip.ts deleted file mode 100644 index f04012b44..000000000 --- a/apps/scandic-web/components/TempDesignSystem/Chip/chip.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { VariantProps } from "class-variance-authority" - -import type { chipVariants } from "./variants" - -export interface ChipProps - extends React.HtmlHTMLAttributes, - VariantProps {} diff --git a/apps/scandic-web/components/TempDesignSystem/Chip/chip.module.css b/packages/design-system/lib/components/Chip/chip.module.css similarity index 100% rename from apps/scandic-web/components/TempDesignSystem/Chip/chip.module.css rename to packages/design-system/lib/components/Chip/chip.module.css diff --git a/apps/scandic-web/components/TempDesignSystem/Chip/index.tsx b/packages/design-system/lib/components/Chip/index.tsx similarity index 52% rename from apps/scandic-web/components/TempDesignSystem/Chip/index.tsx rename to packages/design-system/lib/components/Chip/index.tsx index 330d27803..560eb5a3f 100644 --- a/apps/scandic-web/components/TempDesignSystem/Chip/index.tsx +++ b/packages/design-system/lib/components/Chip/index.tsx @@ -1,8 +1,12 @@ -import Footnote from "@scandic-hotels/design-system/Footnote" +import Footnote from '../Footnote' -import { chipVariants } from "./variants" +import { chipVariants } from './variants' -import type { ChipProps } from "./chip" +import type { VariantProps } from 'class-variance-authority' + +interface ChipProps + extends React.HtmlHTMLAttributes, + VariantProps {} export default function Chip({ children, diff --git a/apps/scandic-web/components/TempDesignSystem/Chip/variants.ts b/packages/design-system/lib/components/Chip/variants.ts similarity index 74% rename from apps/scandic-web/components/TempDesignSystem/Chip/variants.ts rename to packages/design-system/lib/components/Chip/variants.ts index dd9223d2a..a0055d55e 100644 --- a/apps/scandic-web/components/TempDesignSystem/Chip/variants.ts +++ b/packages/design-system/lib/components/Chip/variants.ts @@ -1,6 +1,6 @@ -import { cva } from "class-variance-authority" +import { cva } from 'class-variance-authority' -import styles from "./chip.module.css" +import styles from './chip.module.css' export const chipVariants = cva(styles.chip, { variants: { @@ -17,7 +17,7 @@ export const chipVariants = cva(styles.chip, { }, }, defaultVariants: { - size: "medium", - variant: "default", + size: 'medium', + variant: 'default', }, }) diff --git a/packages/design-system/package.json b/packages/design-system/package.json index 8b1dd028b..3cb23fed1 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -13,6 +13,7 @@ "./CampaignRateCard": "./lib/components/RateCard/Campaign/index.tsx", "./Caption": "./lib/components/Caption/index.tsx", "./Card": "./lib/components/Card/index.tsx", + "./Chip": "./lib/components/Chip/index.tsx", "./ChipButton": "./lib/components/ChipButton/index.tsx", "./ChipLink": "./lib/components/ChipLink/index.tsx", "./Chips": "./lib/components/Chips/index.tsx",