Lint

src/editor/gridstack/layout.ts

@@ -144,16 +144,16 @@ export class GridStackLayout extends Layout {
     this._prepareGrid();
   }
 
-    /**
+  /**
    * Create an iterator over the widgets in the layout.
    *
    * @returns A new iterator over the widgets in the layout.
    */
-    *[Symbol.iterator](): IterableIterator<Widget> {
-      for (const item of this._gridItems) {
-        yield item;
-      }
+  *[Symbol.iterator](): IterableIterator<Widget> {
+    for (const item of this._gridItems) {
+      yield item;
     }
+  }
 
   /**
    * Remove a widget from the layout.

src/editor/gridstack/widget.ts

@@ -51,7 +51,7 @@ export class GridStackWidget extends Widget {
     this.addClass('grid-editor');
     this._model = model;
 
-    this.layout = new GridStackLayout(this._model.info);
+    this._gridlayout = new GridStackLayout(this._model.info);
     this.layout.gridItemChanged.connect(this._onGridItemChange, this);
 
     this._model.ready.connect(() => {
@@ -62,6 +62,27 @@ export class GridStackWidget extends Widget {
     });
   }
 
+  get layout(): GridStackLayout {
+    return this._gridlayout;
+  }
+
+  set layout(value: GridStackLayout) {
+    if (this._gridlayout === value) {
+      return;
+    }
+    if (this.testFlag(Widget.Flag.DisallowLayout)) {
+      throw new Error('Cannot set widget layout.');
+    }
+    if (this._gridlayout) {
+      throw new Error('Cannot change widget layout.');
+    }
+    if (value!.parent) {
+      throw new Error('Cannot change layout parent.');
+    }
+    this._gridlayout = value;
+    value!.parent = this;
+  }
+
   /**
    * Update the layout to reclaim any empty space
    */
@@ -733,8 +754,7 @@ export class GridStackWidget extends Widget {
     }
   }
 
-  //@ts-ignore
-  layout: GridStackLayout;
+  private _gridlayout: GridStackLayout;
 
   private _model: GridStackModel;
   private _shadowWidget: GridItemHTMLElement | null = null;