2 files changed, 3 insertions, 11 deletions
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index 7a1ab3b4f..74f18cbc8 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -97,9 +97,8 @@ export namespace Field {
         });
         return script;
     }
-    export function toString(fieldIn: unknown) {
-        const field = fieldIn as FieldType;
-        if (typeof field === 'string' || typeof field === 'number' || typeof field === 'boolean') return String(field);
+    export function toString(field: FieldResult<FieldType> | FieldType | undefined) {
+        if (field instanceof Promise || typeof field === 'string' || typeof field === 'number' || typeof field === 'boolean') return String(field);
         return field?.[ToString]?.() || '';
     }
     export function IsField(field: unknown): field is FieldType;
@@ -111,7 +110,7 @@ export namespace Field {
     export function Copy(field: unknown) {
         return field instanceof ObjectField ? ObjectField.MakeCopy(field) : (field as FieldType);
     }
-    UndoManager.SetFieldPrinter(toString);
+    UndoManager.SetFieldPrinter((val: unknown) => (IsField(val) ? toString(val) : ''));
 }
 export type FieldType = number | string | boolean | ObjectField | RefField;
 export type Opt<T> = T | undefined;
@@ -463,7 +462,6 @@ export class Doc extends RefField {
             });
     }
 }
-
 export namespace Doc {
     export let SelectOnLoad: Doc | undefined;
     export function SetSelectOnLoad(doc: Doc | undefined) {
diff --git a/src/fields/RichTextUtils.ts b/src/fields/RichTextUtils.ts
index b3534dde7..8c073c87b 100644
--- a/src/fields/RichTextUtils.ts
+++ b/src/fields/RichTextUtils.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-namespace */
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-use-before-define */
 import { AssertionError } from 'assert';
@@ -175,7 +174,6 @@ export namespace RichTextUtils {
             const indentMap = new Map<ListGroup, BulletPosition[]>();
             let globalOffset = 0;
             const nodes: Node[] = [];
-            // eslint-disable-next-line no-restricted-syntax
             for (const element of structured) {
                 if (Array.isArray(element)) {
                     lists.push(element);
@@ -374,11 +372,9 @@ export namespace RichTextUtils {
         const marksToStyle = async (nodes: (Node | null)[]): Promise<docsV1.Schema$Request[]> => {
             const requests: docsV1.Schema$Request[] = [];
             let position = 1;
-            // eslint-disable-next-line no-restricted-syntax
             for (const node of nodes) {
                 if (node === null) {
                     position += 2;
-                    // eslint-disable-next-line no-continue
                     continue;
                 }
                 const { marks, attrs, nodeSize } = node;
@@ -390,9 +386,7 @@ export namespace RichTextUtils {
                 };
                 let mark: Mark;
                 const markMap = BuildMarkMap(marks);
-                // eslint-disable-next-line no-restricted-syntax
                 for (const markName of Object.keys(schema.marks)) {
-                    // eslint-disable-next-line no-cond-assign
                     if (ignored.includes(markName) || !(mark = markMap[markName])) {
                         continue;
                     }