@hanzo/commerce 4.4.2 → 4.6.0

package/components/add-to-cart-widget.tsx

@@ -2,11 +2,12 @@
 import React from 'react'
 import { observer } from 'mobx-react-lite'
 
-import { Button, type ButtonSizes } from '@hanzo/ui/primitives'
+import { Button, toast, type ButtonSizes } from '@hanzo/ui/primitives'
 import { cn } from '@hanzo/ui/util'
 
 import { Icons } from './Icons'
 import type { LineItem } from '../types'
+import { sendFBEvent, sendGAEvent } from '../util/analytics'
 
 const AddToCartWidget: React.FC<{ 
   item: LineItem
@@ -44,6 +45,33 @@ const AddToCartWidget: React.FC<{
     if (onQuantityChanged) {
       onQuantityChanged(item.sku, old, old + 1) 
     }
+    if (old === 0) {
+      toast(`Added ${item.title} to your bag.`)
+    }
+    else {
+      toast(`Changed quantity to ${old + 1} for ${item.title}.`)
+    }
+    sendGAEvent('add_to_cart', {
+      items: [{
+        item_id: item.sku,
+        item_name: item.title,
+        item_category: item.categoryId,
+        price: item.price,
+        quantity: item.quantity
+      }],
+      value: item.price,
+      currency: 'USD',
+    })
+    sendFBEvent('AddToCart', {
+      content_ids: [item.sku],
+      contents: [{
+        id: item.sku,
+        quantity: item.quantity
+      }],
+      content_name: item.title,
+      value: item.price,
+      currency: 'USD',
+    })
   }
 
   const dec = () => {
@@ -52,6 +80,23 @@ const AddToCartWidget: React.FC<{
     if (onQuantityChanged) {
       onQuantityChanged(item.sku, old, old - 1) 
     }
+    if (old === 1) {
+      toast(`Removed ${item.title} from your bag.`)
+    }
+    else {
+      toast(`Changed quantity to ${old - 1} for ${item.title}.`)
+    }
+    sendGAEvent('remove_from_cart', {
+      items: [{
+        item_id: item.sku,
+        item_name: item.title,
+        item_category: item.categoryId,
+        price: item.price,
+        quantity: item.quantity
+      }],
+      value: item.price,
+      currency: 'USD',
+    })
   }
 
   return ( item.isInCart ? (

package/components/buy-item/select-category-item-card.tsx

@@ -9,7 +9,7 @@ import type { ItemSelector, LineItem } from '../../types'
 
 import AddToCartWidget from '../add-to-cart-widget'
 import CategoryItemRadioSelector from '../category-item-radio-selector'
-import CategoryItemIOSWheelSelector from '../category-item-ios-wheel-selector'
+import CategoryItemScrollSelector from '../category-item-scroll-selector'
 import { formatPrice } from '../../util'
 
 const SelectCategoryItemCard: React.FC<React.HTMLAttributes<HTMLDivElement> & ItemSelector & {
@@ -52,13 +52,12 @@ const SelectCategoryItemCard: React.FC<React.HTMLAttributes<HTMLDivElement> & It
       )}>
         {!noTitle && (<div className={'h-[1px] bg-muted-3 ' + (mobilePicker ?  'w-pr-55' :  'w-pr-60') } /> )}
         {mobilePicker ? (
-          <CategoryItemIOSWheelSelector
+          <CategoryItemScrollSelector
             category={category}
             selectedItemRef={selItemRef}  
             selectSku={selectSku}
-            height={180}
-            itemHeight={30}
-            outerClx='w-full'
+            itemClx='h-10 border-b px-4'
+            outerClx='min-w-pr-80 h-[180px]' // 80% of 65% parent
           />
         ) : (
           <CategoryItemRadioSelector 

package/components/cart-panel/index.tsx

@@ -9,6 +9,7 @@ import { useCommerce } from '../../service/context'
 import { formatPrice } from '../../util'
 
 import CartLineItem from './cart-line-item'
+import { sendFBEvent, sendGAEvent } from '../../util/analytics'
 
 const CartPanel: React.FC<PropsWithChildren & {
   className?: string
@@ -31,6 +32,31 @@ const CartPanel: React.FC<PropsWithChildren & {
     return <div />
   }
 
+  const showCheckout = () => {
+    sendGAEvent('begin_checkout', {
+      currency: 'USD',
+      value: cmmc.cartTotal,
+      items: cmmc.cartItems.map((item) => ({
+        item_id: item.sku,
+        item_name: item.title,
+        item_category: item.categoryId,
+        price: item.price,
+        quantity: item.quantity
+      })),
+    })
+    sendFBEvent('InitiateCheckout', {
+      content_ids: cmmc.cartItems.map((item) => item.sku),
+      contents: cmmc.cartItems.map(item => ({
+        id: item.sku,
+        quantity: item.quantity
+      })),
+      num_items: cmmc.cartItems.length,
+      value: cmmc.cartTotal,
+      currency: 'USD',
+    })
+    onCheckoutOpen && onCheckoutOpen()
+  }
+
   return (
     <div className={cn('border p-4 rounded-lg', className)}>
       {children}
@@ -50,7 +76,7 @@ const CartPanel: React.FC<PropsWithChildren & {
             variant='primary' 
             rounded='lg' 
             className='mt-12 mx-auto w-full' 
-            onClick={onCheckoutOpen}
+            onClick={showCheckout}
           >
             Checkout
           </Button>

package/components/category-item-scroll-selector.tsx

@@ -0,0 +1,40 @@
+'use client'
+import React from 'react'
+import { observer } from 'mobx-react-lite'
+
+import { cn } from '@hanzo/ui/util'
+import { ScrollArea } from '@hanzo/ui/primitives'
+
+import type { ItemSelector } from '../types'
+import { formatPrice } from '../util'
+
+
+const CategoryItemScrollSelector: React.FC<ItemSelector & {
+  outerClx?: string
+  itemClx?: string
+}> = observer(({
+  category,
+  selectedItemRef: iRef,
+  selectSku,
+  outerClx='',
+  itemClx=''
+}) => {
+
+  return (
+    <ScrollArea className={cn('border border-muted-4 rounded-lg', outerClx)}>
+      {category.products.map((prod) => (
+        <div key={prod.sku} onClick={() => {selectSku(prod.sku)}}>
+          <div className={cn(
+            'h-10 border-b flex flex-col justify-center px-4',
+            (iRef.item?.sku === prod.sku) ? 'font-semibold text-accent' : 'text-muted', 
+            itemClx
+          )}>
+            {prod.titleAsOption + ', ' + formatPrice(prod.price)}
+          </div>
+        </div>
+      ))}
+    </ScrollArea>
+  )
+})
+
+export default CategoryItemScrollSelector

package/components/checkout-panel/index.tsx

@@ -10,7 +10,6 @@ import {
   AccordionTrigger,
   Dialog,
   DialogPortal,
-  Toaster
 } from '@hanzo/ui/primitives'
 import { cn } from '@hanzo/ui/util'
 import { AuthWidget } from '@hanzo/auth/components'
@@ -33,6 +32,11 @@ const CheckoutPanel: React.FC<{
 }) => {
 
   const cmmc = useCommerce()
+    
+    // For sites that don't initialize cmmc
+  if (!cmmc) {
+    return <></>
+  }
   
   const [step, setStep] = useState<number>(1)
   const [orderId, setOrderId] = useState<string>()
@@ -100,7 +104,6 @@ const CheckoutPanel: React.FC<{
             </div>
             <div className='bg-level-1 flex flex-row items-start justify-start md:overflow-y-auto'>
               <div className='h-full w-full max-w-[750px] relative flex flex-col gap-8 sm:gap-14 px-8 pb-6 pt-6 md:pt-14'>
-                <Toaster/>  
                 <AuthWidget hideLogin className='hidden md:flex absolute top-4 right-4 '/>
                 <StepIndicator steps={steps} currentStep={step} className='flex gap-2 mx-auto items-center text-xxs sm:text-base' />
                 {steps[step].element}

package/components/checkout-panel/payment/index.tsx

@@ -14,6 +14,7 @@ import PayWithBankTransfer from './pay-with-bank-transfer'
 import PayWithCard from './pay-with-card'
 import { useCommerce } from '../../../service/context'
 import type { TransactionStatus } from '../../../types'
+import { sendFBEvent, sendGAEvent } from '../../../util/analytics'
 
 const contactFormSchema = z.object({
   name: z.string().min(1, 'Enter your full name.'),
@@ -56,6 +57,26 @@ const Payment: React.FC<{
       setOrderId(id)
     }
     if (id) {
+      sendGAEvent('add_payment_info', {
+        items: cmmc.cartItems.map((item) => ({
+          item_id: item.sku,
+          item_name: item.title,
+          item_category: item.categoryId,
+          price: item.price,
+          quantity: item.quantity
+        })),
+        value: cmmc.cartTotal,
+        currency: 'USD',
+        payment_type: paymentInfo.paymentMethod ?? ''
+      })
+      sendFBEvent('AddPaymentInfo', {
+        contents: cmmc.cartItems.map(item => ({
+          id: item.sku,
+          quantity: item.quantity
+        })),
+        value: cmmc.cartTotal,
+        currency: 'USD'
+      })
       await cmmc.updateOrderPaymentInfo(id, paymentInfo)
     }
   }

package/components/checkout-panel/payment/pay-with-card.tsx

@@ -13,6 +13,7 @@ import type { TransactionStatus } from '../../../types'
 
 import PaymentMethods from './payment-methods'
 import ContactInfo from './contact-info'
+import { sendFBEvent, sendGAEvent } from '../../../util/analytics'
 
 const PayWithCard: React.FC<{
   setStep: (currentStep: number) => void
@@ -46,6 +47,28 @@ const PayWithCard: React.FC<{
         console.log(token)
         await storePaymentInfo({paymentMethod: token.details.method ?? null, processed: res})
         setTransactionStatus('confirmed')
+        sendGAEvent('purchase', {
+          transaction_id: res.payment?.id,
+          value: res.payment?.amountMoney?.amount,
+          currency: res.payment?.amountMoney?.currency,
+          items: cmmc.cartItems.map((item) => ({
+            item_id: item.sku,
+            item_name: item.title,
+            item_category: item.categoryId,
+            price: item.price,
+            quantity: item.quantity
+          })),
+        })
+        sendFBEvent('Purchase', {
+          content_ids: cmmc.cartItems.map((item) => item.sku),
+          contents: cmmc.cartItems.map(item => ({
+            id: item.sku,
+            quantity: item.quantity
+          })),
+          num_items: cmmc.cartItems.length,
+          value: cmmc.cartTotal,
+          currency: 'USD',
+        })
       } else {
         setTransactionStatus('error')
       }  

package/components/checkout-panel/payment/pay-with-crypto.tsx

@@ -19,14 +19,13 @@ import {
 } from '@hanzo/ui/primitives'
 
 import { useAuth } from '@hanzo/auth/service'
-import { Ethereum as EthIconFromAuth }  from '@hanzo/auth/icons'
 
 import Eth from '../icons/eth'
 import { useCommerce } from '../../../service/context'
 import type { TransactionStatus } from '../../../types'
 import ContactInfo from './contact-info'
 import type { UseFormReturn } from 'react-hook-form'
-import { LoginComponent } from '@hanzo/auth/components'
+import { sendFBEvent, sendGAEvent } from '../../../util/analytics'
 
 declare global {
   interface Window{
@@ -53,7 +52,7 @@ const PayWithCrypto: React.FC<{
   storePaymentInfo,
   contactForm
 }) => {
-  const c = useCommerce()
+  const cmmc = useCommerce()
   const auth = useAuth()
   const [loadingPrice, setLoadingPrice] = useState(false)
   //const [selectedToken, setSelectedToken] = useState('eth')
@@ -85,7 +84,7 @@ const PayWithCrypto: React.FC<{
         .then(res => res.json())
         .then((exchangeRate) => {
           const oneUsdInWei = (10**18) / exchangeRate.data.amount
-          const usdAmountInWei = oneUsdInWei * c.cartTotal 
+          const usdAmountInWei = oneUsdInWei * cmmc.cartTotal 
           setAmount(usdAmountInWei)
           setLoadingPrice(false)
         })
@@ -98,7 +97,7 @@ const PayWithCrypto: React.FC<{
     const interval = setInterval(fetchPrice, 30000)
 
     return () => clearInterval(interval)
-  }, [c.cartTotal])
+  }, [cmmc.cartTotal])
 
   const sendPayment = async (ether: number) => {
     contactForm.handleSubmit(async () => {
@@ -130,9 +129,10 @@ const PayWithCrypto: React.FC<{
 
         const signer = await provider.getSigner()
         ethers.getAddress(process.env.NEXT_PUBLIC_ETH_PAYMENT_ADDRESS ?? '')
+        const price = ethers.parseEther(ether.toString())
         const tx = await signer.sendTransaction({
           to: process.env.NEXT_PUBLIC_ETH_PAYMENT_ADDRESS,
-          value: ethers.parseEther(ether.toString())
+          value: price
         })
         console.log({ ether, addr: process.env.NEXT_PUBLIC_ETH_PAYMENT_ADDRESS })
         console.log('tx', tx)
@@ -150,7 +150,30 @@ const PayWithCrypto: React.FC<{
             await storePaymentInfo({
               ether,
               addr: process.env.NEXT_PUBLIC_ETH_PAYMENT_ADDRESS,
-              receipt
+              receipt,
+              paymentMethod: 'crypto'
+            })
+            sendGAEvent('purchase', {
+              transaction_id: tx.hash,
+              value: price,
+              currency: 'ETH',
+              items: cmmc.cartItems.map((item) => ({
+                item_id: item.sku,
+                item_name: item.title,
+                item_category: item.categoryId,
+                price: item.price,
+                quantity: item.quantity
+              })),
+            })
+            sendFBEvent('Purchase', {
+              content_ids: cmmc.cartItems.map((item) => item.sku),
+              contents: cmmc.cartItems.map(item => ({
+                id: item.sku,
+                quantity: item.quantity
+              })),
+              num_items: cmmc.cartItems.length,
+              value: price,
+              currency: 'ETH',
             })
             setTransactionStatus('confirmed')
           })

package/components/checkout-panel/shipping-info.tsx

@@ -21,11 +21,10 @@ import {
   SelectValue 
 } from '@hanzo/ui/primitives'
 
-import { useAuth } from '@hanzo/auth/service'
-
 import { useCommerce } from '../..'
 
 import { countries } from './countries'
+import { sendGAEvent } from '../../util/analytics'
 
 const shippingFormSchema = z.object({
   addressLine1: z.string().min(2, 'Address must be at least 2 characters.'),
@@ -43,7 +42,6 @@ const ShippingInfo: React.FC<{
   orderId,
   setStep
 }) => { 
-  const auth = useAuth()
   const cmmc = useCommerce()
   
   const shippingForm = useForm<z.infer<typeof shippingFormSchema>>({
@@ -62,6 +60,18 @@ const ShippingInfo: React.FC<{
     if (orderId) {
       await cmmc.updateOrderShippingInfo(orderId, values)
     }
+    sendGAEvent('add_shipping_info', {
+      items: cmmc.cartItems.map((item) => ({
+        item_id: item.sku,
+        item_name: item.title,
+        item_category: item.categoryId,
+        price: item.price,
+        quantity: item.quantity
+      })),
+      num_items: cmmc.cartItems.length,
+      value: cmmc.cartTotal,
+      currency: 'USD',
+    })
     setStep(3)
   }
 

package/components/facet-values-widget/facet-image.tsx

@@ -4,25 +4,25 @@ import Image from 'next/image'
 import type { FacetValueDesc } from '../../types'
 
 const ICON_SIZE = 20
-const SVG_MULT = 1.5
 
 const FacetImage: React.FC<{
   facetValueDesc: FacetValueDesc
 }> = ({
   facetValueDesc
 }) => {
+
   const {
     img,
     imgAR: ar,
     label
   } = facetValueDesc
 
-
   if (!img) {
     return null
   }
-  const isURL = typeof img === 'string'
-  if (isURL) {
+
+    // url
+  if (typeof img === 'string') {
     return (
       <Image 
         src={img as string} 
@@ -33,42 +33,8 @@ const FacetImage: React.FC<{
       />
     )
   }
-
+    // ReactNode
   return img as React.ReactNode
-
-    // Otherwise, assume it's a ReactNode of an imported SVG
-
-    // If it's not square, center it in the appropriate dimension
-    /*
-  const svgStyle: any = { position: 'relative' }
-  if (ar) {
-    if (ar < 1) {
-      const w = ICON_SIZE * SVG_MULT
-      svgStyle.top = (( 1 / ar - 1) * w) / 2
-    }
-    else if (ar > 1) {
-      const h = ICON_SIZE * SVG_MULT
-      svgStyle.left = (((1 - ar) * h) / 2)
-    }
-  }
-
-  return (
-    <span 
-      className='flex justify-center items-center overflow-hidden ' 
-      style={{
-        color: 'inherit',
-        width: ICON_SIZE * SVG_MULT, 
-        height: ICON_SIZE * SVG_MULT,
-      }} 
-    >
-      {React.cloneElement(facetValueDesc.img as React.ReactElement<any>, {
-        width: (facetValueDesc.imgAR ?? 1) * ICON_SIZE * SVG_MULT, 
-        height: SVG_MULT * ICON_SIZE,
-        style: svgStyle
-      })}
-    </span>
-  )
-  */
 } 
 
 export default FacetImage

package/components/index.ts

@@ -5,7 +5,7 @@ export { default as BuyItemCard } from './buy-item/buy-item-card'
 export { default as BuyItemPopup } from './buy-item/buy-item-popup'
 export { default as CartPanel } from './cart-panel'
 export { default as CheckoutPanel } from './checkout-panel'
-export { default as CategoryItemIOSWheelSelector } from './category-item-ios-wheel-selector'
+export { default as CategoryItemIOSWheelSelector } from './category-item-scroll-selector'
 export { default as CategoryItemRadioSelector } from './category-item-radio-selector'
 export { default as FacetValuesWidget } from './facet-values-widget'
 export { default as ProductCard } from './product-card'

package/components/select-category-item-panel.tsx

@@ -12,7 +12,7 @@ import { Icons } from './Icons'
 
 import AddToCartWidget from './add-to-cart-widget'
 import CategoryItemRadioSelector from './category-item-radio-selector'
-import CategoryItemIOSWheelSelector from './category-item-ios-wheel-selector'
+import CategoryItemScrollSelector from './category-item-scroll-selector'
 
 const SelectCategoryItemPanel: React.FC<
   React.HTMLAttributes<HTMLDivElement> & ItemSelector &   
@@ -89,14 +89,13 @@ const SelectCategoryItemPanel: React.FC<
           <div className={'h-[1px] bg-muted-3 ' + (mobilePicker ?  'w-pr-55' :  'w-pr-60') } />
         </div>
         {mobilePicker ? (
-          <CategoryItemIOSWheelSelector
+          <CategoryItemScrollSelector
             category={category}
             selectedItemRef={selectedItemRef}  
             selectSku={selectSku}
             showQuantity={showQuantity}
-            height={180}
-            itemHeight={30}
-            outerClx='mb-4'
+            itemClx='h-10 border-b px-4'
+            outerClx='mb-4 h-[180px]'
           />
         ) : (
           <CategoryItemRadioSelector 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/commerce",
-  "version": "4.4.2",
+  "version": "4.6.0",
   "description": "Library with shopping cart components.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -33,13 +33,12 @@
   "dependencies": {
     "ethers": "^6.11.1",
     "next-usequerystate": "^1.17.0",
-    "react-mobile-picker": "^1.0.0",
     "react-square-web-payments-sdk": "^3.2.1",
     "square": "^35.0.0"
   },
   "peerDependencies": {
-    "@hanzo/auth": "^2.2.1",
-    "@hanzo/ui": "^3.0.6",
+    "@hanzo/auth": "^2.3.0",
+    "@hanzo/ui": "^3.0.7",
     "@hookform/resolvers": "^3.3.4",
     "firebase": "^10.8.0",
     "lucide-react": "^0.307.0",

package/util/analytics.ts

@@ -0,0 +1,21 @@
+declare global {
+  interface Window {
+    fbq: Function;
+    gtag: Function;
+  }
+}
+
+// https://developers.facebook.com/docs/meta-pixel/reference
+const sendFBEvent = (name: string, options = {}) => {
+  window.fbq('track', name, options)
+}
+
+// https://developers.google.com/analytics/devguides/collection/ga4/ecommerce?client_type=gtag
+const sendGAEvent = (name: string, options = {}) => {
+  window.gtag('event', name, options)
+}
+
+export {
+  sendFBEvent,
+  sendGAEvent,
+}

package/components/category-item-ios-wheel-selector.tsx

@@ -1,62 +0,0 @@
-'use client'
-import React from 'react'
-import Picker from 'react-mobile-picker'
-import { observer } from 'mobx-react-lite'
-
-import type { ItemSelector } from '../types'
-import { formatPrice } from '../util'
-import { cn } from '@hanzo/ui/util'
-
-  // from source code
-interface PickerItemRenderProps {
-  selected: boolean;
-}
-
-const CategoryItemIOSWheelSelector: React.FC<ItemSelector & {
-  height?: number
-  itemHeight?: number
-  outerClx?: string
-  itemClx?: string
-}> = observer(({
-  category,
-  selectedItemRef: iRef,
-  selectSku,
-  height,
-  itemHeight,
-  outerClx='',
-  itemClx=''
-}) => {
-
-    // @ts-ignore
-  const onChange = (val, ignore) => {
-    console.log("WHEEL: ", val.item)
-    selectSku(val.item)
-  }
-
-  return (
-    <div className={cn('border border-muted-4 rounded-lg px-2', outerClx)}>
-      <Picker
-        className=''
-        value={iRef.item ? {item: iRef.item.sku} : {item: undefined}}
-        onChange={onChange}
-        wheelMode="natural"
-        height={height}
-        itemHeight={itemHeight}
-      >
-        <Picker.Column name="item">
-        {category.products.map((prod) => (
-          <Picker.Item key={prod.sku} value={prod.sku}>
-          {({ selected }: PickerItemRenderProps) => (
-            <div className={cn(selected ? 'font-semibold text-accent' : 'text-muted', itemClx)}>
-              {prod.titleAsOption + ', ' + formatPrice(prod.price)}
-            </div>
-          )}
-          </Picker.Item>
-        ))}
-        </Picker.Column>
-      </Picker>
-    </div>
-  )
-})
-
-export default CategoryItemIOSWheelSelector