Merge branch 'master' into alyssa-starter

1 files changed, 12 insertions, 11 deletions

diff --git a/src/client/views/collections/collectionGrid/CollectionGridView.tsx b/src/client/views/collections/collectionGrid/CollectionGridView.tsx
index 2d9191dd7..5c41fee37 100644
--- a/src/client/views/collections/collectionGrid/CollectionGridView.tsx
+++ b/src/client/views/collections/collectionGrid/CollectionGridView.tsx
@@ -9,11 +9,11 @@ import { emptyFunction } from '../../../../Utils';
 import { Docs } from '../../../documents/Documents';
 import { DragManager } from '../../../util/DragManager';
 import { Transform } from '../../../util/Transform';
-import { undoBatch } from '../../../util/UndoManager';
+import { undoable, undoBatch } from '../../../util/UndoManager';
 import { ContextMenu } from '../../ContextMenu';
 import { ContextMenuProps } from '../../ContextMenuItem';
 import { DocumentView } from '../../nodes/DocumentView';
-import { CollectionSubView } from '../CollectionSubView';
+import { CollectionSubView, SubCollectionViewProps } from '../CollectionSubView';
 import './CollectionGridView.scss';
 import Grid, { Layout } from './Grid';
 
@@ -26,7 +26,7 @@ export class CollectionGridView extends CollectionSubView() {
     @observable private _scroll: number = 0; // required to make sure the decorations box container updates on scroll
     private dropLocation: object = {}; // sets the drop location for external drops
 
-    constructor(props: any) {
+    constructor(props: SubCollectionViewProps) {
         super(props);
         makeObservable(this);
     }
@@ -200,7 +200,7 @@ export class CollectionGridView extends CollectionSubView() {
                 whenChildContentsActiveChanged={this._props.whenChildContentsActiveChanged}
                 onClickScript={this.onChildClickHandler}
                 renderDepth={this._props.renderDepth + 1}
-                dontCenter={StrCast(this.layoutDoc.layout_dontCenter) as any} // 'y', 'x', 'xy'
+                dontCenter={StrCast(this.layoutDoc.layout_dontCenter) as 'x' | 'y' | 'xy'}
             />
         );
     }
@@ -221,13 +221,13 @@ export class CollectionGridView extends CollectionSubView() {
             });
 
             if (this.Document.gridStartCompaction) {
-                undoBatch(() => {
+                undoable(() => {
                     this.Document.gridCompaction = this.Document.gridStartCompaction;
                     this.setLayoutList(savedLayouts);
-                })();
+                }, 'start grid compaction')();
                 this.Document.gridStartCompaction = undefined;
             } else {
-                undoBatch(() => this.setLayoutList(savedLayouts))();
+                undoable(() => this.setLayoutList(savedLayouts), 'start grid compaction')();
             }
         }
     };
@@ -315,9 +315,9 @@ export class CollectionGridView extends CollectionSubView() {
             e,
             returnFalse,
             action(() => {
-                undoBatch(() => {
+                undoable(() => {
                     this.Document.gridRowHeight = this._rowHeight;
-                })();
+                }, 'changing row height')();
                 this._rowHeight = undefined;
             }),
             emptyFunction,
@@ -360,13 +360,14 @@ export class CollectionGridView extends CollectionSubView() {
                 returnFalse,
                 (clickEv: PointerEvent, doubleTap?: boolean) => {
                     if (doubleTap && !clickEv.button) {
-                        undoBatch(
+                        undoable(
                             action(() => {
                                 const text = Docs.Create.TextDocument('', { _width: 150, _height: 50 });
                                 Doc.SetSelectOnLoad(text); // track the new text box so we can give it a prop that tells it to focus itself when it's displayed
                                 Doc.AddDocToList(this.Document, this._props.fieldKey, text);
                                 this.setLayoutList(this.addLayoutItem(this.savedLayoutList, this.makeLayoutItem(text, this.screenToCell(clickEv.clientX, clickEv.clientY))));
-                            })
+                            }),
+                            'create grid text'
                         )();
                     }
                 },