From 762ac2bf354e4cc2c4b15f42502da939f5061646 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Fri, 9 Aug 2024 16:48:18 -0400
Subject: a bunch more typing fixes.

---
 src/client/views/collections/CollectionMenu.tsx | 44 ++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/client/views/collections/CollectionMenu.tsx')

diff --git a/src/client/views/collections/CollectionMenu.tsx b/src/client/views/collections/CollectionMenu.tsx
index 7b9475590..f1b5e4db2 100644
--- a/src/client/views/collections/CollectionMenu.tsx
+++ b/src/client/views/collections/CollectionMenu.tsx
@@ -19,7 +19,7 @@ import { DragManager } from '../../util/DragManager';
 import { dropActionType } from '../../util/DropActionTypes';
 import { SnappingManager } from '../../util/SnappingManager';
 import { Transform } from '../../util/Transform';
-import { undoBatch } from '../../util/UndoManager';
+import { undoBatch, undoable } from '../../util/UndoManager';
 import { AntimodeMenu } from '../AntimodeMenu';
 import { EditableView } from '../EditableView';
 import { DefaultStyleProvider, returnEmptyDocViewList } from '../StyleProvider';
@@ -181,7 +181,7 @@ export class CollectionViewBaseChrome extends React.Component<CollectionViewMenu
         params: ['target', 'source'],
         title: 'item view',
         script: 'this.target.childLayoutTemplate = getDocTemplate(this.source?.[0])',
-        immediate: undoBatch((source: Doc[]) => {
+        immediate: undoable((source: Doc[]) => {
             let formatStr = source.length && Cast(source[0].text, RichTextField, null)?.Text;
             try {
                 formatStr && JSON.parse(formatStr);
@@ -196,25 +196,25 @@ export class CollectionViewBaseChrome extends React.Component<CollectionViewMenu
                 Doc.SetInPlace(this.target, 'childLayoutString', undefined, true);
                 Doc.SetInPlace(this.target, 'childLayoutTemplate', undefined, true);
             }
-        }),
+        }, ''),
         initialize: emptyFunction,
     };
     _narrativeCommand = {
         params: ['target', 'source'],
         title: 'child click view',
         script: 'this.target.childClickedOpenTemplateView = getDocTemplate(this.source?.[0])',
-        immediate: undoBatch((source: Doc[]) => {
+        immediate: undoable((source: Doc[]) => {
             source.length && (this.target.childClickedOpenTemplateView = Doc.getDocTemplate(source?.[0]));
-        }),
+        }, 'narrative command'),
         initialize: emptyFunction,
     };
     _contentCommand = {
         params: ['target', 'source'],
         title: 'set content',
         script: 'getProto(this.target).data = copyField(this.source);',
-        immediate: undoBatch((source: Doc[]) => {
+        immediate: undoable((source: Doc[]) => {
             this.target[DocData].data = new List<Doc>(source);
-        }),
+        }, ''),
         initialize: emptyFunction,
     };
     _onClickCommand = {
@@ -225,19 +225,19 @@ export class CollectionViewBaseChrome extends React.Component<CollectionViewMenu
              getProto(this.proxy[0]).target = this.target.target;
              getProto(this.proxy[0]).source = copyField(this.target.source); 
             }}`,
-        immediate: undoBatch(() => {}),
+        immediate: undoable(() => {}, ''),
         initialize: emptyFunction,
     };
     _viewCommand = {
         params: ['target'],
         title: 'bookmark view',
         script: "this.target._freeform_panX = this.target_freeform_panX; this.target._freeform_panY = this['target-freeform_panY']; this.target._freeform_scale = this['target_freeform_scale']; gotoFrame(this.target, this['target-currentFrame']);",
-        immediate: undoBatch(() => {
+        immediate: undoable(() => {
             this.target._freeform_panX = 0;
             this.target._freeform_panY = 0;
             this.target._freeform_scale = 1;
             this.target._currentFrame = this.target._currentFrame === undefined ? undefined : 0;
-        }),
+        }, ''),
         initialize: (button: Doc) => {
             button['target-panX'] = this.target._freeform_panX;
             button['target-panY'] = this.target._freeform_panY;
@@ -249,18 +249,18 @@ export class CollectionViewBaseChrome extends React.Component<CollectionViewMenu
         params: ['target'],
         title: 'fit content',
         script: 'this.target._freeform_fitContentsToBox = !this.target._freeform_fitContentsToBox;',
-        immediate: undoBatch(() => {
+        immediate: undoable(() => {
             this.target._freeform_fitContentsToBox = !this.target._freeform_fitContentsToBox;
-        }),
+        }, ''),
         initialize: emptyFunction,
     };
     _fitContentCommand = {
         params: ['target'],
         title: 'toggle clusters',
         script: 'this.target._freeform_useClusters = !this.target._freeform_useClusters;',
-        immediate: undoBatch(() => {
+        immediate: undoable(() => {
             this.target._freeform_useClusters = !this.target._freeform_useClusters;
-        }),
+        }, ''),
         initialize: emptyFunction,
     };
     _saveFilterCommand = {
@@ -268,10 +268,10 @@ export class CollectionViewBaseChrome extends React.Component<CollectionViewMenu
         title: 'save filter',
         script: `this.target._childFilters = compareLists(this.target_childFilters,this.target._childFilters) ? undefined : copyField(this.target_childFilters); 
         this.target._searchFilterDocs = compareLists(this.target_searchFilterDocs,this.target._searchFilterDocs) ? undefined: copyField(this.target_searchFilterDocs);`,
-        immediate: undoBatch(() => {
+        immediate: undoable(() => {
             this.target._childFilters = undefined;
             this.target._searchFilterDocs = undefined;
-        }),
+        }, ''),
         initialize: (button: Doc) => {
             const activeDash = Doc.ActiveDashboard;
             if (activeDash) {
@@ -594,9 +594,9 @@ export class CollectionGridViewChrome extends React.Component<CollectionViewMenu
      */
     onNumColsChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         if (e.currentTarget.valueAsNumber > 0)
-            undoBatch(() => {
+            undoable(() => {
                 this.document.gridNumCols = e.currentTarget.valueAsNumber;
-            })();
+            }, '')();
     };
 
     /**
@@ -625,9 +625,9 @@ export class CollectionGridViewChrome extends React.Component<CollectionViewMenu
     onIncrementButtonClick = () => {
         this.clicked = true;
         this.entered && (this.document.gridNumCols as number)--;
-        undoBatch(() => {
+        undoable(() => {
             this.document.gridNumCols = this.numCols + 1;
-        })();
+        }, '')();
         this.entered = false;
     };
 
@@ -638,9 +638,9 @@ export class CollectionGridViewChrome extends React.Component<CollectionViewMenu
         this.clicked = true;
         if (this.numCols > 1 && !this.decrementLimitReached) {
             this.entered && (this.document.gridNumCols as number)++;
-            undoBatch(() => {
+            undoable(() => {
                 this.document.gridNumCols = this.numCols - 1;
-            })();
+            }, '')();
             if (this.numCols === 1) this.decrementLimitReached = true;
         }
         this.entered = false;
-- 
cgit v1.2.3-70-g09d2

