@anker-in/campaign-ui 0.5.1-beta.3 → 0.5.2

package/src/components/credits/context/const.ts

@@ -87,6 +87,7 @@ export enum AlpcErrorCode {
 export const ALPC_COUNTRY_MAP = new Map<string, string>([
   ['eu-en', 'eu'],
   ['eu-de', 'de'],
+  ['eu-fr', 'fr'],
 ])
 
 export enum ApprovalStatus {

package/src/components/credits/context/hooks/useMyRewards.ts

@@ -15,7 +15,7 @@ function useMyRewards({
   pageSize: number
   consumeType?: AlpcConsumeType
 }) {
-  const { profile, alpcBrand } = useCreditsContext()
+  const { profile, alpcBrand, alpcCountry } = useCreditsContext()
   const { brand: headlessBrand, locale, appName } = useHeadlessContext()
   const brand = alpcBrand || headlessBrand
 
@@ -34,7 +34,7 @@ function useMyRewards({
     url: `/v1/credit/log/coupon`,
     initData: {
       brand: brand,
-      country: ALPC_COUNTRY_MAP.get(locale) || locale,
+      country: alpcCountry || ALPC_COUNTRY_MAP.get(locale) || locale,
       app_name: appName,
     },
   })

package/src/components/credits/context/hooks/useRedeemCoupon.ts

@@ -13,7 +13,7 @@ type RedeemCouponResponse = {
 }
 
 export const useRedeemCoupon = (mutationOptions: UseMutationConfig<RedeemCouponResponse> = {}) => {
-  const { alpcBrand } = useCreditsContext()
+  const { alpcBrand, alpcCountry } = useCreditsContext()
   const { locale, appName, brand: headlessBrand } = useHeadlessContext()
   const brand = alpcBrand || headlessBrand
 
@@ -28,7 +28,7 @@ export const useRedeemCoupon = (mutationOptions: UseMutationConfig<RedeemCouponR
       url: `/v1/credit/redeem/coupon`,
       initData: {
         brand,
-        country: ALPC_COUNTRY_MAP.get(locale) || locale,
+        country: alpcCountry || ALPC_COUNTRY_MAP.get(locale) || locale,
         app_name: appName,
       },
     },

package/src/components/credits/context/hooks/useRedeemGoGift.ts

@@ -12,7 +12,7 @@ type RedeemGoGiftResponse = {
 }
 
 export const useRedeemGoGift = (mutationOptions: UseMutationConfig<RedeemGoGiftResponse> = {}) => {
-  const { alpcBrand } = useCreditsContext()
+  const { alpcBrand, alpcCountry } = useCreditsContext()
   const { locale, appName, brand: headlessBrand } = useHeadlessContext()
   const brand = alpcBrand || headlessBrand
 
@@ -27,7 +27,7 @@ export const useRedeemGoGift = (mutationOptions: UseMutationConfig<RedeemGoGiftR
       url: `/v1/credit/redeem/gogift`,
       initData: {
         brand,
-        country: ALPC_COUNTRY_MAP.get(locale) || locale,
+        country: alpcCountry || ALPC_COUNTRY_MAP.get(locale) || locale,
         app_name: appName,
       },
     },

package/src/components/credits/context/hooks/useRedeemProduct.ts

@@ -11,7 +11,7 @@ type RedeemProductResponse = {
 }
 
 export const useRedeemProduct = (mutationOptions: UseMutationConfig<RedeemProductResponse> = {}) => {
-  const { alpcBrand } = useCreditsContext()
+  const { alpcBrand, alpcCountry } = useCreditsContext()
   const { storeDomain, locale, appName, brand: headlessBrand } = useHeadlessContext()
   const brand = alpcBrand || headlessBrand
 
@@ -27,7 +27,7 @@ export const useRedeemProduct = (mutationOptions: UseMutationConfig<RedeemProduc
       initData: {
         quantity: 1,
         brand,
-        country: (ALPC_COUNTRY_MAP.get(locale || '') || locale)?.toUpperCase(),
+        country: (alpcCountry || ALPC_COUNTRY_MAP.get(locale || '') || locale)?.toUpperCase(),
         domain: storeDomain,
         app_name: appName,
       },

package/src/components/credits/context/hooks/useRedeemableList.ts

@@ -8,7 +8,7 @@ import { useHeadlessContext } from '@anker-in/lib'
 
 function useRedeemableList(props?: { consumeType: AlpcConsumeType }) {
   let locale = '' as string
-  const { profile, isLoadingProfile, alpcBrand } = useCreditsContext()
+  const { profile, isLoadingProfile, alpcBrand, alpcCountry } = useCreditsContext()
   const { locale: contextLocale, brand: headlessBrand } = useHeadlessContext()
   const brand = alpcBrand || headlessBrand
 
@@ -30,7 +30,7 @@ function useRedeemableList(props?: { consumeType: AlpcConsumeType }) {
       brand,
       page: 1,
       page_size: 999,
-      country: (ALPC_COUNTRY_MAP.get(locale) || locale)?.toUpperCase(),
+      country: (alpcCountry || ALPC_COUNTRY_MAP.get(locale) || locale)?.toUpperCase(),
     },
   })
 

package/src/components/credits/context/hooks/useSubscribed.ts

@@ -13,7 +13,6 @@ export const useSubscribed = () => {
 
   const { activities } = useActivities(activitiesOptions)
   const { data: subscription } = useSubscriptions({ email: profile?.email })
-  //@ts-ignore
   const subscriptionData = subscription?.data || subscription
 
   const isSubscribed = useMemo(() => {

package/src/components/credits/context/provider.tsx

@@ -22,6 +22,7 @@ type Context = {
   pageCommon: CreditsPageCommon
   memberPriceDiscount?: FunctionMemberPriceConfig[]
   alpcBrand?: string
+  alpcCountry?: string
   cartConfig?: {
     addToCart: (params: {
       variantList: Array<{
@@ -57,6 +58,7 @@ export const CreditsContext = createContext<Context>({
   pageCommon: {},
   memberPriceDiscount: undefined,
   alpcBrand: undefined,
+  alpcCountry: undefined,
   cartConfig: undefined,
   openMyRewardsModal: false,
   setOpenMyRewardsModal: () => {},
@@ -81,6 +83,7 @@ export function CreditsProvider({
   pageCommon,
   memberPriceDiscount,
   alpcBrand,
+  alpcCountry,
   cartConfig,
   apiBaseUrl,
 }: PropsWithChildren<Omit<Context, 'openMyRewardsModal' | 'setOpenMyRewardsModal' | 'openActivitiesModal' | 'setOpenActivitiesModal'>>) {
@@ -104,6 +107,7 @@ export function CreditsProvider({
         pageCommon,
         memberPriceDiscount,
         alpcBrand,
+        alpcCountry,
         cartConfig,
         apiBaseUrl,
         openMyRewardsModal,

package/src/components/credits/creditsRedeemList/AddressForm/index.tsx

@@ -12,7 +12,7 @@ import { AddressFormProps } from './type'
 import { ROUNDED_BRANDS } from '../../../../constants'
 
 export const AddressForm = ({ countries, countriesLoading, form, validate, errors, onChange }: AddressFormProps) => {
-  const { profile, customer } = useCreditsContext()
+  const { profile, customer, alpcCountry } = useCreditsContext()
   const { locale, brand } = useHeadlessContext()
   const rounded = ROUNDED_BRANDS.includes(brand)
   const [address, setAddress] = useState<Record<string, any>>()
@@ -45,7 +45,7 @@ export const AddressForm = ({ countries, countriesLoading, form, validate, error
         zip: customer?.defaultAddress.zip,
       }
     } else {
-      let defaultCountry = ALPC_COUNTRY_MAP.get(locale) || locale
+      let defaultCountry = alpcCountry || ALPC_COUNTRY_MAP.get(locale) || locale
       if (defaultCountry === 'UK') {
         defaultCountry = 'GB'
       }
@@ -57,7 +57,7 @@ export const AddressForm = ({ countries, countriesLoading, form, validate, error
         country: defaultCountry,
       }
     }
-  }, [customer, profile?.email, locale])
+  }, [customer, profile?.email, locale, alpcCountry])
 
   useEffect(() => {
     const defaultAddress = getDefaultAddress()

package/src/components/index.ts

@@ -1,4 +1,4 @@
-export { default as Chat } from './chat/index.js'
+export { default as Chat } from './chat/index'
 
 export {
   Role,
@@ -7,7 +7,7 @@ export {
   useCopilotChat,
   useCopilotAction,
   useCopilotReadable,
-} from './chat/utils.js'
+} from './chat/utils'
 
 export * from './credits/index.js'
 

package/src/components/memberPopup/MemberPopup.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { lazy, Suspense, useState, useCallback, useEffect } from 'react'
+import { lazy, Suspense, useState, useCallback, useEffect, type CSSProperties } from 'react'
 import { Picture } from '@anker-in/headless-ui'
 import { gaTrack, type HeadlessConfig, useHeadlessContext, classNames as cn } from '@anker-in/lib'
 import {
@@ -34,6 +34,7 @@ type MemberPopupProps = MemberPopupContextValue & {
 
 export function MemberPopup({ copy, bottomOffset = '24px', ...providerProps }: MemberPopupProps) {
   const [isVisible, setIsVisible] = useState(false)
+  const effectiveBottomOffset = copy.bottomOffset ?? bottomOffset
 
   useEffect(() => {
     const config = copy.pageConfig
@@ -57,7 +58,7 @@ export function MemberPopup({ copy, bottomOffset = '24px', ...providerProps }: M
 
   return isVisible ? (
     <MemberPopupProvider {...providerProps} earnCreditsCopy={copy.earnCredits}>
-      <MemberPopupContent copy={copy} bottomOffset={bottomOffset} />
+      <MemberPopupContent copy={copy} bottomOffset={effectiveBottomOffset} />
     </MemberPopupProvider>
   ) : null
 }
@@ -267,7 +268,17 @@ function MemberPopupContent({ copy, bottomOffset }: MemberPopupContentProps) {
           }}
           aria-label={copy.triggerImg.alt ?? 'Open member popup'}
         >
-          <Picture source={copy.triggerImg.url} alt={copy.triggerImg.alt ?? ''} className="size-[58px]" />
+          <div
+            className="size-[var(--member-popup-pc-icon-size)] md:size-[var(--member-popup-mobile-icon-size)]"
+            style={
+              {
+                '--member-popup-pc-icon-size': copy.pcIconSize ?? '58px',
+                '--member-popup-mobile-icon-size': copy.mobileIconSize ?? copy.pcIconSize ?? '58px',
+              } as CSSProperties
+            }
+          >
+            <Picture source={copy.triggerImg.url} alt={copy.triggerImg.alt ?? ''} className="size-full" />
+          </div>
         </button>
       </div>
     </ViewStackContext.Provider>

package/src/components/memberPopup/type.ts

@@ -89,6 +89,12 @@ export type MemberPopupCopy = {
   referral?: ReferralCopy
   /** 页面覆盖范围配置，默认全局展示 */
   pageConfig?: MemberPopupPageConfig
+  /** 悬浮窗距离底部的距离，设置后优先于组件 bottomOffset prop（默认 '24px'） */
+  bottomOffset?: string
+  /** 触发按钮图标尺寸（PC 端，默认 '58px'） */
+  pcIconSize?: string
+  /** 触发按钮图标尺寸（移动端，默认 '58px'） */
+  mobileIconSize?: string
 }
 
 // ─── EarnCredits Copy ────────────────────────────────

package/src/templates/Credits.tsx

@@ -166,6 +166,7 @@ export const CreditsTemplate = ({
           pageCommon={pageConfig.common}
           memberPriceDiscount={siteConfig.memberPriceDiscount}
           alpcBrand={creditsConfig?.alpcBrand}
+          alpcCountry={creditsConfig?.alpcCountry}
           cartConfig={cartConfig}
           apiBaseUrl={userContext?.apiBaseUrl}
         >

package/src/templates/Credits.types.ts

@@ -55,6 +55,7 @@ export type CreditsTemplateProps = {
   }
   creditsConfig?: {
     alpcBrand?: string
+    alpcCountry?: string
   }
   pageConfig: {
     order: ComponentKey[]