Merge pull request gridstack#2620 from adumesny/master

adumesny · web-flow · commit 1834509f99b2 · 2024-03-03T10:57:15.000-08:00
resize with sizeToContent
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -5,6 +5,7 @@ Change log
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
+- [10.1.1 (2024-03-03)](#1011-2024-03-03)
 - [10.1.0 (2024-02-04)](#1010-2024-02-04)
 - [10.0.1 (2023-12-10)](#1001-2023-12-10)
 - [10.0.0 (2023-11-20)](#1000-2023-11-20)
@@ -106,6 +107,8 @@ Change log
 - [v0.1.0 (2014-11-18)](#v010-2014-11-18)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
+## 10.1.1 (2024-03-03)
+* fix: [#2620](https://github.com/gridstack/gridstack.js/pull/2620) allow resizing with sizeToContent:NUMBER is uses 
 
 ## 10.1.0 (2024-02-04)
 * feat: [#2574](https://github.com/gridstack/gridstack.js/pull/2574) Allow cell height in cm and mm units
diff --git a/src/dd-gridstack.ts b/src/dd-gridstack.ts
@@ -46,7 +46,7 @@ export class DDGridStack {
         if (handles === 'all') handles = 'n,e,s,w,se,sw,ne,nw';
         // NOTE: keep the resize handles as e,w don't have enough space (10px) to show resize corners anyway. limit during drag instead
         // restrict vertical resize if height is done to match content anyway... odd to have it spring back
-        // if (Utils.shouldSizeToContent(n)) {
+        // if (Utils.shouldSizeToContent(n, true)) {
         //   const doE = handles.indexOf('e') !== -1;
         //   const doW = handles.indexOf('w') !== -1;
         //   handles = doE ? (doW ? 'e,w' : 'e') : (doW ? 'w' : '');
diff --git a/src/dd-resizable.ts b/src/dd-resizable.ts
@@ -166,7 +166,7 @@ export class DDResizable extends DDBaseImplement implements HTMLElementExtendOpt
 
   /** @internal */
   protected _resizeStart(event: MouseEvent): DDResizable {
-    this.sizeToContent = Utils.shouldSizeToContent(this.el.gridstackNode);
+    this.sizeToContent = Utils.shouldSizeToContent(this.el.gridstackNode, true); // strick true only and not number
     this.originalRect = this.el.getBoundingClientRect();
     this.scrollEl = Utils.getScrollElement(this.el);
     this.scrollY = this.scrollEl.scrollTop;
diff --git a/src/utils.ts b/src/utils.ts
@@ -109,9 +109,11 @@ export class Utils {
     return els;
   }
 
-  /** true if we should resize to content */
-  static shouldSizeToContent(n: GridStackNode | undefined): boolean {
-    return n?.grid && (!!n.sizeToContent || (n.grid.opts.sizeToContent && n.sizeToContent !== false));
+  /** true if we should resize to content. strict=true when only 'sizeToContent:true' and not a number which lets user adjust */
+  static shouldSizeToContent(n: GridStackNode | undefined, strict = false): boolean {
+    return n?.grid && (strict ? 
+    (n.sizeToContent === true || (n.grid.opts.sizeToContent === true && n.sizeToContent === undefined)) :
+    (!!n.sizeToContent || (n.grid.opts.sizeToContent && n.sizeToContent !== false)));
   }
 
   /** returns true if a and b overlap */

Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,11 @@ export class Utils {`
`109`	`109`	`return els;`
`110`	`110`	`}`
`111`	`111`
`112`		`- /** true if we should resize to content */`
`113`		`- static shouldSizeToContent(n: GridStackNode \| undefined): boolean {`
`114`		`- return n?.grid && (!!n.sizeToContent \|\| (n.grid.opts.sizeToContent && n.sizeToContent !== false));`
	`112`	`+ /** true if we should resize to content. strict=true when only 'sizeToContent:true' and not a number which lets user adjust */`
	`113`	`+ static shouldSizeToContent(n: GridStackNode \| undefined, strict = false): boolean {`
	`114`	`+ return n?.grid && (strict ?`
	`115`	`+ (n.sizeToContent === true \|\| (n.grid.opts.sizeToContent === true && n.sizeToContent === undefined)) :`
	`116`	`+ (!!n.sizeToContent \|\| (n.grid.opts.sizeToContent && n.sizeToContent !== false)));`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`/** returns true if a and b overlap */`