fix: make contentKey type safe

This commit is contained in:
Chuma McPhoy
2024-07-12 16:27:55 +02:00
parent e76f613830
commit c6f7ead1e7
4 changed files with 24 additions and 14 deletions

View File

@@ -3,6 +3,7 @@ import { ChevronRightIcon } from "@/components/Icons"
import Link from "@/components/TempDesignSystem/Link" import Link from "@/components/TempDesignSystem/Link"
import SidePeekContainer from "@/components/TempDesignSystem/SidePeek/Container" import SidePeekContainer from "@/components/TempDesignSystem/SidePeek/Container"
import SidePeekContent from "@/components/TempDesignSystem/SidePeek/Content" import SidePeekContent from "@/components/TempDesignSystem/SidePeek/Content"
import { generateSidePeekLink } from "@/components/TempDesignSystem/SidePeek/data"
import Body from "@/components/TempDesignSystem/Text/Body" import Body from "@/components/TempDesignSystem/Text/Body"
import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
import { getIntl } from "@/i18n" import { getIntl } from "@/i18n"
@@ -17,6 +18,7 @@ export default async function AmenitiesList({
detailedFacilities: HotelData["data"]["attributes"]["detailedFacilities"] detailedFacilities: HotelData["data"]["attributes"]["detailedFacilities"]
}) { }) {
const { formatMessage } = await getIntl() const { formatMessage } = await getIntl()
const sidePeekLink = generateSidePeekLink("amenities")
const sortedAmenities = detailedFacilities const sortedAmenities = detailedFacilities
.sort((a, b) => b.sortOrder - a.sortOrder) .sort((a, b) => b.sortOrder - a.sortOrder)
.slice(0, 5) .slice(0, 5)
@@ -36,12 +38,7 @@ export default async function AmenitiesList({
) )
})} })}
</div> </div>
<Link <Link scroll={false} href={sidePeekLink} color="burgundy" variant="icon">
scroll={false}
href={"?sidepeek=amenities"}
color="burgundy"
variant="icon"
>
{formatMessage({ id: "Show all amenities" })} {formatMessage({ id: "Show all amenities" })}
<ChevronRightIcon /> <ChevronRightIcon />
</Link> </Link>

View File

@@ -4,6 +4,7 @@ import { usePathname, useRouter, useSearchParams } from "next/navigation"
import React, { Children, cloneElement, useEffect, useState } from "react" import React, { Children, cloneElement, useEffect, useState } from "react"
import SidePeek from "@/components/TempDesignSystem/SidePeek" import SidePeek from "@/components/TempDesignSystem/SidePeek"
import { SidePeekContentKey } from "@/components/TempDesignSystem/SidePeek/types"
export default function SidePeekContainer({ export default function SidePeekContainer({
children, children,
@@ -11,14 +12,18 @@ export default function SidePeekContainer({
const router = useRouter() const router = useRouter()
const pathname = usePathname() const pathname = usePathname()
const searchParams = useSearchParams() const searchParams = useSearchParams()
const [activeSidePeek, setActiveSidePeek] = useState<string | null>(() => { const [activeSidePeek, setActiveSidePeek] =
const sidePeekParam = searchParams.get("sidepeek") useState<SidePeekContentKey | null>(() => {
const sidePeekParam = searchParams.get(
return sidePeekParam || null "sidepeek"
}) ) as SidePeekContentKey | null
return sidePeekParam || null
})
useEffect(() => { useEffect(() => {
const sidePeekParam = searchParams.get("sidepeek") const sidePeekParam = searchParams.get(
"sidepeek"
) as SidePeekContentKey | null
if (sidePeekParam !== activeSidePeek) { if (sidePeekParam !== activeSidePeek) {
setActiveSidePeek(sidePeekParam) setActiveSidePeek(sidePeekParam)
} }
@@ -39,7 +44,8 @@ export default function SidePeekContainer({
return child return child
} }
return cloneElement(child as React.ReactElement, { return cloneElement(child as React.ReactElement, {
isActive: child.props.contentKey === activeSidePeek, isActive:
(child.props.contentKey as SidePeekContentKey) === activeSidePeek,
}) })
}) })

View File

@@ -0,0 +1,5 @@
import { SidePeekContentKey } from "./types"
export const generateSidePeekLink = (key: SidePeekContentKey) => {
return `?sidepeek=${key}`
}

View File

@@ -1,3 +1,5 @@
export type SidePeekContentKey = "amenities" | "read_more_about_the_hotel"
export type SidePeekProps = { export type SidePeekProps = {
activeContent: string | null activeContent: string | null
onClose: (isOpen: boolean) => void onClose: (isOpen: boolean) => void
@@ -5,7 +7,7 @@ export type SidePeekProps = {
export type SidePeekContentProps = { export type SidePeekContentProps = {
title?: string title?: string
contentKey: string contentKey: SidePeekContentKey
isActive?: boolean isActive?: boolean
onClose?: () => void onClose?: () => void
} }