Merge pull request #292 from medyo/develop

refactor: export Ad and StickyAd types for better accessibility in th…

Author: medyo

src/features/adv/api/getAd.ts

@@ -1,6 +1,7 @@
 import { useQuery } from '@tanstack/react-query'
 import { axios } from 'src/lib/axios'
 import { ExtractFnReturnType, QueryConfig } from 'src/lib/react-query'
+import { Ad } from '../types'
 
 const getAd = async (keywords: string[]): Promise<Ad[]> => {
   let params = { keywords: keywords.join(',') }

src/features/adv/components/StickyBanner.tsx

@@ -2,6 +2,7 @@ import jsonPath from 'jsonpath'
 import { useEffect, useMemo } from 'react'
 import { useMediaQuery } from 'react-responsive'
 import { useAdStore } from 'src/features/adv/stores/AdStore'
+import type { StickyAd } from 'src/features/adv/types'
 import { useAuth } from 'src/features/auth'
 import { trackAdvOpen, trackAdvView } from 'src/lib/analytics'
 import { useUserPreferences } from 'src/stores/preferences'
@@ -15,7 +16,8 @@ export const StickyBanner = () => {
   const isMobile = useMediaQuery({ maxWidth: 767 })
   const { ads } = useAdStore()
 
-  const ad = ads.length > 0 ? ads.find((ad) => ad.type === 'sticky-ad') : null
+  const ad =
+    ads.length > 0 ? (ads.find((ad) => ad.type === 'sticky-ad') as StickyAd | undefined) : null
 
   const onAdClick = () => {
     if (ad?.id) {

src/features/adv/stores/AdStore.tsx

@@ -1,4 +1,5 @@
 import { create } from 'zustand'
+import { Ad } from '../types'
 
 type AdStore = {
   ads: Ad[]

src/features/adv/types/index.ts

@@ -29,7 +29,7 @@ type LargeImageAd = CommonAdFields & {
   imageUrl: string
 }
 
-type StickyAd = CommonAdFields & {
+export type StickyAd = CommonAdFields & {
   type: 'sticky-ad'
   title: string
   imageUrl: string
@@ -39,4 +39,4 @@ type StickyAd = CommonAdFields & {
   dismissible?: boolean
 }
 
-type Ad = SmallImageAd | LargeImageAd | StickyAd
+export type Ad = SmallImageAd | LargeImageAd | StickyAd