[IMP] spreadsheet: global o-disabled CSS class

The bottom bar and the bottom bar both had a custom CSS class `o-disabled` to disable their buttons. This commit introduces a global `o-disabled` CSS class, and remove the definitions in the bottom bar and the bottom bar. The class will also be used in side panels in future commits. Part of task 3271348 closes #2331 Signed-off-by: Lucas Lefèvre (lul) <[email protected]>
odoo · Apr 12, 2023 · 3cf6910 · 3cf6910
1 parent 18dcf13
commit 3cf6910
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/src/components/bottom_bar/bottom_bar.ts b/src/components/bottom_bar/bottom_bar.ts
@@ -50,10 +50,6 @@ css/* scss */ `
     .o-bottom-bar-arrows {
       .o-bottom-bar-arrow {
         cursor: pointer;
-        &.o-disabled {
-          opacity: 0.4;
-          cursor: default;
-        }
         &:hover:not([class*="o-disabled"]) {
           .o-icon {
             opacity: 0.9;

diff --git a/src/components/spreadsheet/spreadsheet.ts b/src/components/spreadsheet/spreadsheet.ts
@@ -54,6 +54,11 @@ css/* scss */ `
     button {
       color: #333;
     }
+    .o-disabled {
+      opacity: 0.4;
+      pointer: default;
+      pointer-events: none;
+    }
 
     &,
     *,

diff --git a/src/components/top_bar/top_bar.ts b/src/components/top_bar/top_bar.ts
@@ -184,11 +184,6 @@ css/* scss */ `
           margin: 0 6px;
         }
 
-        .o-disabled {
-          opacity: 0.6;
-          cursor: default;
-        }
-
         .o-dropdown {
           position: relative;
           display: flex;

diff --git a/tests/model.test.ts b/tests/model.test.ts
@@ -129,10 +129,13 @@ describe("Model", () => {
       CommandResult.CancelledForUnknownReason
     );
 
-    expect(model.canDispatch("UPDATE_CELL", { sheetId: "42", col: 0, row: 0, content: "hey" }))
-      .toBeSuccessfullyDispatched;
-    expect(model.dispatch("UPDATE_CELL", { sheetId: "42", col: 0, row: 0, content: "hey" }))
-      .toBeSuccessfullyDispatched;
+    const sheetId = model.getters.getActiveSheetId();
+    expect(
+      model.canDispatch("UPDATE_CELL", { sheetId, col: 0, row: 0, content: "hey" })
+    ).toBeSuccessfullyDispatched();
+    expect(
+      model.dispatch("UPDATE_CELL", { sheetId, col: 0, row: 0, content: "hey" })
+    ).toBeSuccessfullyDispatched();
     corePluginRegistry.remove("myCorePlugin");
   });