@luxfi/core 5.1.5 → 5.1.7

package/components/commerce/checkout-widget/index.tsx

@@ -1,86 +1,192 @@
-'use client'
-import React from 'react'
-import { createPortal } from 'react-dom'
-import { usePathname, useRouter } from 'next/navigation'
-import { observer } from 'mobx-react-lite'
-
-import { cn } from '@hanzo/ui/util'
-import { Image } from '@hanzo/ui/primitives'
-
-import { useCommerceUI } from '@hanzo/commerce'
-
-import CheckoutButton from '../checkout-button'
-import useAnimationClxSet from './use-anim-clx-set'
-import useLaggingItemRef from './use-lagging-item-ref'
-import CONST from './const'
-
-const CheckoutWidget: React.FC<{
-  clx?: string
-}> = observer(({
-  clx=''
-}) => {
-
-  const router = useRouter()
-
-  const isCheckout = usePathname() === '/checkout'
-  const clxSet = useAnimationClxSet(isCheckout)
-
-  const itemRef = useCommerceUI()
-  const laggingRef = useLaggingItemRef(itemRef, CONST.animDurationMs)
-
-  const handleCheckout = () => { router.push('/checkout')}
-
-  return globalThis?.document?.body && createPortal(
-    (<div 
-      className={cn(
-        'min-w-[160px] sm:max-w-[320px] w-[calc(100%-72px)] ml-2 !h-10',
-        'z-below-modal-2 fixed bottom-[20px] left-0 right-0',
-        'rounded-lg bg-background',
-        'flex',
-        itemRef.item ? 'gap-2' : '',
-        clxSet.asArray.join(' ')
-      )}
-      style={laggingRef.item ? {} : CONST.shadowStyle}
-    >
-      <div 
-        className={cn(
-          'flex flex-row justify-between items-center', 
-          itemRef.item ? CONST.compWidthClx.itemInfo : 'w-0',
-          laggingRef.item ? 'px-3 border rounded-lg border-muted-3' : '' 
-        )}
-        style={{
-          transitionProperty: 'width',
-          transitionTimingFunction: CONST.animTimingFn,
-          transitionDuration: `${CONST.animDurationMs}ms`
-        }}
-      >
-        {laggingRef.item?.img ? (
-          <Image def={laggingRef.item.img} constrainTo={CONST.itemImgConstraint} preload className='grow-0 shrink-0'/>
-        ) : ( // placeholder so things align
-          <div style={{height: CONST.itemImgConstraint.h, width: CONST.itemImgConstraint.w}} className='bg-level-3 grow-0 shrink-0'/>
-        )}
-
-        <div className='text-muted grow ml-1'>
-          {laggingRef.item && (<>
-            <p className='whitespace-nowrap text-sm'>{laggingRef.item.title}</p>
-            <p className='whitespace-nowrap text-xxs' >recently added...</p>
-          </>)}
-        </div>
-      </div>
-      <CheckoutButton 
-        handleCheckout={handleCheckout} 
-        centerText={!!!itemRef.item}
-        variant='primary' rounded='lg' 
-        className={cn(itemRef.item ? CONST.compWidthClx.checkout : 'w-full')} 
-        style={{
-          transitionProperty: 'width',
-          transitionTimingFunction: CONST.animTimingFn,
-          transitionDuration: `${CONST.animDurationMs}ms`
-        }}
-      />        
-    </div>),
-    globalThis?.document?.body
-  )
-})
-
-export default CheckoutWidget
+'use client'
+import React, { useRef } from 'react'
+import { createPortal } from 'react-dom'
+import { usePathname, useRouter } from 'next/navigation'
+import { observer } from 'mobx-react-lite'
+
+import { cn } from '@hanzo/ui/util'
+import { useStepAnimation } from '@hanzo/ui/util-client'
+
+import { Image } from '@hanzo/ui/primitives'
+
+import { useCommerceDrawer, useRecentActivity } from '../../../commerce/ui/context'
+
+import CheckoutButton from '../checkout-button'
+import useAnimationClxSet from './use-anim-clx-set'
+import CONST from './const'
+import type { LineItem } from '@hanzo/commerce/types'
+
+const transStyle = (t: { transition: string, from : string, to: string } | undefined) : any => (
+  t ? {
+    transitionProperty: t.transition,
+    transitionTimingFunction: CONST.animTimingFn,
+    transitionDuration: `${CONST.animDurationMs}ms`
+  } : {}        
+)
+
+const transClx = (on: boolean, t: { transition: string, from : string, to: string } | undefined) : string => (
+  on ? (t?.from ?? '') : (t?.to ?? '')
+)
+
+const VARS: any = {
+  BR: {
+    pos: 'bottom-[24px] right-[66px]',
+    width: 'w-initial', 
+    centerText: false,
+    coClx: 'w-auto',
+    infoClx: 'w-auto',
+    activeItemAnim: {
+      co: { 
+        transition: 'none',
+        from : 'px-3 gap-2.5', 
+        to: ''
+      },
+      coText: {
+        transition: 'max-width',
+        from : 'max-w-[100px]', 
+        to: 'max-w-[0px]'
+      },
+      info: { 
+        transition: 'transform, opacity',
+        from : 'scale-x-100 opacity-100 origin-right', 
+        to: 'scale-x-0 opacity-0 origin-right'
+      }
+    },
+    showArrow: true
+  },
+  TR: {
+    pos: 'top-[48px] md:top-[80px] right-[28px]',
+    width: 'w-initial', 
+    centerText: false,
+    showQuantity: false,
+    showArrow: true,
+    coClx: 'w-auto px-3 gap-1',
+    infoClx: 'w-auto',
+    activeItemAnim: {
+      co: { 
+        transition: 'none',
+        from : 'px-3 gap-2.5', 
+        to: ''
+      },
+      coText: {
+        transition: 'max-width',
+        from : 'max-w-[100px]', 
+        to: 'max-w-[0px]'
+      },
+      info: { 
+        transition: 'transform',
+        from : 'scale-x-100 origin-right', 
+        to: 'scale-x-0 origin-right'
+      }
+    },
+  },
+  TRIO: {
+    pos: 'top-[48px] md:top-[70px] right-[28px]',
+    centerText: false,
+    showQuantity: true,
+    showArrow: true,
+    width: 'w-initial', 
+    coClx: 'hidden',
+    infoClx: 'w-auto',
+    activeItemAnim: {
+      info: { 
+        transition: 'transform, opacity',
+        from : 'scale-x-100 opacity-100', 
+        to: 'scale-x-50 opacity-0'
+      }
+    },
+  }
+}
+
+const v = 'TR'
+
+const CheckoutWidget: React.FC<{
+  clx?: string
+}> = observer(({
+  clx=''
+}) => {
+
+  const router = useRouter()
+
+  const isCheckout = usePathname() === '/checkout'
+  const clxSet = useAnimationClxSet(isCheckout)
+
+  const recentActivity = useRecentActivity()
+
+    // for rendering content after recentActivity.item() would return false
+  const persistentRef = useRef<LineItem | undefined>(undefined)
+
+    // Doing double duty of being initial step fn for StepAnimation,
+    // and also capturing the item for persistentRef :)
+  const initialStepFn = (): boolean => {
+    if (!!recentActivity.item && !persistentRef.current) {
+      persistentRef.current = recentActivity.item
+    }  
+    return !!recentActivity.item
+  }
+  const steps = useStepAnimation(initialStepFn, [CONST.animDurationMs, CONST.animDurationMs, CONST.animDurationMs])
+
+  const handleCheckout = () => { router.push('/checkout')}
+
+  return globalThis?.document?.body && createPortal(
+    (<div 
+      className={cn(
+        VARS[v].width,
+        'z-below-modal-2 fixed ',
+        VARS[v].pos,
+        'rounded-lg',
+        'flex',
+        steps.notPast(0) ? 'bg-background' : '',
+        steps.notPast(1) ? 'gap-2' : '',
+        clxSet.asArray.join(' ')
+      )}
+      style={steps.notPast(1) ? {} : VARS[v].coClx?.includes('hidden') ? {} : CONST.shadowStyle}
+    >
+      <div 
+        className={cn(
+          'flex flex-row justify-between items-center', 
+          transClx(steps.notPast(0), VARS[v].activeItemAnim.info),
+          VARS[v].itemClx, 
+          steps.notPast(1) ? 'px-3 border rounded-lg bg-level-1 border-muted-3' : '' 
+        )}
+        style={transStyle(VARS[v].activeItemAnim.info)}
+      >
+        {steps.notPast(1) && persistentRef.current?.img && (
+          <Image def={persistentRef.current.img} constrainTo={CONST.itemImgConstraint} preload className='grow-0 shrink-0'/>
+        )} 
+        {steps.notPast(1) && persistentRef.current && (<div className='text-foreground grow ml-1'>
+          <p className='whitespace-nowrap text-ellipsis text-sm'>{persistentRef.current.title}</p>
+          <p className='whitespace-nowrap text-clip text-xxs' >recently added...</p>
+        </div>)}
+      </div>
+      <CheckoutButton 
+        handleCheckout={handleCheckout} 
+        centerText={VARS[v].centerText ?? !steps.notPast(0)}
+        variant='primary' 
+        rounded='lg' 
+        showQuantity={VARS[v].showQuantity ?? true}
+        showArrow={VARS[v].showArrow ?? true}
+        className={cn(
+            // for setting and unsetting 'gap'
+          transClx((VARS[v].activeItemAnim.coText ? steps.notPast(3) : true), VARS[v].activeItemAnim.co),
+          VARS[v].coClx
+        )} 
+        style={transStyle(VARS[v].activeItemAnim.co)}
+      >
+        <div 
+          className={cn(
+            'overflow-hidden',
+            'flex justify-center items-center',
+            transClx(steps.notPast(2), VARS[v].activeItemAnim.coText),
+          )} 
+          style={transStyle(VARS[v].activeItemAnim.coText)}
+        >
+          Checkout
+        </div>
+      </CheckoutButton>
+    </div>),
+    globalThis?.document?.body
+  )
+})
+
+export default CheckoutWidget

package/components/commerce/checkout-widget/obs-string-set.ts

@@ -1,48 +1,48 @@
-import { 
-  action, 
-  computed, 
-  makeObservable, 
-  observable 
-} from 'mobx'
-
-class ObsStringSet {
-
-  private _set = observable.set(new Set<string>())
-
-  constructor(initial: string[] = []) {
-    initial.forEach((el)  => {this._set.add(el)})
-    makeObservable(this, {
-      add: action,
-      remove: action,   
-      asArray: computed
-    })
-  }  
-
-  add = (v: string | string[]): void => {
-    if (Array.isArray(v)) {
-      v.forEach((el)  => {this._set.add(el)})
-    }
-    else {
-      this._set.add(v) 
-    }
-  }
-
-  remove = (v: string | string[]): void => {
-    if (Array.isArray(v)) {
-      v.forEach((el)  => {this._set.delete(el)})
-    }
-    else {
-      this._set.delete(v) 
-    }
-  }
-
-  has = (v: string): boolean => (
-    this._set.has(v)
-  )
-
-  get asArray() {
-    return Array.from(this._set)
-  }
-}
-
-export default ObsStringSet
+import { 
+  action, 
+  computed, 
+  makeObservable, 
+  observable 
+} from 'mobx'
+
+class ObsStringSet {
+
+  private _set = observable.set(new Set<string>())
+
+  constructor(initial: string[] = []) {
+    initial.forEach((el)  => {this._set.add(el)})
+    makeObservable(this, {
+      add: action,
+      remove: action,   
+      asArray: computed
+    })
+  }  
+
+  add = (v: string | string[]): void => {
+    if (Array.isArray(v)) {
+      v.forEach((el)  => {this._set.add(el)})
+    }
+    else {
+      this._set.add(v) 
+    }
+  }
+
+  remove = (v: string | string[]): void => {
+    if (Array.isArray(v)) {
+      v.forEach((el)  => {this._set.delete(el)})
+    }
+    else {
+      this._set.delete(v) 
+    }
+  }
+
+  has = (v: string): boolean => (
+    this._set.has(v)
+  )
+
+  get asArray() {
+    return Array.from(this._set)
+  }
+}
+
+export default ObsStringSet

package/components/commerce/checkout-widget/use-anim-clx-set.ts

@@ -1,57 +1,59 @@
-import { useEffect, useRef } from 'react'
-import { reaction, runInAction} from 'mobx'
-
-import ObsStringSet from './obs-string-set'
-import { useCommerce, useCommerceUI } from '@hanzo/commerce'
-
-export default (isCheckout: boolean): ObsStringSet => {
-
-  const ui = useCommerceUI()
-  const cmmc = useCommerce()
-
-  const clxSetRef = useRef<ObsStringSet>(new ObsStringSet(
-    (cmmc.cartEmpty || ui.buyOptionsSkuPath || isCheckout) ? ['hidden'] : []
-  ))
-
-  useEffect(() => (
-    reaction(
-      () => ({
-        microOpen: !(cmmc.cartEmpty || !!ui.buyOptionsSkuPath || isCheckout),
-        buyOpen: !!ui.buyOptionsSkuPath
-      }),
-      (val, prev) => {
-
-        runInAction(() => {
-          if (!val.microOpen && prev.microOpen) {
-            clxSetRef.current.add('checkout-widget-disappears')   
-          }
-          else if (val.microOpen && !prev.microOpen) {
-            clxSetRef.current.remove('hidden')   
-            clxSetRef.current.add('checkout-widget-appears')   
-          }
-          if (!val.buyOpen && prev.buyOpen) {
-            clxSetRef.current.add('checkout-widget-appears-after-buy-drawer-closes')   
-          }
-          else {
-            clxSetRef.current.remove('checkout-widget-appears-after-buy-drawer-closes')   
-          }
-        })
-
-        setTimeout(() => {runInAction(() => {
-          clxSetRef.current.remove(['checkout-widget-appears', 'checkout-widget-appears-after-buy-drawer-closes'])   
-          if (clxSetRef.current.has('checkout-widget-disappears') ) {
-            clxSetRef.current.remove('checkout-widget-disappears')   
-            clxSetRef.current.add('hidden')   
-          }
-        })}, 800)
-      },
-      {equals: (val, prev) => (
-        val.microOpen === prev.microOpen 
-        && 
-        val.buyOpen === prev.buyOpen
-      )}
-    )
-  ), [isCheckout])
-
-  return clxSetRef.current
+import { useEffect, useRef } from 'react'
+import { reaction, runInAction} from 'mobx'
+
+import { useCommerce } from '@hanzo/commerce'
+
+import ObsStringSet from './obs-string-set'
+import { useSelectAndBuy } from '../../../commerce/ui/context'
+
+export default (isCheckout: boolean): ObsStringSet => {
+
+  const ui = useSelectAndBuy()
+  const cmmc = useCommerce()
+
+  const clxSetRef = useRef<ObsStringSet>(new ObsStringSet(
+    (cmmc.cartEmpty || ui.currentSkuPath || isCheckout) ? ['hidden'] : []
+  ))
+
+  useEffect(() => (
+    reaction(
+      () => ({
+        microOpen: !(cmmc.cartEmpty || !!ui.currentSkuPath || isCheckout),
+        buyOpen: !!ui.currentSkuPath
+      }),
+      (val, prev) => {
+
+        runInAction(() => {
+          if (!val.microOpen && prev.microOpen) {
+            clxSetRef.current.add('checkout-widget-disappears')   
+          }
+          else if (val.microOpen && !prev.microOpen) {
+            clxSetRef.current.remove('hidden')   
+            clxSetRef.current.add('checkout-widget-appears')   
+          }
+          if (!val.buyOpen && prev.buyOpen) {
+            clxSetRef.current.add('checkout-widget-appears-after-buy-drawer-closes')   
+          }
+          else {
+            clxSetRef.current.remove('checkout-widget-appears-after-buy-drawer-closes')   
+          }
+        })
+
+        setTimeout(() => {runInAction(() => {
+          clxSetRef.current.remove(['checkout-widget-appears', 'checkout-widget-appears-after-buy-drawer-closes'])   
+          if (clxSetRef.current.has('checkout-widget-disappears') ) {
+            clxSetRef.current.remove('checkout-widget-disappears')   
+            clxSetRef.current.add('hidden')   
+          }
+        })}, 800)
+      },
+      {equals: (val, prev) => (
+        val.microOpen === prev.microOpen 
+        && 
+        val.buyOpen === prev.buyOpen
+      )}
+    )
+  ), [isCheckout])
+
+  return clxSetRef.current
 }

package/components/commerce/desktop-bag-popup.tsx

@@ -1,78 +1,78 @@
-'use client'
-import React, { useState, useEffect } from 'react'
-import { useRouter } from 'next/navigation'
-
-import { X } from 'lucide-react'
-
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-  PopoverClose,
-} from "@hanzo/ui/primitives"
-
-import { cn } from '@hanzo/ui/util'
-import { CartPanel, useCommerce } from '@hanzo/commerce'
-
-import * as Icons from '../icons'
-import sendGAEvent from '../../next/analytics/google-analytics'
-
-const DesktopBagPopup: React.FC<{
-  triggerClx?: string  
-  popupClx?: string
-  trigger: React.ReactNode
-}> = ({
-  triggerClx='',
-  popupClx='',
-  trigger
-}) => {
-  const cmmc = useCommerce()
-
-  const [bagOpen, setBagOpen] = useState<boolean>(false)
-  const router = useRouter()
-
-  useEffect(() => {
-    if (bagOpen) {
-      sendGAEvent('view_cart', {
-        items: cmmc.cartItems.map((item) => ({
-          item_id: item.sku,
-          item_name: item.title,
-          item_category: item.familyId,
-          price: item.price,
-          quantity: item.quantity
-        })),
-        value: cmmc.cartTotal,
-        currency: 'USD',
-      })
-    }
-  }, [bagOpen])
-
-  return (
-    <Popover open={bagOpen} onOpenChange={setBagOpen}>
-      <PopoverTrigger className={triggerClx}>
-        {trigger}
-      </PopoverTrigger>
-      <PopoverContent sideOffset={28} className={cn('relative  flex flex-col p-0 px-4 pb-4 pt-2', popupClx)}>
-        <PopoverClose className='absolute z-above-content right-2 top-2 self-end hover:bg-level-3 text-muted hover:text-accent p-1 rounded-full'><X className='w-5 h-5'/></PopoverClose>
-        <CartPanel 
-          handleCheckout={() => {router.push('/checkout')}} 
-          className='mt-4 mb-4 border-none py-0 px-4'
-          listClx='rounded-sm pr-3'
-          scrollAfter={5}
-          scrollHeightClx='h-[70vh]'
-          itemClx='mt-3'
-          totalClx='sticky px-1 pr-2 -bottom-[1px] bg-level-1'
-          buttonClx='max-w-[220px] flex-none'
-        >
-          <div className='flex flex-row items-center flex-none justify-center '>
-            <Icons.bag  className='mr-2 relative w-6 h-7 fill-foreground ' />
-            <p className='font-heading text-foreground text-default'>Your Bag</p>
-          </div>
-          <div className='h-[1px] w-pr-80 bg-muted-3 mx-auto mt-1.5 flex-none'/>
-        </CartPanel>
-      </PopoverContent>
-    </Popover>
-  )
-}
-
-export default DesktopBagPopup
+'use client'
+import React, { useState, useEffect } from 'react'
+import { useRouter } from 'next/navigation'
+
+import { X } from 'lucide-react'
+
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+  PopoverClose,
+} from "@hanzo/ui/primitives"
+
+import { cn } from '@hanzo/ui/util'
+import { CartPanel, useCommerce } from '@hanzo/commerce'
+
+import * as Icons from '../icons'
+import sendGAEvent from '../../next/analytics/google-analytics'
+
+const DesktopBagPopup: React.FC<{
+  triggerClx?: string  
+  popupClx?: string
+  trigger: React.ReactNode
+}> = ({
+  triggerClx='',
+  popupClx='',
+  trigger
+}) => {
+  const cmmc = useCommerce()
+
+  const [bagOpen, setBagOpen] = useState<boolean>(false)
+  const router = useRouter()
+
+  useEffect(() => {
+    if (bagOpen) {
+      sendGAEvent('view_cart', {
+        items: cmmc.cartItems.map((item) => ({
+          item_id: item.sku,
+          item_name: item.title,
+          item_category: item.familyId,
+          price: item.price,
+          quantity: item.quantity
+        })),
+        value: cmmc.cartTotal,
+        currency: 'USD',
+      })
+    }
+  }, [bagOpen])
+
+  return (
+    <Popover open={bagOpen} onOpenChange={setBagOpen}>
+      <PopoverTrigger className={triggerClx}>
+        {trigger}
+      </PopoverTrigger>
+      <PopoverContent sideOffset={28} className={cn('relative  flex flex-col p-0 px-4 pb-4 pt-2', popupClx)}>
+        <PopoverClose className='absolute z-above-content right-2 top-2 self-end hover:bg-level-3 text-muted hover:text-accent p-1 rounded-full'><X className='w-5 h-5'/></PopoverClose>
+        <CartPanel 
+          handleCheckout={() => {router.push('/checkout')}} 
+          className='mt-4 mb-4 border-none py-0 px-4'
+          listClx='rounded-sm pr-3'
+          scrollAfter={5}
+          scrollHeightClx='h-[70vh]'
+          itemClx='mt-3'
+          totalClx='sticky px-1 pr-2 -bottom-[1px] bg-level-1'
+          buttonClx='max-w-[220px] flex-none'
+        >
+          <div className='flex flex-row items-center flex-none justify-center '>
+            <Icons.bag  className='mr-2 relative w-6 h-7 fill-foreground ' />
+            <p className='font-heading text-foreground text-default'>Your Bag</p>
+          </div>
+          <div className='h-[1px] w-pr-80 bg-muted-3 mx-auto mt-1.5 flex-none'/>
+        </CartPanel>
+      </PopoverContent>
+    </Popover>
+  )
+}
+
+export default DesktopBagPopup