Merge pull request #29 from triwats/main

allow pricing to be undefined
nuotsu · Oct 28, 2024 · 5992313 · 5992313
2 parents e17f92e + b432a06
commit 5992313
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/sanity/schemas/documents/pricing.ts b/sanity/schemas/documents/pricing.ts
@@ -60,9 +60,9 @@ export default defineType({
 			return {
 				title,
 				subtitle: [
-					price.base || 'Free',
-					price.strikethrough && `(${price.strikethrough})`,
-					price.suffix,
+					price?.base || 'Free',
+					price?.strikethrough && `(${price.strikethrough})`,
+					price?.suffix,
 				]
 					.filter(Boolean)
 					.join(' '),

diff --git a/src/types/Sanity.d.ts b/src/types/Sanity.d.ts
@@ -77,7 +77,7 @@ declare global {
 			title: string
 			highlight?: string
 			price: {
-				base: number
+				base?: number
 				strikethrough?: number
 				suffix?: string
 			}

diff --git a/src/ui/modules/PricingList.tsx b/src/ui/modules/PricingList.tsx
@@ -33,21 +33,23 @@ export default function PricingList({
 								</Pretitle>
 							</dt>
 
-							<dt className="flex flex-wrap items-end gap-x-2">
-								{!isNaN(tier.price.base) && (
-									<b className="h1">{formatPrice(tier.price.base)}</b>
-								)}
-								{tier.price.suffix && (
-									<span className={cn(isNaN(tier.price.base) && 'h1')}>
-										{tier.price.suffix}
-									</span>
-								)}
-								{tier.price.strikethrough && (
-									<s className="font-bold decoration-red-500">
-										{formatPrice(tier.price.strikethrough)}
-									</s>
-								)}
-							</dt>
+							{tier.price?.base !== undefined && (
+								<dt className="flex flex-wrap items-end gap-x-2">
+									{tier.price.base !== undefined && !isNaN(tier.price.base) && (
+										<b className="h1">{formatPrice(tier.price.base)}</b>
+									)}
+									{tier.price.suffix && (
+										<span className={cn(isNaN(tier.price.base) && 'h1')}>
+											{tier.price.suffix}
+										</span>
+									)}
+									{tier.price.strikethrough && (
+										<s className="font-bold decoration-red-500">
+											{formatPrice(tier.price?.strikethrough)}
+										</s>
+									)}
+								</dt>
+							)}
 						</div>
 
 						<dd>