Skip to content

Feature/shipping facets as radio #700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Added

- Radio button to delivery filter.

## [3.136.1] - 2025-02-26

### Removed
Expand Down
565 changes: 273 additions & 292 deletions docs/README.md

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"title": "VTEX Search Result",
"description": "A search result wrapper component",
"mustUpdateAt": "2019-04-25",
"registries": [
"smartcheckout"
],
"registries": ["smartcheckout"],
"scripts": {
"postreleasy": "vtex publish --verbose"
},
Expand Down
43 changes: 33 additions & 10 deletions react/components/AccordionFilterGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ import React from 'react'
import { useIntl } from 'react-intl'
import classNames from 'classnames'
import { useCssHandles, applyModifiers } from 'vtex.css-handles'
import { useSearchPage } from 'vtex.search-page-context/SearchPageContext'
import { usePixel } from 'vtex.pixel-manager'

import AccordionFilterItem from './AccordionFilterItem'
import FacetCheckboxList from './FacetCheckboxList'
import useSelectedFilters from '../hooks/useSelectedFilters'
import { getFilterTitle } from '../constants/SearchHelpers'
import { searchSlugify } from '../utils/slug'
import RadioFilters from './RadioFilters'
import { pushFilterManipulationPixelEvent } from '../utils/filterManipulationPixelEvents'

const CSS_HANDLES = ['accordionFilterOpen']

Expand All @@ -29,13 +33,17 @@ const AccordionFilterGroup = ({
onClearFilter,
showClearByFilter,
}) => {
const { searchQuery } = useSearchPage()
const handles = useCssHandles(CSS_HANDLES)
const filters = useSelectedFilters(facets)
const selectedFilters = filters.filter(facet => facet.selected)
const intl = useIntl()
const facetTitle = getFilterTitle(title, intl)
const slugifiedFacetTitle = searchSlugify(facetTitle)
const facetKey = filters.length > 0 ? filters[0].key : null
const { push } = usePixel()

const isRadio = filters.some(filter => filter.key === 'shipping')

return (
<AccordionFilterItem
Expand All @@ -58,16 +66,31 @@ const AccordionFilterGroup = ({
className
)}
>
<FacetCheckboxList
onFilterCheck={onFilterCheck}
facets={filters}
quantity={quantity}
facetTitle={facetTitle}
truncateFilters={truncateFilters}
navigationType={navigationType}
truncatedFacetsFetched={truncatedFacetsFetched}
setTruncatedFacetsFetched={setTruncatedFacetsFetched}
/>
{isRadio ? (
<RadioFilters
facets={filters}
onChange={facet => {
pushFilterManipulationPixelEvent({
name: facetTitle,
value: facet.name,
products: searchQuery?.products ?? [],
push,
})
onFilterCheck({ ...facet, title: facetTitle }, true)
}}
/>
) : (
<FacetCheckboxList
onFilterCheck={onFilterCheck}
facets={filters}
quantity={quantity}
facetTitle={facetTitle}
truncateFilters={truncateFilters}
navigationType={navigationType}
truncatedFacetsFetched={truncatedFacetsFetched}
setTruncatedFacetsFetched={setTruncatedFacetsFetched}
/>
)}
</div>
</AccordionFilterItem>
)
Expand Down
14 changes: 13 additions & 1 deletion react/components/FilterOptionTemplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import useOutsideClick from '../hooks/useOutsideClick'
import ShowMoreFilterButton from './ShowMoreFilterButton'
import { useRenderOnView } from '../hooks/useRenderOnView'
import { FACETS_RENDER_THRESHOLD } from '../constants/filterConstants'
import RadioFilters from './RadioFilters'

/** Returns true if elementRef has ever been scrolled */
const useHasScrolled = elementRef => {
Expand Down Expand Up @@ -162,9 +163,20 @@ const FilterOptionTemplate = ({
? FACETS_RENDER_THRESHOLD
: filteredFacets.length

const isRadio = filters.some(filter => filter.key === 'shipping')

return (
<>
{filteredFacets.slice(0, endSlice).map(children)}
{isRadio ? (
<RadioFilters
facets={filteredFacets}
onChange={facet =>
navigateToFacet({ ...facet, title }, preventRouteChange)
}
/>
) : (
filteredFacets.slice(0, endSlice).map(children)
)}
{placeholderSize > 0 && <div style={{ height: placeholderSize }} />}
{shouldTruncate && (
<ShowMoreFilterButton
Expand Down
12 changes: 11 additions & 1 deletion react/components/FilterSidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,23 @@ const FilterSidebar = ({
)
}

const handleFilterCheck = filter => {
const handleFilterCheck = (filter, isRadio = false) => {
if (updateOnFilterSelectionOnMobile && preventRouteChange) {
navigateToFacet(filter, preventRouteChange)

return
}

if (isRadio) {
setFilterOperations(
filterOperations
.filter(facet => facet.key !== filter.key)
.concat(filter)
)

return
}

if (!isFilterSelected(filterOperations, filter)) {
setFilterOperations(filterOperations.concat(filter))
} else {
Expand Down
67 changes: 67 additions & 0 deletions react/components/RadioFilters.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import React, { useEffect, useState } from 'react'
import { useIntl } from 'react-intl'
import { RadioGroup } from 'vtex.styleguide'

import ShippingActionButton from './ShippingActionButton'
import useShippingActions from '../hooks/useShippingActions'

const RadioItem = ({ facet }) => {
const intl = useIntl()

const { actionLabel, actionType, openDrawer } = useShippingActions(facet)

return (
<div>
<div>{facet.name}</div>
{actionType ? (
<ShippingActionButton
label={intl.formatMessage({ id: actionLabel ?? 'none' })}
openDrawer={openDrawer}
/>
) : undefined}
</div>
)
}

const RadioFilters = ({ facets, onChange }) => {
const selectedOption = facets.find(facet => facet.selected)
const lastValue = selectedOption ? selectedOption.value : undefined

const [selectedValue, setSelectedValue] = useState(lastValue)

useEffect(() => {
setSelectedValue(lastValue)
}, [lastValue])

const onRadioSelect = e => {
const { value } = e.currentTarget

setSelectedValue(value)

const clickedFacet = facets.find(facet => facet.value === value)

if (clickedFacet.selected) {
return
}

onChange(clickedFacet)
}

return (
<RadioGroup
hideBorder
size="small"
name="shipping"
options={facets.map(facet => ({
id: facet.value,
value: facet.value,
label: <RadioItem facet={facet} />,
disabled: facet.quantity === 0,
}))}
value={selectedValue}
onChange={onRadioSelect}
/>
)
}

export default RadioFilters
4 changes: 3 additions & 1 deletion react/components/SelectedFilters.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ const SelectedFilters = ({
const handles = useCssHandles(CSS_HANDLES)
const { showFacetTitle } = useContext(SettingsContext)

const visibleFilters = filters.filter(filter => !filter.hidden)
const visibleFilters = filters
.filter(filter => !filter.hidden)
.filter(filter => filter.key !== 'shipping')

if (!visibleFilters.length) {
return null
Expand Down
5 changes: 5 additions & 0 deletions react/hooks/useFacetNavigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@ export const buildNewQueryMap = (
facets,
selectedFacets
) => {
// RadioGroup behavior
if (facets.some(facet => facet.key === 'shipping')) {
selectedFacets = selectedFacets.filter(facet => facet.key !== 'shipping')
}

const querySegments = selectedFacets.map(facet => facet.value)
const mapSegments = selectedFacets.map(facet => facet.map)

Expand Down
4 changes: 4 additions & 0 deletions react/searchResult.css
Original file line number Diff line number Diff line change
Expand Up @@ -273,3 +273,7 @@
.scrim, .sidebar {
z-index: 999;
}

.filterContent {
padding-right: 2px;
}