[FIX] Top_bar: Opening a menu should close the composer

The composer would not close its assistant when it lost focus, which was confusing, specifically when opening a topbar menu for instance. A proper fix f behaviour would require some refactoring of the edition plugin so in stable, we propose to close the composer when opening a topbar menu. closes #2238 Task: 3076218 X-original-commit: 07aa9f7 Signed-off-by: Rémi Rahir (rar) <[email protected]>
odoo · Mar 21, 2023 · 711c4ed · 711c4ed
1 parent 785ba9f
commit 711c4ed
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/src/components/top_bar/top_bar.ts b/src/components/top_bar/top_bar.ts
@@ -409,6 +409,7 @@ export class TopBar extends Component<Props, SpreadsheetChildEnv> {
     this.state.menuState.parentMenu = menu;
     this.isSelectingMenu = true;
     this.openedEl = ev.target as HTMLElement;
+    this.env.model.dispatch("STOP_EDITION");
   }
 
   closeMenus() {

diff --git a/tests/components/spreadsheet.test.ts b/tests/components/spreadsheet.test.ts
@@ -205,6 +205,15 @@ describe("Simple Spreadsheet Component", () => {
     const sheets = document.querySelectorAll(".o-all-sheets .o-sheet");
     expect(sheets).toHaveLength(model.getters.getSheetIds().length - 1);
   });
+
+  test("The composer helper should be closed on toggle topbar context menu", async () => {
+    await typeInComposerGrid("=sum(");
+    expect(parent.model.getters.getEditionMode()).not.toBe("inactive");
+    expect(fixture.querySelectorAll(".o-composer-assistant")).toHaveLength(1);
+    await simulateClick(".o-topbar-topleft .o-topbar-menu");
+    expect(parent.model.getters.getEditionMode()).toBe("inactive");
+    expect(fixture.querySelectorAll(".o-composer-assistant")).toHaveLength(0);
+  });
 });
 
 test("Can instantiate a spreadsheet with a given client id-name", async () => {

diff --git a/tests/components/top_bar.test.ts b/tests/components/top_bar.test.ts
@@ -871,3 +871,13 @@ describe("Topbar - menu item resizing with viewport", () => {
     );
   });
 });
+
+test("The composer helper should be closed on toggle topbar context menu", async () => {
+  const { model, fixture } = await mountSpreadsheet();
+  await typeInComposerTopBar("=sum(");
+  expect(model.getters.getEditionMode()).not.toBe("inactive");
+  expect(fixture.querySelectorAll(".o-composer-assistant")).toHaveLength(1);
+  await simulateClick(".o-topbar-topleft .o-topbar-menu");
+  expect(model.getters.getEditionMode()).toBe("inactive");
+  expect(fixture.querySelectorAll(".o-composer-assistant")).toHaveLength(0);
+});