Skip to content

fix column(1) to not restore if disableOneColumnMode #2521

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
adumesny merged 1 commit into from
Oct 26, 2023
Merged

fix column(1) to not restore if disableOneColumnMode #2521

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
3 changes: 2 additions & 1 deletion doc/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,10 @@ Change log
<!-- END doctoc generated TOC please keep comment here to allow auto update -->

## 9.4.0-dev (TBD)
* fix [#1275](https://github.com/gridstack/gridstack.js/issues/1275) div scale support - Thank you [elmehdiamlou](https://github.com/elmehdiamlou) for implementing this teh right way (add scale to current code)
* feat [#1275](https://github.com/gridstack/gridstack.js/issues/1275) div scale support - Thank you [elmehdiamlou](https://github.com/elmehdiamlou) for implementing this teh right way (add scale to current code)
* fix [#2489](https://github.com/gridstack/gridstack.js/commit/2489) moved the dropped event handler to after doing everything (no more setTimeout) - Thanks [arnoudb](https://github.com/arnoudb) for suggesting a fix.
* fix [#2497](https://github.com/gridstack/gridstack.js/issues/2497) Utils.parseHeight() fix
* fix column(1) to not restore if disableOneColumnMode on size change

## 9.4.0 (2023-10-15)
* revert [#2263](https://github.com/gridstack/gridstack.js/issues/2263) div scale support - causing too many issues for now (#2498 #2491)
Expand Down
4 changes: 2 additions & 2 deletions src/gridstack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,9 +863,9 @@ export class GridStack {
if (!column || column < 1 || this.opts.column === column) return this;
let oldColumn = this.getColumn();

// if we go into 1 column mode (which happens if we're sized less than minW unless disableOneColumnMode is on)
// if we go into 1 column mode due to size change (disableOneColumnMode is off and we hit min width)
// then remember the original columns so we can restore.
if (column === 1) {
if (column === 1 && !this.opts.disableOneColumnMode) {
this._prevColumn = oldColumn;
} else {
delete this._prevColumn;
Expand Down
4 changes: 2 additions & 2 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ export class Utils {
static parseHeight(val: numberOrString): HeightData {
let h: number;
let unit = 'px';
if (val && typeof val === 'string') {
if (val === 'auto') h = 0;
if (typeof val === 'string') {
if (val === 'auto' || val === '') h = 0;
else {
let match = val.match(/^(-[0-9]+\.[0-9]+|[0-9]*\.[0-9]+|-[0-9]+|[0-9]+)(px|em|rem|vh|vw|%)?$/);
if (!match) {
Expand Down