Skip to content

Commit

Permalink
fix(plugin): Draggable Grouping drop zone should always be 100% wide (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
ghiscoding committed May 11, 2024
1 parent 7e0cdc9 commit a6dbf2c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 4 deletions.
6 changes: 6 additions & 0 deletions examples/vite-demo-vanilla-bundle/src/examples/example03.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,12 @@ export default class Example03 {
dataView: {
useCSPSafeFilter: true
},
headerMenu: {
hideFreezeColumnsCommand: false,
},
gridMenu: {
hideClearFrozenColumnsCommand: false
},
enableAutoSizeColumns: true,
enableAutoResize: true,
enableCellNavigation: true,
Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/core/slickGrid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ export class SlickGrid<TData = any, C extends Column<TData> = Column<TData>, O e
Utils.width(this._footerRowR, this.canvasWidthR);
}
if (this._options.createPreHeaderPanel) {
Utils.width(this._preHeaderPanel, this.canvasWidth);
Utils.width(this._preHeaderPanel, this._options.preHeaderPanelWidth ?? this.canvasWidth);
}
Utils.width(this._viewportTopL, this.canvasWidthL);
Utils.width(this._viewportTopR, this.viewportW - this.canvasWidthL);
Expand All @@ -1228,7 +1228,7 @@ export class SlickGrid<TData = any, C extends Column<TData> = Column<TData>, O e
}

if (this._options.createPreHeaderPanel) {
Utils.width(this._preHeaderPanel, this.canvasWidth);
Utils.width(this._preHeaderPanel, this._options.preHeaderPanelWidth ?? this.canvasWidth);
}
Utils.width(this._viewportTopL, '100%');

Expand Down
1 change: 1 addition & 0 deletions packages/common/src/global-grid-options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ export const GlobalGridOptions: Partial<GridOption> = {
headerRowHeight: 35,
rowHeight: 35,
topPanelHeight: 30,
preHeaderPanelWidth: '100%', // mostly useful for Draggable Grouping dropzone to take full width
translationNamespaceSeparator: ':',
resetFilterSearchValueAfterOnBeforeCancellation: true,
resizeByContentOnlyOnFirstLoad: true,
Expand Down
3 changes: 3 additions & 0 deletions packages/common/src/interfaces/gridOption.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,9 @@ export interface GridOption<C extends Column = Column> {
/** Extra pre-header panel height (on top of column header) */
preHeaderPanelHeight?: number;

/** Extra pre-header panel (on top of column header) width, it could be a number (pixels) or a string ("100%") */
preHeaderPanelWidth?: number | string;

/** Do we want to preserve copied selection on paste? */
preserveCopiedSelectionOnPaste?: boolean;

Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ $slick-draggable-group-drop-bgcolor: #ffffff !default;
$slick-draggable-group-drop-height: 35px !default;
$slick-draggable-group-drop-padding: 5px 10px !default;
$slick-draggable-group-drop-radius: 4px !default;
$slick-draggable-group-drop-width: calc(100% - 25px) !default;
$slick-draggable-group-drop-width: 100% !default;
$slick-draggable-group-droppable-active-bgcolor: #fafafa !default;
$slick-draggable-group-droppable-hover-bgcolor: #ffffff !default;
$slick-draggable-group-placeholder-font-style: italic !default;
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/styles/slick-plugins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ input.search-filter {
border-left: var(--slick-draggable-group-drop-border-left, $slick-draggable-group-drop-border-left);
border-right: var(--slick-draggable-group-drop-border-right, $slick-draggable-group-drop-border-right);
border-bottom: var(--slick-draggable-group-drop-border-bottom, $slick-draggable-group-drop-border-bottom);
width: var(--slick-draggable-group-drop-width, $slick-draggable-group-drop-width) !important;
width: var(--slick-draggable-group-drop-width, $slick-draggable-group-drop-width);
border-radius: var(--slick-draggable-group-drop-radius, $slick-draggable-group-drop-radius);
background-color: var(--slick-draggable-group-drop-bgcolor, $slick-draggable-group-drop-bgcolor);

Expand Down

0 comments on commit a6dbf2c

Please sign in to comment.