Skip to content
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

fix: revert to old behavior but properly generate picker labels #1606

Closed
wants to merge 1 commit into from
Closed

fix: revert to old behavior but properly generate picker labels #1606

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
5 changes: 2 additions & 3 deletions packages/common/src/core/slickGrid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,7 @@ export class SlickGrid<TData = any, C extends Column<TData> = Column<TData>, O e
if (emptyTarget) {
emptyElement(target);
}
const node = options?.cloneNode ? val.cloneNode(true) : val;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you also remove the options prop above cloneNode?: boolean; since it's no longer needed

target.appendChild(node);
target.appendChild(val);
} else {
// when it's already empty and we try to reassign empty, it's probably ok to skip the assignment
const skipEmptyReassignment = options?.skipEmptyReassignment !== false;
Expand Down Expand Up @@ -2793,7 +2792,7 @@ export class SlickGrid<TData = any, C extends Column<TData> = Column<TData>, O e
w = this.columns[i].width || 0;

rule = this.getColumnCssRules(i);
if (rule.left) {
if (rule.left) {
rule.left.style.left = `${x}px`;
}
if (rule.right) {
Expand Down
5 changes: 5 additions & 0 deletions packages/common/src/global-grid-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,5 +279,10 @@ function pickerHeaderColumnValueExtractor(column: Column, gridOptions?: GridOpti
if (headerGroup) {
return headerGroup + columnGroupSeparator + column.name;
}

if (column?.name instanceof HTMLElement || column?.name instanceof DocumentFragment) {
return column.name.textContent ?? '';
}

Copy link
Owner

@ghiscoding ghiscoding Jul 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so I had a very similar approach but I think it would be better to go with mine instead, because with yours, you forgot to deal with the line 280. So I think it's better to first extract the column name for all other usage as shown below

Suggested change
function pickerHeaderColumnValueExtractor(column: Column, gridOptions?: GridOption) {
let colName = column?.name ?? '';
if (colName instanceof HTMLElement || colName instanceof DocumentFragment) {
colName = colName.textContent || '';
}
const headerGroup = column?.columnGroup || '';
const columnGroupSeparator = gridOptions?.columnGroupSeparator ?? ' - ';
if (headerGroup) {
return headerGroup + columnGroupSeparator + colName;
}
return colName;
}

return column?.name ?? '';
}
Loading