Skip to content

fix(filter-value): show children text content instead of value #1982

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.

Sign up for GitHub

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
viniciuslagedo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(filter-value): show children text content instead of value #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4566cc7
fix(filter-value): show children text content instead of value
viniciuslagedo Sep 27, 2024
dd99e31
chore(filter): add example with value and children different
viniciuslagedo Sep 27, 2024
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
22 changes: 17 additions & 5 deletions packages/shoreline/src/components/filter/filter-value.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useSelectContext } from '@ariakit/react'
import type { ComponentPropsWithoutRef } from 'react'
import { forwardRef } from 'react'
import { forwardRef, useCallback } from 'react'
import { useFilterContext } from './filter-context'

const valueSeparator = ': '
Expand All @@ -13,14 +14,25 @@ export const FilterValue = forwardRef<HTMLSpanElement, FilterValueProps>(
const filter = useFilterContext()
const value = filter?.useState('value')

const isArray = Array.isArray(value)
const isLongArray = isArray && value.length > 1
const valueIsArray = Array.isArray(value)
const valueIsMultiSelected = valueIsArray && value.length > 1

const selectContext = useSelectContext()
const items = selectContext?.useState('items')

const getValueText = useCallback(
() =>
items?.find((item) =>
valueIsArray ? item.value === value[0] : item.value === value
)?.element?.innerText,
[value, valueIsArray, items]
)

return (
<span data-sl-filter-value ref={ref} {...props}>
{value && value.length > 0 && valueSeparator}
{isArray ? value[0] : value}
{isLongArray && `${countPrefix}${value.length - 1}`}
{getValueText()}
{valueIsMultiSelected && `${countPrefix}${value.length - 1}`}
</span>
)
}
Expand Down
30 changes: 21 additions & 9 deletions packages/shoreline/src/components/filter/stories/examples.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { useState, useMemo, startTransition } from 'react'
import { matchSorter } from 'match-sorter'
import { startTransition, useMemo, useState } from 'react'

import { EmptyState, Heading, Text } from '../..'
import { IconMagnifyingGlass } from '../../../icons'
import { EmptyStateIllustration } from '../../empty-state'
import { LocaleProvider } from '../../locale'
import {
FilterProvider,
FilterPopover,
FilterList,
Filter,
FilterItem,
FilterList,
FilterPopover,
FilterProvider,
FilterTrigger,
Filter,
} from '../index'
import type { Country } from './countries'
import { countries } from './countries'
import { LocaleProvider } from '../../locale'
import { IconMagnifyingGlass } from '../../../icons'
import { EmptyState, Text, Heading } from '../..'
import { EmptyStateIllustration } from '../../empty-state'

export default {
title: 'components/filter',
Expand All @@ -35,6 +35,18 @@ export function Controlled() {
)
}

export function CustomLabel() {
const [city, setCity] = useState<string>('')

return (
<Filter label="Cidade" value={city} setValue={setCity}>
<FilterItem value="rj">Rio de Janeiro</FilterItem>
<FilterItem value="sp">São Paulo</FilterItem>
<FilterItem value="mg">Minas Gerais</FilterItem>
</Filter>
)
}

export function CustomMessages() {
return (
<Filter
Expand Down