@luxfi/core 5.1.5 → 5.1.6

package/components/commerce/drawer/index.tsx

@@ -0,0 +1,117 @@
+'use client'
+import React from 'react'
+import { useRouter } from 'next/navigation'
+import { observer } from 'mobx-react-lite'
+
+import { CarouselBuyCard } from '@hanzo/commerce'
+
+import { 
+  useSelectAndBuy, 
+  useCommerceDrawer, 
+  useRecentActivity 
+} from '../../../commerce/ui/context'
+
+import CommerceDrawer from './shell'
+import CheckoutButton from '../checkout-button'
+import Micro from './micro'
+
+const CommerceUIComponent: React.FC = observer(() => {
+
+  const buy = useSelectAndBuy()
+  const drawer = useCommerceDrawer()
+  const recent = useRecentActivity()
+  const router = useRouter()
+  
+
+  const handleCheckout = (): void => {
+    router.push('/checkout')
+  }
+
+    // see handleCloseGesture()
+  const setOpen = (b: boolean): void => {
+    if (!b) {
+      console.log("ON CLOSE")
+      if (!drawer.closedByUser) {
+        console.log("syncing closed state to UI gesture")
+        drawer.setClosedByUser(true)
+      }
+    }
+  }
+
+  const handleHandleClicked = (): void => {
+
+    if (drawer.state === 'full') {
+      buy.hideVariants()
+    }
+    else if (drawer.state === 'micro') {
+      if (drawer.showAdded) {
+        buy.showVariants(recent.item?.sku ?? '')
+      }
+        // checkout only
+      else {
+        drawer.setClosedByUser(true)
+      }
+    }
+  }
+
+  const handleItemClicked = () => {
+    buy.showVariants(recent.item?.sku ?? '')
+  }
+
+  const handleCloseGesture = (): boolean => {
+    if (drawer.state === 'full') {
+      buy.hideVariants()
+      return true // "handled!"
+    }
+    return false
+  }
+
+
+  return (
+    <CommerceDrawer 
+      open={drawer.open} 
+      setOpen={setOpen}
+      snapPoints={drawer.points}
+      modal={drawer.modal}
+      activeSnapPoint={drawer.activePoint}
+      setActiveSnapPoint={drawer.onActivePointChanged.bind(drawer)}
+      handleHandleClicked={handleHandleClicked}
+      handleCloseGesture={handleCloseGesture}
+      micro={drawer.state === 'micro'}
+      mobile={drawer.isMobile}
+      drawerClx='flex flex-col'
+    >
+      {drawer.state === 'full' && (
+        /* The actual drawer is larger than the visible area (due to awkward
+        vaul impl.  So we have to ask the drawer for its currect snappoint 
+        and constrain layout to that.  
+        */
+        <div style={{height: drawer.snapPointPx - 24 /* fudge factor for handle area */}}>
+          <CarouselBuyCard 
+            skuPath={buy.currentSkuPath!} 
+            checkoutButton={
+              <CheckoutButton 
+                handleCheckout={handleCheckout} 
+                className='w-full min-w-[160px] sm:max-w-[320px]'
+              />
+            }
+            onQuantityChanged={recent.quantityChanged.bind(recent)}
+            clx='justify-between h-full pb-3'
+            addBtnClx='w-full min-w-[160px] sm:max-w-[320px]' 
+            selectorClx='max-w-[475px]'
+            
+          />
+        </div>
+      )}
+      {drawer.state === 'micro' && (
+        <Micro 
+          handleCheckout={handleCheckout}
+          handleItemClicked={handleItemClicked}
+          clx='w-full sm:w-[460px] sm:mx-auto md:w-[550px]'
+        />
+      )}
+    </CommerceDrawer>
+  )
+})
+
+export default CommerceUIComponent

package/components/commerce/drawer/micro.tsx

@@ -0,0 +1,136 @@
+'use client'
+import React from 'react'
+import { observer } from 'mobx-react-lite'
+
+import { Button, Image } from '@hanzo/ui/primitives'
+import { cn,  } from '@hanzo/ui/util'
+import type { LineItem } from '@hanzo/commerce/types'
+import { useCommerce, formatCurrencyValue } from '@hanzo/commerce'
+
+import CheckoutButton from '../checkout-button'
+import { useCommerceDrawer, useRecentActivity } from '../../../commerce/ui/context'
+
+const CN = {
+    // h: mind padding!
+  mobile: { w: 36, h: 36 },
+  sm:  { w: 60, h: 36 },
+  desktop: { w: 60, h: 36 },
+}
+
+const renderTitle = (item: LineItem): React.ReactNode => {
+  const toks = item.title.split(', ')
+  if (toks.length === 2) {
+    return <><p>{toks[0]},</p><p className=''>{toks[1]}</p></>
+  }
+  return <p>{item.title}</p>
+}
+
+const Info: React.FC<{
+  item: LineItem
+  clx?: string
+}> = ({
+  item,
+  clx=''
+}) => {
+
+  const cmmc = useCommerce()
+  const family = cmmc.getFamilyById(item.familyId)
+
+  let topLine = family!.title
+  if (item.sku.startsWith('LXM-AG') || item.sku.startsWith('LXM-AU')) {
+    topLine = family!.parentTitle + ', ' + family!.title   
+  }
+
+  const optionLabel = item.optionLabelShort ?? item.optionLabel
+  const priceStr = formatCurrencyValue(item.price)
+
+  return (<>
+    <div className={cn('sm:hidden flex flex-col !text-muted items-stretch whitespace-nowrap text-ellipsis ', clx)}>
+      <p className='text-left text-xs'>{topLine}</p>
+      <div className='flex justify-between text-xxs'>
+        <div>{optionLabel}</div>
+        <div className='pl-2.5'>{priceStr}</div>
+      </div>
+    </div>
+    <div className={cn('hidden sm:flex !text-muted  flex-col items-stretch whitespace-nowrap text-ellipsis text-xs', clx)}>
+      <p className='text-left'>{topLine}</p>
+      <div className='flex justify-between'>
+        <div>{optionLabel}</div>
+        <div className='pl-2.5'>{priceStr}</div>
+      </div>
+    </div>
+  </>)
+}
+
+
+const Micro: React.FC<{
+  clx?: string
+  handleCheckout: () => void
+  handleItemClicked: () => void 
+}> = observer(({
+  clx='',
+  handleCheckout,
+  handleItemClicked 
+}) => {
+
+  const drawer = useCommerceDrawer()
+  const recent = useRecentActivity()
+
+  return (        
+    <div className={cn(
+      'px-2 sm:px-3 sm:px-0', 
+      (drawer.showAdded ? 'grid grid-cols-2 ' : 'flex justify-center items-center '),
+      'gap-2 md:gap-3 relative',
+      clx
+    )}>
+    {drawer.showAdded && (
+      <div className='pb-3 flex flex-col items-stretch'>
+        <p className='text-muted text-xxs md:text-xs leading-none pl-1'>recent item:</p>
+        <Button 
+          variant='ghost'
+          rounded='sm'
+          onClick={handleItemClicked}
+          className={cn(
+            'flex flex-row justify-between items-center gap-1',
+            '-ml-1.5',
+            'overflow-hidden ', 
+            'px-1 py-1 md:px-2 md:py-2',
+          )}
+        >
+          {recent.item?.img && (<>
+            <Image def={recent.item.img} constrainTo={CN.mobile} preload className='sm:hidden grow-0 shrink-0'/>
+            <Image def={recent.item.img} constrainTo={CN.sm} preload className='hidden sm:flex md:hidden grow-0 shrink-0'/>
+            <Image def={recent.item.img} constrainTo={CN.desktop} preload className='hidden md:flex grow-0 shrink-0'/>
+          </>)} 
+          {recent.item && (
+            <div className='grow w-full'>
+              <Info item={recent.item} clx='w-full'/>
+            </div>
+          )}
+        </Button>
+      </div>
+    )}
+    {drawer.showCheckout && (
+      <div className={cn(
+        'flex flex-col justify-center w-full', 
+        (drawer.showAdded ? 'items-stretch' : 'items-center pt-3' )
+      )}>
+        <CheckoutButton 
+          handleCheckout={handleCheckout} 
+          variant='primary' 
+          size={drawer.isMobile ? 'default' : 'lg'}
+          rounded={drawer.isMobile ? 'md' : 'lg'}
+          centerText={drawer.isMobile ? !drawer.showAdded : true}
+          className={cn(drawer.isMobile ? 
+            (drawer.showAdded ? 'pl-3.5 pr-2.5' : 'min-w-[320px]')
+            :
+            (drawer.showAdded ? '' : 'w-[320px]')
+          )} 
+        />
+      </div>
+    )}
+    </div>
+  )
+})
+
+export default Micro

package/components/commerce/drawer/shell.tsx

@@ -0,0 +1,79 @@
+'use client'
+import React, {type PropsWithChildren } from 'react'
+
+import { X as LucideX} from 'lucide-react'
+
+import { 
+  Button, 
+  Drawer, 
+  DrawerContent, 
+  DrawerHandle,
+  type DrawerProps,
+} from '@hanzo/ui/primitives'
+import { cn } from '@hanzo/ui/util'
+
+import '../../../style/drawer-handle-overrides.css'
+
+const CommerceDrawer: React.FC<PropsWithChildren & 
+  Omit<DrawerProps, 'onOpenChange'> & 
+  {
+    setOpen: (b: boolean) => void
+    handleHandleClicked: () => void
+    drawerClx?: string
+    mobile?: boolean
+    micro?: boolean
+  }
+> = ({
+  children,
+  open,
+  setOpen,
+  modal,
+  snapPoints,
+  setActiveSnapPoint,
+  activeSnapPoint,
+  handleHandleClicked,
+  drawerClx='',
+  mobile=false,
+  micro=false,
+  ...rest
+}) => (
+    // @ts-ignore
+  <Drawer 
+    open={open} 
+    onOpenChange={setOpen} 
+    modal={modal} 
+    snapPoints={snapPoints}
+    setActiveSnapPoint={setActiveSnapPoint}
+    activeSnapPoint={activeSnapPoint}
+    fastDragSkipsToEnd={false}
+    dragHandleOnly={true}
+    handleHandleClicked={handleHandleClicked}
+//    debugOutput
+    {...rest}
+  >
+    <DrawerContent 
+      defaultHandle={false} 
+      className={cn(
+        (modal  ? 'rounded-t-xl border-muted-2' : 'rounded-t-md border-muted-4' ),
+        (micro ? (mobile ? 'mt-4 pt-1.5' : 'mt-5 pt-4') : 'mt-5 pt-5'),
+        'w-full h-full'
+      )}
+       // https://github.com/radix-ui/primitives/discussions/935
+      onOpenAutoFocus={(e) => {e.preventDefault()}}
+    >
+      <DrawerHandle 
+        className={cn(
+          'absolute left-0 right-0 mx-auto z-10',
+          'bg-level-3 hover:bg-level-2',
+          !mobile ? 'cursor-grab active:cursor-grabbing' : 'touch-pan-y',
+          (micro ? (mobile ? 'top-1 w-[85px] h-2 rounded-[2px]' : 'top-2 w-[85px] h-3 rounded-[2px]') : 'top-2 w-[100px] h-3 rounded-full'),
+          '[&>[vaul-handle-hitarea]]:hidden',
+          //(!micro ? 'bg-level-3 hover:bg-level-2 ' : 'bg-level-1 hover:bg-level-2 ')
+        )} 
+      />
+      {children}
+    </DrawerContent>
+  </Drawer>
+)
+
+export default CommerceDrawer

package/components/commerce/mobile-bag-drawer.tsx

@@ -1,51 +1,51 @@
-'use client'
-import React from 'react'
-
-import { Drawer, DrawerContent} from '@hanzo/ui/primitives'
-import { cn } from '@hanzo/ui/util'
-import { CartPanel } from '@hanzo/commerce'
-
-import BagButton from './bag-button'
-
-const MobileBagDrawer: React.FC<{
-  open: boolean,
-  setOpen: (b: boolean) => void
-  handleCheckout: () => void
-  className?: string
-}> = ({
-  open,
-  setOpen,
-  handleCheckout,
-  className='',
-}) => {
-  
-  return (
-    <Drawer open={open} onOpenChange={setOpen}>
-      <DrawerContent className={cn('rounded-t-xl mt-6 pb-12 h-auto', className)} >
-        <CartPanel 
-          handleCheckout={handleCheckout} 
-          className='mt-4 mb-4 border-none py-0 px-4 w-full '
-          listClx='rounded-sm pr-3'
-          scrollAfter={5}
-          itemClx='mt-2'
-          totalClx='sticky px-1 pr-2 border rounded-sm -bottom-[1px] bg-background'
-          buttonClx='max-w-[220px] flex-none'
-        >
-          <div className='flex flex-row items-center flex-none justify-center '>
-            <BagButton 
-              animateOnHover={false} 
-              showIfEmpty 
-              className=
-              'mr-2 relative w-6 h-7'
-              iconClx='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>
-      </DrawerContent>
-    </Drawer>
-  )
-}
-
-export default MobileBagDrawer
+'use client'
+import React from 'react'
+
+import { Drawer, DrawerContent} from '@hanzo/ui/primitives'
+import { cn } from '@hanzo/ui/util'
+import { CartPanel } from '@hanzo/commerce'
+
+import BagButton from './bag-button'
+
+const MobileBagDrawer: React.FC<{
+  open: boolean,
+  setOpen: (b: boolean) => void
+  handleCheckout: () => void
+  className?: string
+}> = ({
+  open,
+  setOpen,
+  handleCheckout,
+  className='',
+}) => {
+  
+  return (
+    <Drawer open={open} onOpenChange={setOpen}>
+      <DrawerContent className={cn('rounded-t-xl mt-6 pb-12 h-auto', className)} >
+        <CartPanel 
+          handleCheckout={handleCheckout} 
+          className='mt-4 mb-4 border-none py-0 px-4 w-full '
+          listClx='rounded-sm pr-3'
+          scrollAfter={5}
+          itemClx='mt-2'
+          totalClx='sticky px-1 pr-2 border rounded-sm -bottom-[1px] bg-background'
+          buttonClx='max-w-[220px] flex-none'
+        >
+          <div className='flex flex-row items-center flex-none justify-center '>
+            <BagButton 
+              animateOnHover={false} 
+              showIfEmpty 
+              className=
+              'mr-2 relative w-6 h-7'
+              iconClx='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>
+      </DrawerContent>
+    </Drawer>
+  )
+}
+
+export default MobileBagDrawer

package/components/commerce/mobile-login-button.tsx

@@ -1,101 +1,101 @@
-'use client'
-import React from "react"
-import { observer } from "mobx-react-lite"
-
-import {
-    Button,
-    LinkElement,
-    Popover,
-    PopoverContent,
-    PopoverTrigger,
-    Separator
-} from '@hanzo/ui/primitives'
-
-import type { LinkDef } from '@hanzo/ui/types'
-import { cn } from '@hanzo/ui/util'
-
-import { useAuth } from "@hanzo/auth/service"
-
-import { Avatar } from "../icons"
-import { Ethereum } from "@hanzo/auth/icons"
-import { Icons } from ".."
-
-const MobileAuthWidget: React.FC<{
-    noLogin?: boolean
-    className?: string
-    handleLogin?: () => void
-}> = observer(({
-    noLogin = false,
-    handleLogin,
-    className
-}) => {
-    const auth = useAuth()
-
-    if (!auth) {
-        return null
-    }
-    if (!auth.loggedIn && typeof window !== 'undefined') {
-        return (noLogin ? null : (
-            (handleLogin) ? (
-                <div className="flex items-center py-3 px-5 gap-4">
-                    <Icons.Avatar className='self-center w-6 h-6' />
-                    <Button
-                        variant='link'
-                        className='text-2xl !min-w-0 self-center'
-                        onClick={handleLogin}
-                    >
-                        Log In / Sign Up
-                    </Button>
-                </div>
-            ) : (
-                <LinkElement
-                    def={{
-                        href: `${process.env.NEXT_PUBLIC_LOGIN_SITE_URL}?redirectUrl=${window.location.href}`,
-                        title: 'Login',
-                        variant: 'primary',
-                        newTab: false
-                    } satisfies LinkDef}
-                    className='h-8 w-fit !min-w-0'
-                />
-            )
-        ))
-    }
-
-    return (
-        <Popover>
-            <PopoverTrigger asChild>
-                <Button
-                    variant="outline"
-                    size='icon'
-                    className={cn('rounded-full text-muted border-2 border-muted bg-level-1 hover:bg-level-2 hover:border-foreground hover:text-foreground uppercase w-8 h-8', className)}
-                >{auth.user?.email[0]}</Button>
-            </PopoverTrigger>
-            <PopoverContent className='bg-level-0'>
-                <div className="grid gap-4">
-                    <div className="space-y-2 truncate">
-                        {auth.user?.displayName ? (
-                            <>
-                                <h4 className="font-medium leading-none truncate">{auth.user.displayName}</h4>
-                                <p className="text-sm opacity-50 truncate">{auth.user.email}</p>
-                            </>
-                        ) : (
-                            <h4 className="font-medium leading-none truncate">{auth.user?.email}</h4>
-                        )}
-                        {auth.user?.walletAddress ? (
-                            <p className="text-sm opacity-50 truncate">{auth.user.walletAddress}</p>
-                        ) : (
-                            <Button variant="outline" className='w-full flex items-center gap-2' onClick={auth.associateWallet.bind(auth)}>
-                                <Ethereum height={20} />Connect your wallet
-                            </Button>
-                        )}
-                    </div>
-                    <Separator />
-                    <Button variant="outline" onClick={auth.logout.bind(auth)}>Logout</Button>
-                </div>
-            </PopoverContent>
-        </Popover>
-    )
-
-})
-
+'use client'
+import React from "react"
+import { observer } from "mobx-react-lite"
+
+import {
+    Button,
+    LinkElement,
+    Popover,
+    PopoverContent,
+    PopoverTrigger,
+    Separator
+} from '@hanzo/ui/primitives'
+
+import type { LinkDef } from '@hanzo/ui/types'
+import { cn } from '@hanzo/ui/util'
+
+import { useAuth } from "@hanzo/auth/service"
+
+import { Avatar } from "../icons"
+import { Ethereum } from "@hanzo/auth/icons"
+import { Icons } from ".."
+
+const MobileAuthWidget: React.FC<{
+    noLogin?: boolean
+    className?: string
+    handleLogin?: () => void
+}> = observer(({
+    noLogin = false,
+    handleLogin,
+    className
+}) => {
+    const auth = useAuth()
+
+    if (!auth) {
+        return null
+    }
+    if (!auth.loggedIn && typeof window !== 'undefined') {
+        return (noLogin ? null : (
+            (handleLogin) ? (
+                <div className="flex items-center py-3 px-5 gap-4">
+                    <Icons.Avatar className='self-center w-6 h-6' />
+                    <Button
+                        variant='link'
+                        className='text-2xl !min-w-0 self-center'
+                        onClick={handleLogin}
+                    >
+                        Log In / Sign Up
+                    </Button>
+                </div>
+            ) : (
+                <LinkElement
+                    def={{
+                        href: `${process.env.NEXT_PUBLIC_LOGIN_SITE_URL}?redirectUrl=${window.location.href}`,
+                        title: 'Login',
+                        variant: 'primary',
+                        newTab: false
+                    } satisfies LinkDef}
+                    className='h-8 w-fit !min-w-0'
+                />
+            )
+        ))
+    }
+
+    return (
+        <Popover>
+            <PopoverTrigger asChild>
+                <Button
+                    variant="outline"
+                    size='icon'
+                    className={cn('rounded-full text-muted border-2 border-muted bg-level-1 hover:bg-level-2 hover:border-foreground hover:text-foreground uppercase w-8 h-8', className)}
+                >{auth.user?.email[0]}</Button>
+            </PopoverTrigger>
+            <PopoverContent className='bg-level-0'>
+                <div className="grid gap-4">
+                    <div className="space-y-2 truncate">
+                        {auth.user?.displayName ? (
+                            <>
+                                <h4 className="font-medium leading-none truncate">{auth.user.displayName}</h4>
+                                <p className="text-sm opacity-50 truncate">{auth.user.email}</p>
+                            </>
+                        ) : (
+                            <h4 className="font-medium leading-none truncate">{auth.user?.email}</h4>
+                        )}
+                        {auth.user?.walletAddress ? (
+                            <p className="text-sm opacity-50 truncate">{auth.user.walletAddress}</p>
+                        ) : (
+                            <Button variant="outline" className='w-full flex items-center gap-2' onClick={auth.associateWallet.bind(auth)}>
+                                <Ethereum height={20} />Connect your wallet
+                            </Button>
+                        )}
+                    </div>
+                    <Separator />
+                    <Button variant="outline" onClick={auth.logout.bind(auth)}>Logout</Button>
+                </div>
+            </PopoverContent>
+        </Popover>
+    )
+
+})
+
 export default MobileAuthWidget