Skip to content

Fixing width issue and scrollbar issue on suggestions on mac #2075

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
berhalak merged 2 commits into from
Jan 29, 2026
+23 −8
Merged

Fixing width issue and scrollbar issue on suggestions on mac #2075

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
2a6fcb8
Fixing width issue and scrollbar issue on suggestions on mac
berhalak Jan 28, 2026
ce0badf
Removing border cleanup for suggestions
berhalak Jan 28, 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
19 changes: 16 additions & 3 deletions app/client/components/GridView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,20 +533,25 @@ export default class GridView extends BaseView {
if (this._rowHeights.length > 0) {
this._applyAutoWidth();
this.scrolly.updateSize();
const scrollbarWidth = 22;

// Scrollbars have different widths on different platforms, so we need to re-apply

const scrollSize = scrollBar();
const borderWidth = 2;
const headerHeight = 23;
const maxHeight = this.gridOptions?.maxInlineHeight || 600;
const maxWidth = this.gridOptions?.maxInlineWidth || 800;
const totalHeight = this._rowHeights.reduce((sum, value) => sum + value, 0) + headerHeight + borderWidth;
const totalHeight = this._rowHeights.reduce((sum, value) => sum + value, 0) +
headerHeight + borderWidth + scrollSize.height;
const targetHeight = Math.min(totalHeight, maxHeight);
const widthObs = Observable.create<number>(this, 0);

const updateWidth = () => {
if (this.isDisposed()) { return; }
const fields = this.viewSection.viewFields().all();
const fieldsWidthSum = fields.reduce((sum, field) => sum + field.widthDef.peek(), 0);
const targetWidth = Math.min(fieldsWidthSum + ROW_NUMBER_WIDTH + scrollbarWidth, maxWidth);

const targetWidth = Math.min(fieldsWidthSum + ROW_NUMBER_WIDTH + scrollSize.width, maxWidth);
widthObs.set(targetWidth);
};
updateWidth();
Expand Down Expand Up @@ -2490,3 +2495,11 @@ function calcZebra(hex: string) {
function styleCustomVar(property: string, valueObs: BindableValue<string | number>): DomElementMethod {
return elem => subscribeElem(elem, valueObs, val => elem.style.setProperty(property, String(val)));
}

function scrollBar(): { width: number; height: number } {
// Currently this feature is limited to suggestions only in virtual tables, that are showing
// inline grids. For this sake we can assume that scrollbars are always visible and have
// standard width/height across all browsers.
Copy link
Member

@paulfitz paulfitz Jan 28, 2026

Choose a reason for hiding this comment

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

How does this reconcile with the comment "Scrollbars have different widths on different platforms"?

Do you mean that although there could be differences, the numbers here work ok for the browsers you tested and for the particular use made of this feature?

Copy link
Contributor Author

@berhalak berhalak Jan 28, 2026

Choose a reason for hiding this comment

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

Yes, exactly. I tested on those 6 platforms and this gives enough space on all of them.

// Tested on Chrome/FF Linux/Windows/MacOS.
return { width: 13, height: 13 };
}
4 changes: 0 additions & 4 deletions app/client/components/ViewLayout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@
border: 1px solid var(--grist-theme-widget-border, var(--grist-color-dark-grey));
}

.diff .view_data_pane_container {
border: none;
}

@media not print {
.active_section > .view_data_pane_container {
box-shadow: -2px 0 0 0px var(--grist-theme-widget-active-border, var(--grist-color-light-green));
Expand Down
8 changes: 7 additions & 1 deletion app/client/ui/ProposedChangesPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ and is subject to change and withdrawal.`,
),
buildComparisonDetails(this, this.gristDoc, details, proposal.comparison.comparison),
proposal.status.status === "dismissed" ? "DISMISSED" : null,
isReadOnly ? null : cssDataRow(
isReadOnly ? null : cssButtonRow(
applied ? null : primaryButton(
t("Accept"),
dom.on("click", async () => {
Expand Down Expand Up @@ -686,6 +686,12 @@ const cssDataRow = styled("div", `
margin: 16px 0px;
font-size: ${vars.mediumFontSize};
color: ${theme.text};
& .view_data_pane_container {
width: max-content;
}
`);

const cssButtonRow = styled(cssDataRow, `
width: 360px;
`);

Expand Down