Skip to content

fix _updateContainerHeight() to use height #2464

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
merged 1 commit into from
Sep 21, 2023
Merged

fix _updateContainerHeight() to use height #2464

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 demo/nested_advanced.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<title>Advance Nested grids demo</title>
<link rel="stylesheet" href="demo.css"/>
<link rel="stylesheet" href="../dist/gridstack-extra.min.css"/> <!-- required for [2-11] column of sub-grids -->
<!-- test using CSS rather than minRow -->
<style type="text/css">
.container-fluid > .grid-stack { min-height: 250px}
</style>
<script src="../dist/gridstack-all.js"></script>
</head>
<body>
Expand Down
44 changes: 24 additions & 20 deletions src/gridstack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,30 +1489,34 @@ export class GridStack {
/** @internal */
protected _updateContainerHeight(): GridStack {
if (!this.engine || this.engine.batchMode) return this;
let row = this.getRow() + this._extraDragRow; // checks for minRow already
// check for css min height
// Note: we don't handle %,rem correctly so comment out, beside we don't need need to create un-necessary
// rows as the CSS will make us bigger than our set height if needed... not sure why we had this.
// let cssMinHeight = parseInt(getComputedStyle(this.el)['min-height']);
// if (cssMinHeight > 0) {
// let minRow = Math.round(cssMinHeight / this.getCellHeight(true));
// if (row < minRow) {
// row = minRow;
// }
// }
const parent = this.parentGridItem;
let row = this.getRow() + this._extraDragRow; // this checks for minRow already
const cellHeight = this.opts.cellHeight as number;
const unit = this.opts.cellHeightUnit;
if (!cellHeight) return this;

// check for css min height (non nested grid). TODO: support mismatch, say: min % while unit is px.
if (!parent) {
const cssMinHeight = Utils.parseHeight(getComputedStyle(this.el)['minHeight']);
if (cssMinHeight.h > 0 && cssMinHeight.unit === unit) {
const minRow = Math.floor(cssMinHeight.h / cellHeight);
if (row < minRow) {
row = minRow;
}
}
}

this.el.setAttribute('gs-current-row', String(row));
if (row === 0) {
this.el.style.removeProperty('min-height');
} else {
let cellHeight = this.opts.cellHeight as number;
let unit = this.opts.cellHeightUnit;
if (!cellHeight) return this;
this.el.style.minHeight = row * cellHeight + unit;
this.el.style.removeProperty('min-height');
this.el.style.removeProperty('height');
if (row) {
// nested grids have 'insert:0' to fill the space of parent by default, but we may be taller so use min-height for possible scrollbars
this.el.style[parent ? 'minHeight' : 'height'] = row * cellHeight + unit;
}

// if we're a nested grid inside an sizeToContent item, tell it to resize itself too
if (this.parentGridItem && !this.parentGridItem.grid.engine.batchMode && Utils.shouldSizeToContent(this.parentGridItem)) {
this.parentGridItem.grid.resizeToContentCheck(this.parentGridItem.el);
if (parent && !parent.grid.engine.batchMode && Utils.shouldSizeToContent(parent)) {
parent.grid.resizeToContentCheck(parent.el);
}

return this;
Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ module.exports = {
'gridstack-all': './src/gridstack.ts',
},
mode: 'production', // production vs development
devtool: 'source-map',
// devtool: 'eval-source-map', // for best (large .js) debugging. see https://survivejs.com/webpack/building/source-maps/
// devtool: 'source-map',
devtool: 'eval-source-map', // for best (large .js) debugging. see https://survivejs.com/webpack/building/source-maps/
module: {
rules: [
{
Expand Down