Skip to content

AP-6989 # use flexRender instead of getValue #1011

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

Merged
mymattcarroll merged 2 commits into from
Feb 4, 2026
Merged

AP-6989 # use flexRender instead of getValue #1011

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
577ba43
AP-6989 # fixed display of repeatable set values
divporter Feb 4, 2026
c487ddd
AP-6989 # use flexRender instead of getValue
divporter Feb 4, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Columns not sizing correctly when headers change
- Not displaying repeatable set values

## [9.0.0] - 2026-02-02

Expand Down
63 changes: 31 additions & 32 deletions src/components/formStore/table/ColumnFilters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ function ColumnFilters({ filter }: Props) {
filter.onChange(
e.target.value
? {
$eq: e.target.value,
}
$eq: e.target.value,
}
: undefined,
true,
)
Expand All @@ -69,10 +69,10 @@ function ColumnFilters({ filter }: Props) {
filter.onChange(
e.target.value
? {
$regex: e.target.value,
// hard code case in-sensitive and multi-line searching
$options: 'im',
}
$regex: e.target.value,
// hard code case in-sensitive and multi-line searching
$options: 'im',
}
: undefined,
true,
)
Expand Down Expand Up @@ -101,9 +101,9 @@ function ColumnFilters({ filter }: Props) {
typeof filter.value?.$lte === 'number' ||
newValue !== undefined
? {
...filter.value,
$gte: newValue,
}
...filter.value,
$gte: newValue,
}
: undefined,
true,
)
Expand All @@ -127,9 +127,9 @@ function ColumnFilters({ filter }: Props) {
typeof filter.value?.$gte === 'number' ||
newValue !== undefined
? {
...filter.value,
$lte: newValue,
}
...filter.value,
$lte: newValue,
}
: undefined,
true,
)
Expand Down Expand Up @@ -159,9 +159,9 @@ function ColumnFilters({ filter }: Props) {
filter.onChange(
filter.value?.$lte || !!newDate
? {
...filter.value,
$gte: newDate,
}
...filter.value,
$gte: newDate,
}
: undefined,
false,
)
Expand All @@ -185,9 +185,9 @@ function ColumnFilters({ filter }: Props) {
filter.onChange(
filter.value?.$gte || !!newDate
? {
...filter.value,
$lte: newDate,
}
...filter.value,
$lte: newDate,
}
: undefined,
false,
)
Expand Down Expand Up @@ -217,14 +217,13 @@ function ColumnFilters({ filter }: Props) {
filter.onChange(
filter.value?.$lte || !!newDate
? {
...filter.value,
$gte: newDate,
}
...filter.value,
$gte: newDate,
}
: undefined,
false,
)
}
}
}}
/>
</Grid>
<Grid size={{ xs: 6 }}>
Expand All @@ -244,9 +243,9 @@ function ColumnFilters({ filter }: Props) {
filter.onChange(
filter.value?.$gte || !!newDate
? {
...filter.value,
$lte: newDate,
}
...filter.value,
$lte: newDate,
}
: undefined,
false,
)
Expand Down Expand Up @@ -287,8 +286,8 @@ function ColumnFilters({ filter }: Props) {
filter.onChange(
newValue.length
? {
$in: newValue,
}
$in: newValue,
}
: undefined,
false,
)
Expand All @@ -305,10 +304,10 @@ function ColumnFilters({ filter }: Props) {
filter.onChange(
newValue.length
? {
$elemMatch: {
$in: newValue,
},
}
$elemMatch: {
$in: newValue,
},
}
: undefined,
false,
)
Expand Down
15 changes: 11 additions & 4 deletions src/components/formStore/table/RepeatableSetCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ import { Typography, Divider as MuiDivider, styled } from '@mui/material'
import { FormTypes, SubmissionTypes } from '@oneblink/types'
import useBooleanState from '../../../hooks/useBooleanState'
import generateColumns from './generateColumns'
import { getCoreRowModel, useReactTable } from '@tanstack/react-table'
import {
flexRender,
getCoreRowModel,
useReactTable,
} from '@tanstack/react-table'
import RepeatableSetCellAccordion from './RepeatableSetCellAccordion'

const Wrapper = styled('div')({
Expand Down Expand Up @@ -66,12 +70,15 @@ const RepeatableSetCell = ({ formElement, value }: Props) => {
onChange={toggleVisibility}
>
<Wrapper>
{getRowModel().rows.map((row, i) => {
{rows.map((row, i) => {
const isLast = i === rows.length - 1
return (
<React.Fragment key={row.id}>
{row.getAllCells().map((cell) => {
const cellValue = cell.getValue()
const cellValue = flexRender(
cell.column.columnDef.cell,
cell.getContext(),
)
if (!cellValue) return null
return (
<CellRow key={cell.column.id}>
Expand All @@ -80,7 +87,7 @@ const RepeatableSetCell = ({ formElement, value }: Props) => {
{cell.column.columnDef.header?.toString() || ''}:
</Typography>
</span>
<CellValue>{cellValue as string}</CellValue>
<CellValue>{cellValue}</CellValue>
</CellRow>
)
})}
Expand Down