Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Commit

Permalink
Ensure package names display correctly if only one item is in package (
Browse files Browse the repository at this point in the history
…#6815)

* Check package length >= 1 to show package name

* Check shipping rates length in order shipping packages slot

* Fix TS error where boolean value could be undefined

* Show items if there is more than one shipping rate
  • Loading branch information
opr authored Aug 2, 2022
1 parent 279d667 commit 84f107a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ const Packages = ( {
key={ packageId }
packageId={ packageId }
packageData={ packageData }
collapsible={ collapsible }
collapse={ collapse }
collapsible={ !! collapsible }
collapse={ !! collapse }
showItems={
showItems || packageData?.shipping_rates?.length > 1
}
Expand Down Expand Up @@ -167,6 +167,7 @@ const ShippingRatesControl = ( {
ShippingRatesControlPackage,
},
context,
shippingRates,
};
const { isEditor } = useEditorContext();

Expand All @@ -192,6 +193,7 @@ const ShippingRatesControl = ( {
/>
<ExperimentalOrderShippingPackages>
<Packages
showItems={ shippingRates.length > 1 }
packages={ shippingRates }
noResultsMessage={ noResultsMessage }
renderOption={ renderOption }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ const Slot = ( {
cart,
components,
context,
shippingRates,
} ) => {
const { fills } = useSlot( slotName );
const hasMultiplePackages = fills.length > 1;
const hasMultiplePackages = fills.length > 1 || shippingRates?.length > 1;
return (
<OrderShippingPackagesSlot
className={ classnames(
Expand Down

0 comments on commit 84f107a

Please sign in to comment.