feat: Add new prop typeAccepted to LineItemsCount

commercelayer · Dec 21, 2021 · 1317bdd · 1317bdd
1 parent 231863c
commit 1317bdd
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/src/components/LineItemsCount.tsx b/src/components/LineItemsCount.tsx
@@ -5,7 +5,7 @@ import React, {
   useEffect,
 } from 'react'
 import Parent from './utils/Parent'
-import getLineItemsCount from '#utils/getLineItemsCount'
+import getLineItemsCount, { TypeAccepted } from '#utils/getLineItemsCount'
 import { isEmpty } from 'lodash'
 import LineItemContext from '#context/LineItemContext'
 import components from '#config/components'
@@ -22,23 +22,28 @@ type LineItemsCountChildrenProps = FunctionChildren<
 
 type LineItemsCountProps = {
   children?: LineItemsCountChildrenProps
+  typeAccepted?: TypeAccepted[]
 } & JSX.IntrinsicElements['span']
 
 const LineItemsCount: FunctionComponent<LineItemsCountProps> = (props) => {
-  const { children, ...p } = props
+  const { children, typeAccepted, ...p } = props
   const { lineItems } = useContext(LineItemContext)
   const [quantity, setQuantity] = useState(0)
   useEffect(() => {
     if (!isEmpty(lineItems)) {
-      const qty = getLineItemsCount(lineItems || [])
+      const qty = getLineItemsCount({
+        lineItems: lineItems || [],
+        typeAccepted,
+      })
       setQuantity(qty)
     }
     return (): void => {
       setQuantity(0)
     }
-  }, [lineItems])
+  }, [lineItems, typeAccepted])
   const parentProps = {
     quantity,
+    typeAccepted,
     ...p,
   }
   return children ? (

diff --git a/src/components/LineItemsEmpty.tsx b/src/components/LineItemsEmpty.tsx
@@ -33,7 +33,7 @@ const LineItemsEmpty: FunctionComponent<LineItemsCountProps> = (props) => {
   const emptyText = quantity === 0 ? <span {...p}>{text}</span> : null
   useEffect(() => {
     if (!isEmpty(lineItems)) {
-      const qty = getLineItemsCount(lineItems || [])
+      const qty = getLineItemsCount({ lineItems: lineItems || [] })
       setQuantity(qty)
     }
     return (): void => {

diff --git a/src/config/components.ts b/src/config/components.ts
@@ -123,6 +123,13 @@ const components = {
       required: true,
     },
   },
+  AdjustmentAmount: {
+    displayName: 'AdjustmentAmount',
+    propTypes: baseOrderComponentPricePropTypes,
+    defaultProps: {
+      format: 'formatted' as BaseFormatPrice,
+    },
+  },
   AddToCartButton: {
     displayName: 'AddToCartButton',
     propTypes: {
@@ -563,6 +570,7 @@ const components = {
       'LineItemsContainer',
       'SubTotalAmount',
       'DiscountAmount',
+      'AdjustmentAmount',
       'ShippingAmount',
       'TaxesAmount',
       'GiftCardAmount',

diff --git a/src/utils/getLineItemsCount.ts b/src/utils/getLineItemsCount.ts
@@ -2,24 +2,23 @@ import { LineItem } from '@commercelayer/sdk'
 import { LineItemType } from '#typings'
 
 export interface GetLineItemsCountInterface {
-  (lineItems: LineItem[], quantity?: number): number
+  (args: {
+    lineItems: LineItem[]
+    quantity?: number
+    typeAccepted?: TypeAccepted[]
+  }): number
 }
 
-type TypeAccepted = Extract<
+export type TypeAccepted = Extract<
   LineItemType,
   'skus' | 'gift_cards' | 'bundles' | 'adjustments'
 >
 
-const getLineItemsCount: GetLineItemsCountInterface = (
+const getLineItemsCount: GetLineItemsCountInterface = ({
   lineItems,
-  quantity = 0
-) => {
-  const typeAccepted: TypeAccepted[] = [
-    'skus',
-    'gift_cards',
-    'bundles',
-    'adjustments',
-  ]
+  quantity = 0,
+  typeAccepted = ['skus', 'gift_cards', 'bundles', 'adjustments'],
+}) => {
   lineItems
     .filter(
       (l) => l.item_type && typeAccepted.includes(l.item_type as TypeAccepted)