@hanzo/commerce 7.0.14 → 7.0.16

package/components/checkout/payment-step-form/index.tsx

@@ -26,27 +26,28 @@ const PaymentStepForm: React.FC<CheckoutStepComponentProps> = observer(({
   setOrderId
 }) => {
   const cmmc = useCommerce()
-  const auth = useAuth()
+  const auth = useAuth() // may be null in some cases
+
   const [transactionStatus, setTransactionStatus] = useState<TransactionStatus>('unpaid')
 
   if (!auth) {
-    return null
+    console.log("PAYMENT STEP FORM:  auth service is null! ")
   }
 
   const contactForm = useForm<z.infer<typeof contactFormSchema>>({
     resolver: zodResolver(contactFormSchema),  
     defaultValues: {
-      name: auth.user?.displayName ?? '',
-      email: auth.user?.email ?? '',
+      name: auth?.user?.displayName ?? '',
+      email: auth?.user?.email ?? '',
     },
   })
 
   useEffect(() => {
-    if (auth.loggedIn) {
-      contactForm.setValue('name', auth.user?.displayName ?? '')
-      contactForm.setValue('email', auth.user?.email ?? '')
+    if (auth?.loggedIn) {
+      contactForm.setValue('name', auth!.user?.displayName ?? '')
+      contactForm.setValue('email', auth!.user?.email ?? '')
     }
-  }, [auth.loggedIn])
+  }, [auth?.loggedIn])
 
   const storePaymentInfo = async (paymentInfo: any) => {
     const {name, email} = contactForm.getValues()

package/context/index.tsx

@@ -10,10 +10,9 @@ import React, {
 import { enableStaticRendering } from 'mobx-react-lite'
 enableStaticRendering(typeof window === "undefined")
 
-import type { ServiceOptions } from '..'
 import type CommerceService from '../types/commerce-service'
 import getInstance from '../service/get-instance'
-import type { Family, CategoryNode, SelectionUISpecifier } from '../types'
+import type { CommerceConfig } from '../types'
 
 const CommerceContext = createContext<CommerceService | undefined>(undefined)
 
@@ -22,20 +21,14 @@ const useCommerce = (): CommerceService => {
 }
 
 const CommerceProvider: React.FC<PropsWithChildren & {
-  families: Family[]
-  rootNode: CategoryNode
-  options?: ServiceOptions
-  uiSpecs?: Record<string, SelectionUISpecifier>
+  config: CommerceConfig
 }> = ({ 
   children,
-  families,
-  rootNode,
-  options,
-  uiSpecs
+  config
 }) => {
 
     // TODO: Inject Promo fixture here from siteDef
-  const service = getInstance(families, rootNode, options, uiSpecs)
+  const service = getInstance(config)
   const valueRef = useRef<CommerceService>(service)
 
   return (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/commerce",
-  "version": "7.0.14",
+  "version": "7.0.16",
   "description": "e-commerce framework.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/service/impls/standalone/index.ts

@@ -1,6 +1,6 @@
 import { enableStaticRendering } from 'mobx-react-lite'
 
-import type { CommerceService, Family, CategoryNode, SelectionUISpecifier } from '../../../types'
+import type { CommerceService, Family, CategoryNode, SelectionUISpecifier, CommerceConfig } from '../../../types'
 import StandaloneService, {type StandaloneServiceOptions} from './standalone-service'
 import { initSelectionUI } from '../../../util'
 
@@ -18,20 +18,20 @@ const _log = (s: string) => {
 
 let instance: StandaloneService | undefined =  undefined
 
-export const getInstance = (
-  families: Family[], 
-  rootNode: CategoryNode, 
-  options?: StandaloneServiceOptions,
-  uiSpecs?: Record<string, SelectionUISpecifier>
-): CommerceService => {
+export const getInstance = ({
+  families, 
+  rootNode, 
+  options, 
+  uiSpecifiers 
+}: CommerceConfig) : CommerceService => {
 
   if (!options) {
     throw new Error('cmmc getInstance(): Standalone Commerce Service requires config options!')
   }
 
    if (typeof window === "undefined") {
-    if (uiSpecs) {
-      initSelectionUI(uiSpecs)
+    if (uiSpecifiers) {
+      initSelectionUI(uiSpecifiers)
     }
     //_log("NEW INSTANCE FOR SERVER")
     return new StandaloneService(
@@ -43,8 +43,8 @@ export const getInstance = (
 
     // Client side, create the store only once in the client
   if (!instance) {
-    if (uiSpecs) {
-      initSelectionUI(uiSpecs)
+    if (uiSpecifiers) {
+      initSelectionUI(uiSpecifiers)
     }
     //_log("NEW INSTANCE FOR CLIENT")
     const snapShot = readSnapshot()

package/types/commerce-config.ts

@@ -0,0 +1,13 @@
+import type { ServiceOptions } from '..'
+import type { CategoryNode } from './category-node'
+import type { Family } from './family'
+import type { SelectionUISpecifier }  from './selection-ui-specifier'
+
+interface CommerceConfig {
+  families: Family[]
+  rootNode: CategoryNode
+  options?: ServiceOptions
+  uiSpecifiers?: Record<string, SelectionUISpecifier>
+}
+
+export { type CommerceConfig as default }

package/types/index.ts

@@ -1,5 +1,6 @@
 
 export type { default as CommerceService } from './commerce-service'
+export type { default as CommerceConfig } from './commerce-config'
 export type { default as MultiFamilySelectorProps } from './multi-family-selector-props'
 export type { default as Product } from './product'
 export type { default as Promo } from './promo'