fix(editor2): editor history not being reset

Author: guansss

src/components/editor2/EditorToolbar.tsx

@@ -147,7 +147,7 @@ const AutoSaveButton = (buttonProps: ButtonProps) => {
             <Callout
               intent="primary"
               icon={null}
-              className="p-0 pl-2 flex items-center"
+              className="p-0 pl-2 flex items-center gap-2"
             >
               {t.components.editor2.EditorToolbar.auto_save_interval({
                 count: AUTO_SAVE_INTERVAL / 1000 / 60,
@@ -157,7 +157,6 @@ const AutoSaveButton = (buttonProps: ButtonProps) => {
               <Button
                 icon="floppy-disk"
                 intent="primary"
-                className=""
                 onClick={() => {
                   try {
                     save()
@@ -335,7 +334,9 @@ const ErrorButton = (buttonProps: ButtonProps) => {
             ? t.components.editor2.EditorToolbar.errors_header
             : t.components.editor2.EditorToolbar.no_errors
         }
-        text={allErrors.length || undefined}
+        text={
+          allErrors.length || <Icon className="!-ml-px" icon="small-tick" />
+        }
       />
     </Popover2>
   )

src/components/editor2/editor-state.ts

@@ -279,6 +279,7 @@ export const editorAtoms = {
   reset: atom(
     null,
     (get, set, editorState: EditorState = defaultEditorState) => {
+      set(historyAtom, 'RESET')
       set(editorAtom, editorState)
       set(editorGlobalErrorsAtom, [])
       set(editorEntityErrorsAtom, {})

src/components/editor2/history.ts

@@ -34,7 +34,7 @@ interface HistoryTracker<T extends {}> {
   _current?: HistoryRecord<T>
 }
 
-function createInitialEditorHistoryState<T extends {}>(
+function createInitialTrackerState<T extends {}>(
   limit: number,
 ): InternalHistoryTracker<T> {
   const record = {
@@ -54,7 +54,7 @@ export function createHistoryAtom<T extends {}>(
   stateAtom: PrimitiveAtom<T>,
   limit: number,
 ) {
-  const historyTrackerAtom = atom(createInitialEditorHistoryState<T>(limit))
+  const historyTrackerAtom = atom(createInitialTrackerState<T>(limit))
 
   const fromInternal = <T extends {}>(
     tracker: InternalHistoryTracker<T>,
@@ -93,9 +93,18 @@ export function createHistoryAtom<T extends {}>(
 
   return atom(
     (get) => fromInternal(get(historyTrackerAtom), get(stateAtom)),
-    (get, set, update: SetStateAction<HistoryTracker<T>>) => {
+    (get, set, update: SetStateAction<HistoryTracker<T>> | 'RESET') => {
+      const internalTracker = get(historyTrackerAtom)
+
+      if (update === 'RESET') {
+        set(
+          historyTrackerAtom,
+          createInitialTrackerState<T>(internalTracker.limit),
+        )
+        return
+      }
       const { _current, ...tracker } = fromInternal(
-        get(historyTrackerAtom),
+        internalTracker,
         get(stateAtom),
       )
       if (typeof update === 'function') {