@hanzo/commerce 1.0.8 → 1.0.10

package/components/index.ts

@@ -2,10 +2,7 @@ export { default as AddToCartWidget } from './add-to-cart-widget'
 export { default as Cart } from './cart'
 export { default as CartLineItem } from './cart-line-item'
 export { default as FacetsWidget } from './facets-widget'
-export { default as FacetTogglesWidget,
-  type FacetMutatorSingle, 
-  type FacetMutatorMultiple
-} from './facet-toggles-widget'
+export { default as FacetTogglesWidget } from './facet-toggles-widget'
 export { default as ProductCard } from './product-card'
 export { default as ProductSelectionMobilePicker } from './product-selection-mobile-picker'
 export { default as ProductSelectionRadioGroup } from './product-selection-radio-group'

package/components/select-category-and-item-widget.tsx

@@ -44,19 +44,19 @@ const SelectCategoryAndItemWidget: React.FC<{
     comm.setFacets(facets)
   }
 
-  const currentFacetToken = computed((): string | null => {
+  const currentFacetToken = (): string | null => {
     if (comm.specifiedCategories.length === 0) return null
     const skuPath = comm.specifiedCategories[0].id
     const skuPathTokens = skuPath.split('-')
     return skuPathTokens.length > 0 ? skuPathTokens[skuPathTokens.length - 1] : null
-  })
+  }
 
   return (
     <div className={cn('flex flex-col justify-start gap-4 items-start pt-3', className)}>
       <FacetTogglesWidget 
         facetValues={categoryLevelValues} 
         mutator={{
-          val: currentFacetToken.get(),
+          get: currentFacetToken, // computed's are accessed through their get()
           set: onFacetTokenChanged
         }} 
       />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/commerce",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Library with shopping cart components.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -29,17 +29,18 @@
   "dependencies": {
     "@hookform/resolvers": "^3.3.2",
     "lucide-react": "^0.307.0",
+    "next-usequerystate": "^1.17.0",
     "react-mobile-picker": "^1.0.0"
   },
   "peerDependencies": {
-    "@hanzo/ui": "^1.0.8",
     "@hanzo/auth": "^1.0.9",
-    "next": "^14.1.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "@hanzo/ui": "^1.0.8",
+    "firebase": "^10.8.0",
     "mobx": "^6.12.0",
     "mobx-react-lite": "^4.0.5",
-    "firebase": "^10.8.0"
+    "next": "^14.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.48",

package/service/impl/standalone/service.ts

@@ -64,7 +64,7 @@ class StandaloneCommerceService
       currentItem: computed,
       item: computed,
       specifiedCategories: computed, 
-      facets: computed
+      facetsValue: computed
       /* NOT setFacets. It implements it's action mechanism */
     })
 
@@ -130,8 +130,12 @@ class StandaloneCommerceService
     return this.specifiedCategories
   }
 
-  get facets(): FacetsValue {
-    return this._selectedFacets
+  get facetsValue(): FacetsValue {
+    const result: FacetsValue = {}
+    for( let level in this._selectedFacets ) {
+      result[level] = [...this._selectedFacets[level]]
+    }
+    return result
   }
 
   get specifiedCategories(): Category[] {

package/util/index.ts

@@ -1,3 +1,4 @@
+
 export function toTitleCase(str: string) {
   return str.replace(
     /\w\S*/g,
@@ -23,3 +24,5 @@ export function formatPrice(price: number): string {
     currency: 'USD',
   });
 }
+
+export { default as useSkuAndFacetParams } from './use-sku-and-facet-params'

package/util/use-sku-and-facet-params.ts

@@ -0,0 +1,157 @@
+import { 
+  useEffect, 
+  useRef,
+} from 'react'
+import { autorun, toJS, type IReactionDisposer } from 'mobx'
+
+import {
+  useQueryState,
+  parseAsString,
+  parseAsBoolean,
+} from 'next-usequerystate'
+
+import type { Category, FacetsValue, StringMutator } from '../types'
+import { useCommerce } from '../service'
+
+interface GetMutator {
+  (level: 1 | 2): StringMutator
+}
+
+const useSkuAndFacetParams = (
+  setLoading?: (l: boolean) => void
+) => {
+
+  const cmmc = useCommerce()
+
+  const encRef = useRef<{
+    category: Category | undefined
+    usingSkuMode: boolean
+    autoRunDisposer: IReactionDisposer | undefined
+  }>({
+    category: undefined,
+    usingSkuMode: false,
+    autoRunDisposer: undefined,
+  })
+
+  const [level1, setLevel1] = useQueryState('lev1',  
+    parseAsString.withDefault('').withOptions({ clearOnDefault: true })
+  )
+   const [level2, setLevel2] = useQueryState('lev2',  
+    parseAsString.withDefault('').withOptions({ clearOnDefault: true })
+  )
+
+  const [skuParam, setSkuParam] = useQueryState('sku')
+  const [addParam, setAddParam] = useQueryState('add', 
+    parseAsBoolean.withDefault(false).withOptions({ clearOnDefault: true })
+  )
+
+  let message = ''
+
+  const directMutator: GetMutator = (level: 1 | 2): StringMutator => {
+
+    const setLevel = (value: string, level: 1 | 2 ): void  => {
+      const facets = cmmc.facetsValue
+      facets[level] = [value]
+      cmmc.setFacets(facets)
+    }
+  
+    const getLevelValueSafe = (level: 1 | 2): string | null => {
+      const facets = cmmc.facetsValue
+      if (!(level in facets) || facets[level].length === 0 ) {
+        return null
+      }
+      return facets[level][0]
+    }
+
+    return {
+      get: () => (getLevelValueSafe(level)),
+      set: (v: string) => {setLevel(v, level)}
+    }
+  } 
+
+  const paramsMutator: GetMutator = (level: 1 | 2): StringMutator => {
+    return level === 1 ? {
+      get: () => (level1),
+      set: setLevel1
+    } : {
+      get: () => (level2),
+      set: setLevel2
+    }
+  }
+
+  useEffect(() => {
+    
+    const setCurrentCategoryFromSku = (sku: string) => {
+      const toks: string[] = sku.split('-')
+      const categories = cmmc.setFacets({
+        1: [toks[1]],
+        2: [toks[2]]
+      })
+      encRef.current.category = categories[0] 
+    }
+
+    if (skuParam) {
+      cmmc.setCurrentItem(skuParam)
+      if (addParam && cmmc.currentItem!.quantity === 0) {
+        cmmc.currentItem!.increment()  
+        setAddParam(false)
+      }
+        // Marks that we've been here so no need to 
+        // create an autorun() instance twice.
+      if (!encRef.current.usingSkuMode) {
+        setCurrentCategoryFromSku(skuParam)
+        encRef.current.autoRunDisposer = autorun(() => {
+          if (cmmc.currentItem && cmmc.currentItem.sku !== skuParam) {
+            setSkuParam(cmmc.currentItem.sku)
+          }
+        })
+      }
+      encRef.current.usingSkuMode = true
+    }
+    else if (encRef.current.category) {
+      //const catMutators = [{val: level1, set: setLevel1} , {val: level2, set: setLevel2}]
+      cmmc.setCurrentItem(encRef.current.category.products[0].sku)
+    }
+    setLoading && setLoading(false)
+  }, [skuParam, encRef.current.category])
+
+    // supposed to be when component unmounts
+  useEffect(() => (() => {
+    if (encRef.current.autoRunDisposer) {
+      //encRef.current.autoRunDisposer() // no idea why this seems to be called prematurely and so many times <shrug>
+    }
+  }), [])
+
+
+    // Level Params Mode
+  useEffect(() => {
+
+    if (encRef.current.usingSkuMode) return
+    
+    const facets: FacetsValue = { }
+    if (level1) { facets[1] = [level1] }
+    if (level2) { facets[2] = [level2] }
+    if (level1 && level2) {
+      const categories = cmmc.setFacets(facets)
+      if (categories.length > 1) {
+        console.error("CAT", categories.map((c) => (c.title)))
+        throw new Error ( "CategoryContents: More than one specified Category should never be possible with this UI!")
+      }
+      encRef.current.category = categories[0] 
+    }
+    else {
+      message = 'Please select an option from each group above.'
+    }
+    setLoading && setLoading(false)
+  }, [level1 , level2])
+
+  return {
+    category: encRef.current.category,
+    message,
+    getMutator: encRef.current.usingSkuMode ?
+      directMutator : paramsMutator
+  }
+
+}
+
+export default useSkuAndFacetParams