[FIX] composer: keep edition mode inactive on cursor selection change

src/components/composer/composer/abstract_composer_store.ts

@@ -154,7 +154,7 @@ export abstract class AbstractComposerStore extends SpreadsheetStore {
     }
     this.selectionStart = start;
     this.selectionEnd = end;
-    this.editionMode = "editing";
+    this.stopComposerRangeSelection();
     this.computeFormulaCursorContext();
     this.computeParenthesisRelatedToCursor();
     this.updateAutoCompleteProvider();

tests/composer/composer_integration_component.test.ts

@@ -33,6 +33,7 @@ import {
   getElComputedStyle,
   gridMouseEvent,
   keyDown,
+  keyUp,
   rightClickCell,
   selectColumnByClicking,
   simulateClick,
@@ -361,6 +362,15 @@ describe("Composer interactions", () => {
     expect(composerStore.editionMode).toBe("inactive");
   });
 
+  test("should switch topbar composer from editing to inactive when pressing Escape on cell A1 containing '=A2'", async () => {
+    setCellContent(model, "A1", "=A2");
+    await click(fixture, ".o-spreadsheet-topbar .o-composer");
+    expect(composerStore.editionMode).toBe("editing");
+    keyDown({ key: "Escape" });
+    keyUp({ key: "Escape" });
+    expect(composerStore.editionMode).toBe("inactive");
+  });
+
   test("ArrowKeys will move to neighbour cell, if not in contentFocus mode (left/right)", async () => {
     let composerEl: Element;
     composerEl = await startComposition("a");

tests/composer/composer_store.test.ts

@@ -125,6 +125,12 @@ describe("edition", () => {
     expect(composerStore.editionMode).toBe("inactive");
   });
 
+  test("should keep edition mode inactive when selection changes while composer is inactive", () => {
+    expect(composerStore.editionMode).toBe("inactive");
+    composerStore.changeComposerCursorSelection(0, 0);
+    expect(composerStore.editionMode).toBe("inactive");
+  });
+
   test("should switch to editing mode when composer cursor selection changes", () => {
     composerStore.startEdition("=sum(");
     expect(composerStore.editionMode).toBe("selecting");