Merge develop

types/components/content/blocks.ts

@@ -7,6 +7,7 @@ import {
   Block,
   CardsGrid,
   DynamicContent,
+  TextCols,
 } from "@/types/trpc/routers/contentstack/contentPage"
 
 export type BlocksProps = {
@@ -17,6 +18,10 @@ export type CardsGridProps = Pick<CardsGrid, "cards_grid"> & {
   firstItem?: boolean
 }
 
+export type TextColsProps = {
+  textCols: TextCols["text_cols"]
+}
+
 export type DynamicContentProps = {
   dynamicContent: DynamicContent["dynamic_content"]
   firstItem: boolean

types/components/content/enums.ts

@@ -6,6 +6,7 @@ export enum ContentBlocksTypenameEnum {
   ContentPageBlocksShortcuts = "ContentPageBlocksShortcuts",
   ContentPageBlocksCardsGrid = "ContentPageBlocksCardsGrid",
   ContentPageBlocksDynamicContent = "ContentPageBlocksDynamicContent",
+  ContentPageBlocksTextCols = "ContentPageBlocksTextCols",
 }
 
 export enum CardsGridEnum {

types/trpc/routers/contentstack/contentPage.ts

@@ -9,6 +9,7 @@ import {
   contentPageShortcuts,
   contentPageSidebarDynamicContent,
   contentPageSidebarTextContent,
+  contentPageTextCols,
   loyaltyCardBlock,
   validateContentPageRefsSchema,
   validateContentPageSchema,
@@ -81,4 +82,22 @@ export type CardsGrid = Omit<CardsGridRaw, "cards"> & {
 }
 export type CardsRaw = CardsGrid["cards_grid"]["cards"][number]
 
-export type Block = RteBlockContent | Shortcuts | CardsGrid | DynamicContent
+type TextColsRaw = z.infer<typeof contentPageTextCols>
+export interface TextCols extends TextColsRaw {
+  textCols: {
+    columns: {
+      title: string
+      text: {
+        json: RTEDocument
+        embedded_itemsConnection: EdgesWithTotalCount<Embeds>
+      }
+    }[]
+  }
+}
+
+export type Block =
+  | RteBlockContent
+  | Shortcuts
+  | CardsGrid
+  | DynamicContent
+  | TextCols