Merge branch 'main' into fix23

Author: nakul-py

src/diff/base-unified-diff.ts

@@ -69,7 +69,7 @@ export abstract class BaseUnifiedDiffManager {
       return;
     }
     this._isDisposed = true;
-    this._deactivate();
+    this.deactivate();
   }
 
   /**
@@ -112,7 +112,7 @@ export abstract class BaseUnifiedDiffManager {
   /**
    * Deactivate the diff view
    */
-  protected _deactivate(): void {
+  protected deactivate(): void {
     this.removeToolbarButtons();
     this._cleanupEditor();
     this.showCellToolbar();
@@ -135,11 +135,9 @@ export abstract class BaseUnifiedDiffManager {
   /**
    * Accept all changes
    */
-  public acceptAll(): void {
-    const sharedModel = this.getSharedModel();
-    this._originalSource = sharedModel.getSource();
-    this._newSource = this._originalSource;
-    this._deactivate();
+  protected acceptAll(): void {
+    // simply accept the current state
+    this.deactivate();
   }
 
   /**
@@ -148,8 +146,7 @@ export abstract class BaseUnifiedDiffManager {
   public rejectAll(): void {
     const sharedModel = this.getSharedModel();
     sharedModel.setSource(this._originalSource);
-    this._newSource = this._originalSource;
-    this._deactivate();
+    this.deactivate();
   }
 
   /**
@@ -169,7 +166,7 @@ export abstract class BaseUnifiedDiffManager {
       newSource: this._newSource,
       isInitialized: this._isInitialized,
       sharedModel: this.getSharedModel(),
-      onChunkChange: () => this._deactivate()
+      onChunkChange: () => this.deactivate()
     });
 
     this._isInitialized = true;

src/diff/unified-cell.ts

@@ -38,6 +38,7 @@ export class UnifiedCellDiffManager extends BaseUnifiedDiffManager {
   }
 
   private static _activeDiffCount = 0;
+  private _toolbarObserver?: MutationObserver;
 
   /**
    * Check if this cell still has pending changes
@@ -69,29 +70,32 @@ export class UnifiedCellDiffManager extends BaseUnifiedDiffManager {
       subtree: true
     });
 
-    (this as any)._toolbarObserver = observer;
+    this._toolbarObserver = observer;
   }
 
   /**
    * Deactivate the diff view with cell toolbar.
    */
-  protected _deactivate(): void {
-    super['_deactivate']();
+  protected deactivate(): void {
+    super.deactivate();
     UnifiedCellDiffManager._activeDiffCount = Math.max(
       0,
       UnifiedCellDiffManager._activeDiffCount - 1
     );
 
-    const observer = (this as any)._toolbarObserver as MutationObserver;
-    if (observer) {
-      observer.disconnect();
+    if (this._toolbarObserver) {
+      this._toolbarObserver.disconnect();
+      this._toolbarObserver = undefined;
     }
   }
+
   /**
    * Hide the cell's toolbar while the diff is active
    */
   protected hideCellToolbar(): void {
-    const toolbar = this._cell.node.querySelector('jp-toolbar') as HTMLElement;
+    const toolbar = this._cell.node.querySelector(
+      'jp-toolbar'
+    ) as HTMLElement | null;
     if (toolbar) {
       toolbar.style.display = 'none';
     }