Merge pull request #2345 from adumesny/master

Alain Dumesny · web-flow · commit 6843bee1c0ee · 2023-05-26T14:20:18.000-07:00
v8.2.1-dev
diff --git a/angular/package.json b/angular/package.json
@@ -18,7 +18,7 @@
     "@angular/platform-browser": "^14.2.0",
     "@angular/platform-browser-dynamic": "^14.2.0",
     "@angular/router": "^14.2.0",
-    "gridstack": "^8.2.0",
+    "gridstack": "^8.2.1",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.11.4"
diff --git a/angular/projects/demo/src/app/app.component.ts b/angular/projects/demo/src/app/app.component.ts
@@ -55,16 +55,15 @@ export class AppComponent implements OnInit {
   private sub2: NgGridStackWidget[] = [ {x:0, y:0}, {x:0, y:1, w:2}];
   private subChildren: NgGridStackWidget[] = [
     {x:0, y:0, content: 'regular item'},
-    {x:1, y:0, w:4, h:4, subGridOpts: {children: this.sub1, id:'sub1_grid', class: 'sub1', ...this.subOptions}},
-    {x:5, y:0, w:3, h:4, subGridOpts: {children: this.sub2, id:'sub2_grid', class: 'sub2', ...this.subOptions}},
+    {x:1, y:0, w:4, h:4, subGridOpts: {children: this.sub1, class: 'sub1', ...this.subOptions}},
+    {x:5, y:0, w:3, h:4, subGridOpts: {children: this.sub2, class: 'sub2', ...this.subOptions}},
   ]
   public nestedGridOptions: NgGridStackOptions = { // main grid options
     cellHeight: 50,
     margin: 5,
     minRow: 2, // don't collapse when empty
     disableOneColumnMode: true,
     acceptWidgets: true,
-    id: 'main',
     children: this.subChildren
   };
   private serializedData?: NgGridStackOptions;
diff --git a/angular/projects/lib/package.json b/angular/projects/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack-angular",
-  "version": "8.2.1",
+  "version": "8.2.1-dev",
   "peerDependencies": {
     "@angular/common": "^14.2.0",
     "@angular/core": "^14.2.0"
diff --git a/angular/projects/lib/src/lib/base-widget.ts b/angular/projects/lib/src/lib/base-widget.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack-item.component.ts 8.2.1
+ * gridstack-item.component.ts 8.2.1-dev
  * Copyright (c) 2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/angular/projects/lib/src/lib/gridstack-item.component.ts b/angular/projects/lib/src/lib/gridstack-item.component.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack-item.component.ts 8.2.1
+ * gridstack-item.component.ts 8.2.1-dev
  * Copyright (c) 2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/angular/projects/lib/src/lib/gridstack.component.ts b/angular/projects/lib/src/lib/gridstack.component.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack.component.ts 8.2.1
+ * gridstack.component.ts 8.2.1-dev
  * Copyright (c) 2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/angular/projects/lib/src/lib/gridstack.module.ts b/angular/projects/lib/src/lib/gridstack.module.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack.component.ts 8.2.1
+ * gridstack.component.ts 8.2.1-dev
  * Copyright (c) 2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/angular/yarn.lock b/angular/yarn.lock
@@ -3641,10 +3641,10 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4,
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-gridstack@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/gridstack/-/gridstack-8.2.0.tgz#20bd295057d8a734b7ac0b90365fb988faba5e18"
-  integrity sha512-ojEFTbBsX7uklIdAo0yDiDy4uYTMcNwtHegCt9nfR03SMQThjhVgZpKBurCq3a1EmN/bQrtaX7V5vJK8qKYhjg==
+gridstack@^8.2.1:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/gridstack/-/gridstack-8.2.1.tgz#b3997d76aad331efc9a050a633ce886e0838871b"
+  integrity sha512-onNay1MD/IrRfqkyXoRxpCqh0gKlQzaXGUunpZOP+PYI+eZaZnWSq/RitUUy0T0fKChl3ri92FjqGZunhc7TUA==
 
 handle-thing@^2.0.0:
   version "2.0.1"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "8.2.1",
+  "version": "8.2.1-dev",
   "license": "MIT",
   "author": "Alain Dumesny <alaind831+github@gmail.com> (https://github.com/adumesny)",
   "contributors": [
diff --git a/src/dd-base-impl.ts b/src/dd-base-impl.ts
@@ -1,5 +1,5 @@
 /**
- * dd-base-impl.ts 8.2.1
+ * dd-base-impl.ts 8.2.1-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-draggable.ts b/src/dd-draggable.ts
@@ -1,5 +1,5 @@
 /**
- * dd-draggable.ts 8.2.1
+ * dd-draggable.ts 8.2.1-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-droppable.ts b/src/dd-droppable.ts
@@ -1,5 +1,5 @@
 /**
- * dd-droppable.ts 8.2.1
+ * dd-droppable.ts 8.2.1-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-element.ts b/src/dd-element.ts
@@ -1,5 +1,5 @@
 /**
- * dd-elements.ts 8.2.1
+ * dd-elements.ts 8.2.1-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-gridstack.ts b/src/dd-gridstack.ts
@@ -1,5 +1,5 @@
 /**
- * dd-gridstack.ts 8.2.1
+ * dd-gridstack.ts 8.2.1-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-manager.ts b/src/dd-manager.ts
@@ -1,5 +1,5 @@
 /**
- * dd-manager.ts 8.2.1
+ * dd-manager.ts 8.2.1-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-resizable-handle.ts b/src/dd-resizable-handle.ts
@@ -1,5 +1,5 @@
 /**
- * dd-resizable-handle.ts 8.2.1
+ * dd-resizable-handle.ts 8.2.1-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-resizable.ts b/src/dd-resizable.ts
@@ -1,5 +1,5 @@
 /**
- * dd-resizable.ts 8.2.1
+ * dd-resizable.ts 8.2.1-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-touch.ts b/src/dd-touch.ts
@@ -1,5 +1,5 @@
 /**
- * touch.ts 8.2.1
+ * touch.ts 8.2.1-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-engine.ts b/src/gridstack-engine.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack-engine.ts 8.2.1
+ * gridstack-engine.ts 8.2.1-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-poly.js b/src/gridstack-poly.js
@@ -1,5 +1,5 @@
 /**
- * gridstack-poly.ts 8.2.1 used for IE and older browser support (not supported in v2-v4.3.1, but again in v4.4)
+ * gridstack-poly.ts 8.2.1-dev used for IE and older browser support (not supported in v2-v4.3.1, but again in v4.4)
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack.scss b/src/gridstack.scss
@@ -1,5 +1,5 @@
 /**
- * gridstack SASS styles 8.2.1
+ * gridstack SASS styles 8.2.1-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack.ts b/src/gridstack.ts
@@ -1,5 +1,5 @@
 /*!
- * GridStack 8.2.1
+ * GridStack 8.2.1-dev
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021-2022 Alain Dumesny
@@ -1649,7 +1649,7 @@ export class GridStack {
     return this;
   }
 
-  static GDRev = '8.2.1';
+  static GDRev = '8.2.1-dev';
 
   /* ===========================================================================================
    * drag&drop methods that used to be stubbed out and implemented in dd-gridstack.ts
diff --git a/src/types.ts b/src/types.ts
@@ -1,5 +1,5 @@
 /**
- * types.ts 8.2.1
+ * types.ts 8.2.1-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/utils.ts b/src/utils.ts
@@ -1,5 +1,5 @@
 /**
- * utils.ts 8.2.1
+ * utils.ts 8.2.1-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gridstack-angular",`
`3`		`- "version": "8.2.1",`
	`3`	`+ "version": "8.2.1-dev",`
`4`	`4`	`"peerDependencies": {`
`5`	`5`	`"@angular/common": "^14.2.0",`
`6`	`6`	`"@angular/core": "^14.2.0"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gridstack",`
`3`		`- "version": "8.2.1",`
	`3`	`+ "version": "8.2.1-dev",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"author": "Alain Dumesny <alaind831+github@gmail.com> (https://github.com/adumesny)",`
`6`	`6`	`"contributors": [`