Skip to content

AP-6791 # fix column sizes not being computed when repeatable set inj… #1009

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 1 commit into from
Feb 3, 2026
Merged

AP-6791 # fix column sizes not being computed when repeatable set inj… #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Columns not sizing correctly when headers change

## [9.0.0] - 2026-02-02

### Added
Expand Down
99 changes: 51 additions & 48 deletions src/components/formStore/OneBlinkFormStoreTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ function OneBlinkFormStoreTable() {
const columnSizingInfo = getState().columnSizingInfo
const columnSizing = getState().columnSizing
const visibleColumns = getState().columnVisibility
const flatHeaders = getFlatHeaders()

/**
* Pinched from
Expand All @@ -135,11 +136,10 @@ function OneBlinkFormStoreTable() {
columnSizingInfo
columnSizing
/* eslint-enable @typescript-eslint/no-unused-expressions */
const headers = getFlatHeaders()
const colSizes: { [key: string]: number } = {}
for (const header of headers) {
for (const header of flatHeaders) {
// This check isn't actually necessary, but `visibleColumns` is required as a dependency
// to force a re-calculation of the memo when the columns are hidden/show,
// to force a re-calculation of the memo when the columns are hidden/show,
// so we use it here do get around having to ignore eslint dep reules
if (visibleColumns[header.column.id] === false) {
continue
Expand All @@ -148,7 +148,7 @@ function OneBlinkFormStoreTable() {
colSizes[`--col-${header.column.id}-size`] = header.column.getSize()
}
return colSizes
}, [getFlatHeaders, columnSizingInfo, columnSizing, visibleColumns])
}, [flatHeaders, columnSizingInfo, columnSizing, visibleColumns])

if (!parentHeaderGroup) {
return null
Expand Down Expand Up @@ -192,50 +192,50 @@ function OneBlinkFormStoreTable() {
onClick={
sortingProperty
? () => {
onChangeParameters(
(
currentParameters: formStoreService.FormStoreParameters,
) => {
const sortingMeta =
header.column.columnDef.meta?.sorting
?.property
if (!sortingMeta) {
return currentParameters
}
switch (sortingDirection) {
case 'asc': {
return {
...currentParameters,
sorting: [
{
property: sortingMeta,
direction: 'descending',
},
],
}
onChangeParameters(
(
currentParameters: formStoreService.FormStoreParameters,
) => {
const sortingMeta =
header.column.columnDef.meta?.sorting
?.property
if (!sortingMeta) {
return currentParameters
}
case 'desc': {
return {
...currentParameters,
sorting: undefined,
switch (sortingDirection) {
case 'asc': {
return {
...currentParameters,
sorting: [
{
property: sortingMeta,
direction: 'descending',
},
],
}
}
}
default: {
return {
...currentParameters,
sorting: [
{
property: sortingMeta,
direction: 'ascending',
},
],
case 'desc': {
return {
...currentParameters,
sorting: undefined,
}
}
default: {
return {
...currentParameters,
sorting: [
{
property: sortingMeta,
direction: 'ascending',
},
],
}
}
}
}
},
false,
)
}
},
false,
)
}
: undefined
}
style={{
Expand All @@ -256,8 +256,8 @@ function OneBlinkFormStoreTable() {
sx={
sortingDirection === 'asc'
? {
transform: 'rotate(180deg)',
}
transform: 'rotate(180deg)',
}
: undefined
}
className="th-icon"
Expand Down Expand Up @@ -329,7 +329,8 @@ function OneBlinkFormStoreTable() {
<CellRow
key={row.id}
className={clsx('tr ob-form-store-table-row', {
'ob-form-store-table-row__alternate': rowBackground.alternate,
'ob-form-store-table-row__alternate':
rowBackground.alternate,
})}
>
{
Expand All @@ -345,7 +346,9 @@ function OneBlinkFormStoreTable() {
'is-resizing': cell.column.getIsResizing(),
},
)}
style={{ width: `calc(var(--col-${cell.column.id}-size) * 1px)` }}
style={{
width: `calc(var(--col-${cell.column.id}-size) * 1px)`,
}}
>
{
// Render the cell contents
Expand Down