Merge main into feat/css-handles-modals

hiagolcm · cursoragent · hiagolcm · commit 18d0ee434ee2 · 2026-07-08T12:06:52.000-03:00
Resolved conflicts in CHANGELOG.md and docs/README.md by merging both feature sets:
- Kept CSS handles for modal components from feat/css-handles-modals
- Added clearButton, updateButton, and updateButtonContainer from main
- Maintained version 1.3.0 changelog entries from main

Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - CSS handles for `UnavailableItemsModal`, `AddLocation`, and `ProductItem` components to enable theme customization.
 
+## [1.3.0] - 2026-07-08
+
+### Added
+- `clearButton` and `updateButton` CSS handles on the pickup point list so merchants can style the Clear and Update buttons independently (previously only the shared `updateButtonContainer` was available).
+
+### Changed
+- Pickup point selection now requires explicit Clear button instead of clicking the selected point to unselect.
+- Clearing a selected pickup point now dispatches `RESET_FULFILLMENT_METHOD` (via a new `onClearPickup` handler) instead of re-dispatching `UPDATE_PICKUP`. This skips the delivery-promises BFF availability check on clear — clearing only broadens availability, so there is nothing to validate — resulting in a faster clear path with the same session cleanup.
+- Added bottom padding to the pickup point list when the floating action bar is visible so the last item scrolls fully clear of the Clear / Update buttons.
+
+### Fixed
+- `pickup-point-selector` modal now closes automatically after a pickup is selected or cleared. Previously only `shipping-method-selector` closed itself when the soft-refresh feature landed; the standalone pickup-point-selector was missing the same wiring, leaving the modal open until the shopper dismissed it manually.
+
 ## [1.2.0] - 2026-06-30
 
 ### Changed
diff --git a/docs/README.md b/docs/README.md
@@ -168,6 +168,9 @@ In order to apply CSS customizations in this and other blocks, follow the instru
 | `unavailableItemsModalProductItem`           |
 | `unavailableItemsModalRemoveButtonContainer` |
 | `unavailableItemsModalRetryButtonContainer`  |
+| `updateButtonContainer`                      |
+| `clearButton`                                |
+| `updateButton`                               |
 
 <!-- DOCS-IGNORE:start -->
 
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "vendor": "vtex",
   "name": "delivery-promise-components",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "title": "Delivery Promise Components",
   "description": "Delivery Promise UI components",
   "builders": {
@@ -21,9 +21,7 @@
     "vtex.order-items": "0.x",
     "vtex.session-client": "1.x"
   },
-  "registries": [
-    "smartcheckout"
-  ],
+  "registries": ["smartcheckout"],
   "policies": [],
   "$schema": "https://raw.githubusercontent.com/vtex/node-vtex-api/master/gen/manifest.schema"
 }
diff --git a/messages/bg.json b/messages/bg.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Избиране на магазин",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Изчисти",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/ca.json b/messages/ca.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Tria una botiga",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Esborra",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Actualitza",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/cs.json b/messages/cs.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Vyberte obchod",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Vymazat",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Aktualizovat",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/da.json b/messages/da.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Vælg en butik",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Ryd",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Opdater",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/de.json b/messages/de.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Shop auswählen",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Löschen",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/el.json b/messages/el.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Επιλέξτε ένα κατάστημα",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Εκκαθάριση",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Ενημέρωση",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/en.json b/messages/en.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Choose a store",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Clear",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/es.json b/messages/es.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Selecciona una tienda",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Borrar",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Actualizar",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continuar con la entrega",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "No hay tiendas que atiendan el código postal {postalCode}",
diff --git a/messages/fi.json b/messages/fi.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Valitse myymälä",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Tyhjennä",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Päivitä",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/fr.json b/messages/fr.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Choisissez un magasin",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Effacer",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/hu.json b/messages/hu.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Válasszon egy üzletet",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Törlés",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Frissítés",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/id.json b/messages/id.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Pilih toko",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Hapus",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Perbarui",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/it.json b/messages/it.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Scegli un negozio",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Cancella",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/ja.json b/messages/ja.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "店舗を選択",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "クリア",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/ko.json b/messages/ko.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "스토어 선택",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "지우기",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/nl.json b/messages/nl.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Kies een winkel",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Wissen",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/no.json b/messages/no.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Velg en butikk",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Tøm",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Oppdater",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/pl.json b/messages/pl.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Wybierz sklep",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Wyczyść",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Aktualizuj",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/pt.json b/messages/pt.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Escolha uma loja",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Limpar",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Atualizar",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continuar com entrega",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "Não há lojas que atendam o CEP {postalCode}",
diff --git a/messages/ro.json b/messages/ro.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Alege un magazin",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Șterge",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/ru.json b/messages/ru.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Выберите магазин",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Очистить",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Обновить",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/sk.json b/messages/sk.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Vyberte obchod",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Vymazať",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Aktualizovať",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/sl.json b/messages/sl.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Izberi trgovino",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Počisti",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Posodobi",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/sv.json b/messages/sv.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Välj en butik",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Rensa",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Uppdatera",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/th.json b/messages/th.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "เลือกร้านค้า",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "ล้าง",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Update",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/messages/uk.json b/messages/uk.json
@@ -1,5 +1,6 @@
 {
   "store/delivery-promise-components.pickupPointButton.placeholder": "Виберіть магазин",
+  "store/delivery-promise-components.pickupPointList.clearButton.label": "Очистити",
   "store/delivery-promise-components.pickupPointList.updateButton.label": "Оновити",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",
   "store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",
diff --git a/react/PickupModal.tsx b/react/PickupModal.tsx
@@ -45,6 +45,7 @@ const PickupModalWithContext = ({ isOpen, onClose }: Props) => {
         selectedPickup,
         selectedZipcode,
         isLoading,
+        canUnselect: false,
       }}
     />
   )
diff --git a/react/PickupPointSelector.tsx b/react/PickupPointSelector.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-globals */
-import React, { useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import { useDeliveryPromiseState, useDeliveryPromiseDispatch } from './context'
@@ -24,9 +24,28 @@ function PickupPointSelector({ mode = 'default' }: Props) {
     deliveryPromiseMethod,
     submitErrorMessage,
     areThereUnavailableCartItems,
+    fulfillmentSelectionAppliedId,
   } = useDeliveryPromiseState()
 
   const dispatch = useDeliveryPromiseDispatch()
+  const lastHandledFulfillmentSelectionAppliedId = useRef(0)
+
+  // Close the modal once a fulfillment selection is applied (new pickup, or
+  // pickup cleared via RESET_FULFILLMENT_METHOD). The old reload tore the modal
+  // down for free; with the soft refresh the tree stays alive.
+  useEffect(() => {
+    if (
+      fulfillmentSelectionAppliedId <=
+      lastHandledFulfillmentSelectionAppliedId.current
+    ) {
+      return
+    }
+
+    lastHandledFulfillmentSelectionAppliedId.current =
+      fulfillmentSelectionAppliedId
+
+    setIsPickupModalOpen(false)
+  }, [fulfillmentSelectionAppliedId])
 
   const onSubmit = (zipcode: string, reload?: boolean) => {
     dispatch({
@@ -38,7 +57,13 @@ function PickupPointSelector({ mode = 'default' }: Props) {
   const onSelectPickup = (pickup: Pickup) => {
     dispatch({
       type: 'UPDATE_PICKUP',
-      args: { pickup },
+      args: { pickup, canUnselect: true },
+    })
+  }
+
+  const onClearPickup = () => {
+    dispatch({
+      type: 'RESET_FULFILLMENT_METHOD',
     })
   }
 
@@ -65,12 +90,14 @@ function PickupPointSelector({ mode = 'default' }: Props) {
         onClose={() => setIsPickupModalOpen(false)}
         pickupProps={{
           onSelectPickup,
+          onClearPickup,
           onSubmit: (value) => onSubmit(value, false),
           pickups,
           inputErrorMessage: submitErrorMessage?.message,
           selectedPickup: pickup,
           selectedZipcode,
           isLoading,
+          canUnselect: true,
         }}
       />
     </>
diff --git a/react/ShippingMethodSelector.tsx b/react/ShippingMethodSelector.tsx
@@ -103,6 +103,12 @@ function ShippingMethodSelector({
     })
   }
 
+  const onClearPickup = () => {
+    dispatch({
+      type: 'RESET_FULFILLMENT_METHOD',
+    })
+  }
+
   const onShippingMethodDeliveryToggle = () => {
     if (deliveryPromiseMethod === 'delivery') {
       if (required) {
@@ -150,12 +156,14 @@ function ShippingMethodSelector({
         }}
         pickupProps={{
           onSelectPickup,
+          onClearPickup,
           onSubmit: (value) => onSubmit(value, false),
           pickups,
           inputErrorMessage: submitErrorMessage?.message,
           selectedPickup: pickup,
           selectedZipcode,
           isLoading,
+          canUnselect: !required,
         }}
         nonDismissibleModal={required && !deliveryPromiseMethod}
       />
diff --git a/react/__tests__/PickupList.test.tsx b/react/__tests__/PickupList.test.tsx
diff --git a/react/__tests__/PickupPointSelector.test.tsx b/react/__tests__/PickupPointSelector.test.tsx
diff --git a/react/__tests__/ShippingMethodSelector.test.tsx b/react/__tests__/ShippingMethodSelector.test.tsx
diff --git a/react/components/PickupModal.tsx b/react/components/PickupModal.tsx
diff --git a/react/components/PickupSelection/PickupList.tsx b/react/components/PickupSelection/PickupList.tsx
diff --git a/react/components/PickupSelection/index.tsx b/react/components/PickupSelection/index.tsx
diff --git a/react/components/ShippingMethodModal/index.tsx b/react/components/ShippingMethodModal/index.tsx
diff --git a/react/messages.ts b/react/messages.ts
diff --git a/react/package.json b/react/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"store/delivery-promise-components.pickupPointButton.placeholder": "Избиране на магазин",`
	`3`	`+ "store/delivery-promise-components.pickupPointList.clearButton.label": "Изчисти",`
`3`	`4`	`"store/delivery-promise-components.pickupPointList.updateButton.label": "Update",`
`4`	`5`	`"store/delivery-promise-components.pickupPointSelection.noPointsState.button.label": "Continue with delivery",`
`5`	`6`	`"store/delivery-promise-components.pickupPointSelection.noPointsState.description": "There are no stores available for the postal code {postalCode}",`