angular V11 APi support

adumesny · adumesny · commit 747ecdfafc4a · 2024-10-13T17:47:54.000-07:00
* updated Angular to upcoming v11 demo.html to create components now for sidebar!
diff --git a/angular/projects/demo/src/app/app.component.html b/angular/projects/demo/src/app/app.component.html
@@ -71,21 +71,15 @@
 </div>
 
 <div *ngIf="show===7">
-  <p><b>two.html</b>: shows multiple grids and outside drag&drop</p>
+  <p><b>two.html</b>: shows multiple grids, sidebar creating Components</p>
   <div class="row">
-    <div class="col-md-3">
+    <div class="col-md-6">
       <div class="sidebar">
-        <!-- will size to match content -->
-        <div class="grid-stack-item">
-          <div class="grid-stack-item-content">Drag me</div>
-        </div>
-        <!-- manually force a drop size of 2x1 -->
-        <div class="grid-stack-item" gs-w="2" gs-h="1" gs-max-w="3">
-          <div class="grid-stack-item-content">2x1, max=3</div>
-        </div>
+        <div class="sidebar-item grid-stack-item">will be A</div>
+        <div class="sidebar-item grid-stack-item">will be B max=3</div>
       </div>
     </div>
-    <div class="col-md-9">
+    <div class="col-md-6">
       <div class="trash" id="trash">
       </div>
     </div>
diff --git a/angular/projects/demo/src/app/app.component.ts b/angular/projects/demo/src/app/app.component.ts
@@ -46,6 +46,12 @@ export class AppComponent implements OnInit {
     children: this.sub0,
   }
 
+  // sidebar content to create storing the Widget description to be used on drop
+  public sidebarContent: NgGridStackWidget[] = [
+    {selector: 'app-a'},
+    {selector: 'app-b', w:2, maxW: 3},
+  ];
+
   // nested grid options
   private subOptions: GridStackOptions = {
     cellHeight: 50, // should be 50 - top/bottom
@@ -76,8 +82,8 @@ export class AppComponent implements OnInit {
     acceptWidgets: true,
     float: true,
     children: [
-      {x: 0, y: 0, w: 2, h: 2},
-      {x: 3, y: 1, h: 2},
+      {x: 0, y: 0, w: 2, h: 2, selector: 'app-a'},
+      {x: 3, y: 1, h: 2, selector: 'app-b'},
       {x: 4, y: 1},
       {x: 2, y: 3, w: 3, maxW: 3, id: 'special', content: 'has maxW=3'},
     ]
@@ -128,7 +134,7 @@ export class AppComponent implements OnInit {
         case 5: data = this.gridOptionsFull; break;
         case 6: data = this.nestedGridOptions; break;
         case 7: data = this.twoGridOpt1;
-          GridStack.setupDragIn('.sidebar .grid-stack-item', { appendTo: 'body', helper: 'clone' });
+          GridStack.setupDragIn('.sidebar>.grid-stack-item', undefined, this.sidebarContent);
           break;
       }
       if (this.origTextEl) this.origTextEl.nativeElement.value = JSON.stringify(data, null, '  ');
diff --git a/angular/projects/demo/src/app/dummy.component.ts b/angular/projects/demo/src/app/dummy.component.ts
@@ -34,5 +34,6 @@ export class BComponent extends BaseWidget implements OnDestroy {
   selector: 'app-c',
   template: 'Comp C',
 })
-export class CComponent extends BaseWidget {
+export class CComponent extends BaseWidget implements OnDestroy {
+  ngOnDestroy() { console.log('Comp C destroyed'); }
 }
diff --git a/angular/projects/demo/src/styles.css b/angular/projects/demo/src/styles.css
@@ -20,10 +20,29 @@ h1 {
   margin-bottom: .5rem;
 }
 
+.sidebar {
+  background: rgb(215, 243, 215);
+  padding: 25px 0;
+  height: 100px;
+  text-align: center;
+}
+.sidebar > .grid-stack-item,
+.sidebar-item {
+  width: 120px;
+  height: 50px;
+  border: 2px dashed green;
+  text-align: center;
+  line-height: 35px;
+  background: rgb(192, 231, 192);
+  cursor: default;
+  display: inline-block;
+}
+
 .grid-stack {
   background: #FAFAD2;
 }
 
+.sidebar > .grid-stack-item,
 .grid-stack-item-content {
   text-align: center;
   background-color: #18bc9c;
@@ -32,47 +51,22 @@ h1 {
 .grid-stack-item-removing {
   opacity: 0.5;
 }
-
 .trash {
   height: 100px;
   background: rgba(255, 0, 0, 0.1) center center url(data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjY0cHgiIGhlaWdodD0iNjRweCIgdmlld0JveD0iMCAwIDQzOC41MjkgNDM4LjUyOSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgNDM4LjUyOSA0MzguNTI5OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPGc+CgkJPHBhdGggZD0iTTQxNy42ODksNzUuNjU0Yy0xLjcxMS0xLjcwOS0zLjkwMS0yLjU2OC02LjU2My0yLjU2OGgtODguMjI0TDMwMi45MTcsMjUuNDFjLTIuODU0LTcuMDQ0LTcuOTk0LTEzLjA0LTE1LjQxMy0xNy45ODkgICAgQzI4MC4wNzgsMi40NzMsMjcyLjU1NiwwLDI2NC45NDUsMGgtOTEuMzYzYy03LjYxMSwwLTE1LjEzMSwyLjQ3My0yMi41NTQsNy40MjFjLTcuNDI0LDQuOTQ5LTEyLjU2MywxMC45NDQtMTUuNDE5LDE3Ljk4OSAgICBsLTE5Ljk4NSw0Ny42NzZoLTg4LjIyYy0yLjY2NywwLTQuODUzLDAuODU5LTYuNTY3LDIuNTY4Yy0xLjcwOSwxLjcxMy0yLjU2OCwzLjkwMy0yLjU2OCw2LjU2N3YxOC4yNzQgICAgYzAsMi42NjQsMC44NTUsNC44NTQsMi41NjgsNi41NjRjMS43MTQsMS43MTIsMy45MDQsMi41NjgsNi41NjcsMi41NjhoMjcuNDA2djI3MS44YzAsMTUuODAzLDQuNDczLDI5LjI2NiwxMy40MTgsNDAuMzk4ICAgIGM4Ljk0NywxMS4xMzksMTkuNzAxLDE2LjcwMywzMi4yNjQsMTYuNzAzaDIzNy41NDJjMTIuNTY2LDAsMjMuMzE5LTUuNzU2LDMyLjI2NS0xNy4yNjhjOC45NDUtMTEuNTIsMTMuNDE1LTI1LjE3NCwxMy40MTUtNDAuOTcxICAgIFYxMDkuNjI3aDI3LjQxMWMyLjY2MiwwLDQuODUzLTAuODU2LDYuNTYzLTIuNTY4YzEuNzA4LTEuNzA5LDIuNTctMy45LDIuNTctNi41NjRWODIuMjIxICAgIEM0MjAuMjYsNzkuNTU3LDQxOS4zOTcsNzcuMzY3LDQxNy42ODksNzUuNjU0eiBNMTY5LjMwMSwzOS42NzhjMS4zMzEtMS43MTIsMi45NS0yLjc2Miw0Ljg1My0zLjE0aDkwLjUwNCAgICBjMS45MDMsMC4zODEsMy41MjUsMS40Myw0Ljg1NCwzLjE0bDEzLjcwOSwzMy40MDRIMTU1LjMxMUwxNjkuMzAxLDM5LjY3OHogTTM0Ny4xNzMsMzgwLjI5MWMwLDQuMTg2LTAuNjY0LDguMDQyLTEuOTk5LDExLjU2MSAgICBjLTEuMzM0LDMuNTE4LTIuNzE3LDYuMDg4LTQuMTQxLDcuNzA2Yy0xLjQzMSwxLjYyMi0yLjQyMywyLjQyNy0yLjk5OCwyLjQyN0gxMDAuNDkzYy0wLjU3MSwwLTEuNTY1LTAuODA1LTIuOTk2LTIuNDI3ICAgIGMtMS40MjktMS42MTgtMi44MS00LjE4OC00LjE0My03LjcwNmMtMS4zMzEtMy41MTktMS45OTctNy4zNzktMS45OTctMTEuNTYxVjEwOS42MjdoMjU1LjgxNVYzODAuMjkxeiIgZmlsbD0iI2ZmOWNhZSIvPgoJCTxwYXRoIGQ9Ik0xMzcuMDQsMzQ3LjE3MmgxOC4yNzFjMi42NjcsMCw0Ljg1OC0wLjg1NSw2LjU2Ny0yLjU2N2MxLjcwOS0xLjcxOCwyLjU2OC0zLjkwMSwyLjU2OC02LjU3VjE3My41ODEgICAgYzAtMi42NjMtMC44NTktNC44NTMtMi41NjgtNi41NjdjLTEuNzE0LTEuNzA5LTMuODk5LTIuNTY1LTYuNTY3LTIuNTY1SDEzNy4wNGMtMi42NjcsMC00Ljg1NCwwLjg1NS02LjU2NywyLjU2NSAgICBjLTEuNzExLDEuNzE0LTIuNTY4LDMuOTA0LTIuNTY4LDYuNTY3djE2NC40NTRjMCwyLjY2OSwwLjg1NCw0Ljg1MywyLjU2OCw2LjU3QzEzMi4xODYsMzQ2LjMxNiwxMzQuMzczLDM0Ny4xNzIsMTM3LjA0LDM0Ny4xNzJ6IiBmaWxsPSIjZmY5Y2FlIi8+CgkJPHBhdGggZD0iTTIxMC4xMjksMzQ3LjE3MmgxOC4yNzFjMi42NjYsMCw0Ljg1Ni0wLjg1NSw2LjU2NC0yLjU2N2MxLjcxOC0xLjcxOCwyLjU2OS0zLjkwMSwyLjU2OS02LjU3VjE3My41ODEgICAgYzAtMi42NjMtMC44NTItNC44NTMtMi41NjktNi41NjdjLTEuNzA4LTEuNzA5LTMuODk4LTIuNTY1LTYuNTY0LTIuNTY1aC0xOC4yNzFjLTIuNjY0LDAtNC44NTQsMC44NTUtNi41NjcsMi41NjUgICAgYy0xLjcxNCwxLjcxNC0yLjU2OCwzLjkwNC0yLjU2OCw2LjU2N3YxNjQuNDU0YzAsMi42NjksMC44NTQsNC44NTMsMi41NjgsNi41N0MyMDUuMjc0LDM0Ni4zMTYsMjA3LjQ2NSwzNDcuMTcyLDIxMC4xMjksMzQ3LjE3MnogICAgIiBmaWxsPSIjZmY5Y2FlIi8+CgkJPHBhdGggZD0iTTI4My4yMiwzNDcuMTcyaDE4LjI2OGMyLjY2OSwwLDQuODU5LTAuODU1LDYuNTctMi41NjdjMS43MTEtMS43MTgsMi41NjItMy45MDEsMi41NjItNi41N1YxNzMuNTgxICAgIGMwLTIuNjYzLTAuODUyLTQuODUzLTIuNTYyLTYuNTY3Yy0xLjcxMS0xLjcwOS0zLjkwMS0yLjU2NS02LjU3LTIuNTY1SDI4My4yMmMtMi42NywwLTQuODUzLDAuODU1LTYuNTcxLDIuNTY1ICAgIGMtMS43MTEsMS43MTQtMi41NjYsMy45MDQtMi41NjYsNi41Njd2MTY0LjQ1NGMwLDIuNjY5LDAuODU1LDQuODUzLDIuNTY2LDYuNTdDMjc4LjM2NywzNDYuMzE2LDI4MC41NSwzNDcuMTcyLDI4My4yMiwzNDcuMTcyeiIgZmlsbD0iI2ZmOWNhZSIvPgoJPC9nPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+CjxnPgo8L2c+Cjwvc3ZnPgo=) no-repeat;
 }
 
-.sidebar {
-  background: rgba(0, 255, 0, 0.1);
-  padding: 25px 0;
-  height: 100px;
-  text-align: center;
-}
-
-.sidebar .grid-stack-item {
-  width: 120px;
-  height: 50px;
-  border: 2px dashed green;
-  text-align: center;
-  line-height: 35px;
-  background: rgba(0, 255, 0, 0.1);
-  cursor: default;
-  display: inline-block;
-}
-
-.sidebar .grid-stack-item .grid-stack-item-content {
-  background: none;
-}
-
 /* make nested grid have slightly darker bg take almost all space (need some to tell them apart) so items inside can have similar to external size+margin */
-.grid-stack>.grid-stack-item.grid-stack-sub-grid>.grid-stack-item-content {
-  background: rgba(0, 0, 0, 0.1);
+.grid-stack > .grid-stack-item.grid-stack-sub-grid > .grid-stack-item-content {
+  background: rgba(0,0,0,0.1);
   inset: 0 2px;
 }
-
 .grid-stack.grid-stack-nested {
   background: none;
   /* background-color: red; */
   /* take entire space */
   position: absolute;
-  inset: 0;
-  /* TODO change top: if you have content in nested grid */
+  inset: 0; /* TODO change top: if you have content in nested grid */
 }
 
 /* for two.html example from bootstrap.min.css */

Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@ export class BComponent extends BaseWidget implements OnDestroy {`
`34`	`34`	`selector: 'app-c',`
`35`	`35`	`template: 'Comp C',`
`36`	`36`	`})`
`37`		`-export class CComponent extends BaseWidget {`
	`37`	`+export class CComponent extends BaseWidget implements OnDestroy {`
	`38`	`+ ngOnDestroy() { console.log('Comp C destroyed'); }`
`38`	`39`	`}`