@graphcommerce/magento-cart-payment-method 3.1.19 → 3.2.0

package/Api/PaymentMethod.ts

@@ -1,3 +1,4 @@
+import { ApolloClient } from '@graphcommerce/graphql'
 import { LinkOrButtonProps } from '@graphcommerce/next-ui'
 import { UseFormComposeOptions } from '@graphcommerce/react-hook-form'
 import React from 'react'
@@ -13,7 +14,7 @@ export type PaymentMethod = Partial<AvailablePaymentMethodFragment> &
   }
 
 export type PaymentMethodOptionsProps = Pick<UseFormComposeOptions, 'step'> & {
-  Container: React.FC
+  Container: React.FC<{ children?: React.ReactNode }>
 }
 export type PaymentButtonProps = PaymentMethod & { buttonProps: LinkOrButtonProps }
 export type PaymentOptionsProps = PaymentMethod & PaymentMethodOptionsProps
@@ -21,9 +22,13 @@ export type PaymentOptionsProps = PaymentMethod & PaymentMethodOptionsProps
 export type PaymentToggleProps = PaymentMethod
 export type PaymentHandlerProps = { code: string }
 
+export type ExpandPaymentMethodsContext = Partial<PaymentMethodContextFragment> & {
+  client: ApolloClient<object>
+}
+
 export type ExpandPaymentMethods = (
   available: AvailablePaymentMethodFragment,
-  context: PaymentMethodContextFragment,
+  context: ExpandPaymentMethodsContext,
 ) => Promise<PaymentMethod[]> | PaymentMethod[]
 
 export type PaymentPlaceOrderProps = PaymentMethod & Pick<UseFormComposeOptions, 'step'>

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## 3.2.0
+
+### Minor Changes
+
+- [#1511](https://github.com/graphcommerce-org/graphcommerce/pull/1511) [`a2b4d7804`](https://github.com/graphcommerce-org/graphcommerce/commit/a2b4d78046a55d70194bd8bcd1efa499d5a73b74) Thanks [@paales](https://github.com/paales)! - make the apollo client available in the expandMethods call
+
+### Patch Changes
+
+- [#1490](https://github.com/graphcommerce-org/graphcommerce/pull/1490) [`d311ef48b`](https://github.com/graphcommerce-org/graphcommerce/commit/d311ef48bb3e97806d992af5516d6b7f183ec9cb) Thanks [@paales](https://github.com/paales)! - upgraded packages
+
+- Updated dependencies [[`a9213f1f5`](https://github.com/graphcommerce-org/graphcommerce/commit/a9213f1f5a410d217768386ccb6d9b5ce7bd5782), [`ddb6d6329`](https://github.com/graphcommerce-org/graphcommerce/commit/ddb6d6329bfad361b2fbe96402ca2bfc0ab3d98c), [`d311ef48b`](https://github.com/graphcommerce-org/graphcommerce/commit/d311ef48bb3e97806d992af5516d6b7f183ec9cb)]:
+  - @graphcommerce/next-ui@4.9.0
+  - @graphcommerce/framer-scroller@2.1.16
+  - @graphcommerce/graphql@3.2.1
+  - @graphcommerce/image@3.1.7
+  - @graphcommerce/magento-cart@4.4.3
+  - @graphcommerce/magento-store@4.2.10
+  - @graphcommerce/react-hook-form@3.2.2
+
 ## 3.1.19
 
 ### Patch Changes

package/PaymentMethodContext/PaymentMethodContext.tsx

@@ -1,6 +1,12 @@
+import { useApolloClient } from '@graphcommerce/graphql'
 import { useCartQuery } from '@graphcommerce/magento-cart'
 import React, { PropsWithChildren, useContext, useEffect, useMemo, useState } from 'react'
-import { PaymentMethod, PaymentMethodModules, PaymentModule } from '../Api/PaymentMethod'
+import {
+  ExpandPaymentMethodsContext,
+  PaymentMethod,
+  PaymentMethodModules,
+  PaymentModule,
+} from '../Api/PaymentMethod'
 import { GetPaymentMethodContextDocument } from './GetPaymentMethodContext.gql'
 
 type PaymentMethodContextProps = {
@@ -26,8 +32,13 @@ export function PaymentMethodContextProvider(props: PaymentMethodContextProvider
   const { modules, children } = props
 
   const context = useCartQuery(GetPaymentMethodContextDocument)
+  const client = useApolloClient()
+
+  const cartContext: ExpandPaymentMethodsContext = useMemo(
+    () => ({ ...context?.data?.cart, client }),
+    [client, context?.data?.cart],
+  )
 
-  const cartContext = context?.data?.cart
   const [methods, setMethods] = useState<PaymentMethod[]>([])
   const [selectedMethod, setSelectedMethod] = useState<PaymentMethod>()
   const [selectedModule, setSelectedModule] = useState<PaymentModule>()

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart-payment-method",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "3.1.19",
+  "version": "3.2.0",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,28 +12,28 @@
     }
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^4.1.7",
+    "@graphcommerce/eslint-config-pwa": "^4.1.8",
     "@graphcommerce/prettier-config-pwa": "^4.0.6",
     "@graphcommerce/typescript-config-pwa": "^4.0.3",
-    "@graphcommerce/magento-cart-shipping-address": "3.0.27",
+    "@graphcommerce/magento-cart-shipping-address": "3.1.0",
     "@playwright/test": "^1.21.1",
     "type-fest": "^2.12.2"
   },
   "dependencies": {
-    "@graphcommerce/framer-scroller": "2.1.15",
-    "@graphcommerce/graphql": "3.2.0",
-    "@graphcommerce/image": "3.1.6",
-    "@graphcommerce/magento-cart": "4.4.2",
-    "@graphcommerce/magento-store": "4.2.9",
-    "@graphcommerce/next-ui": "4.8.4",
-    "@graphcommerce/react-hook-form": "3.2.1"
+    "@graphcommerce/framer-scroller": "2.1.16",
+    "@graphcommerce/graphql": "3.2.1",
+    "@graphcommerce/image": "3.1.7",
+    "@graphcommerce/magento-cart": "4.4.3",
+    "@graphcommerce/magento-store": "4.2.10",
+    "@graphcommerce/next-ui": "4.9.0",
+    "@graphcommerce/react-hook-form": "3.2.2"
   },
   "peerDependencies": {
     "@lingui/react": "^3.13.2",
     "@lingui/core": "^3.13.2",
     "@mui/material": "5.5.3",
     "framer-motion": "^6.2.4",
-    "next": "12.1.2",
+    "next": "^12.1.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   }