Skip to content

Commit 8860f16

Browse files
AG-16842 fix extra border on columns tool panel (ag-grid#13272)
1 parent 7a92a08 commit 8860f16

4 files changed

Lines changed: 13 additions & 4 deletions

File tree

community-modules/styles/src/internal/base/parts/_columns-tool-panel.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@
2929
}
3030

3131
.ag-column-panel-column-select {
32-
border-bottom: var(--ag-borders-secondary) var(--ag-secondary-border-color);
3332
border-top: var(--ag-borders-secondary) var(--ag-secondary-border-color);
33+
34+
&:not(.ag-last-visible-child) {
35+
border-bottom: var(--ag-borders-secondary) var(--ag-secondary-border-color);
36+
}
3437
}
3538

3639
.ag-column-group-icons,

community-modules/styles/src/internal/themes/quartz/_index.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@
143143

144144
.ag-column-panel-column-select {
145145
border-top: none;
146-
border-bottom: 1px solid var(--ag-secondary-border-color);
146+
147+
&:not(.ag-last-visible-child) {
148+
border-bottom: 1px solid var(--ag-secondary-border-color);
149+
}
147150
}
148151

149152
.ag-filter-toolpanel-search {

packages/ag-grid-enterprise/src/columnToolPanel/columnToolPanel.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
margin-left: var(--ag-widget-container-horizontal-padding);
1717
}
1818

19-
.ag-column-panel-column-select {
19+
.ag-column-panel-column-select:where(:not(.ag-last-visible-child)) {
2020
border-bottom: var(--ag-tool-panel-separator-border);
2121
}
2222

packages/ag-grid-enterprise/src/columnToolPanel/columnToolPanel.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,9 @@ export class ColumnToolPanel extends Component implements IColumnToolPanel, IToo
184184
}
185185
const eGui = panel.getGui();
186186
panel.toggleResizable(
187-
!eGui.classList.contains('ag-last-column-drop') && !eGui.classList.contains('ag-hidden')
187+
!eGui.classList.contains('ag-last-column-drop') &&
188+
!eGui.classList.contains('ag-hidden') &&
189+
!eGui.classList.contains('ag-last-visible-child')
188190
);
189191
}
190192
}
@@ -205,6 +207,7 @@ export class ColumnToolPanel extends Component implements IColumnToolPanel, IToo
205207
lastVisible.classList.add('ag-last-column-drop');
206208
}
207209

210+
this.primaryColsPanel.getGui().classList.toggle('ag-last-visible-child', !lastVisible);
208211
this.setResizers();
209212
}
210213

0 commit comments

Comments
 (0)