[FIX] Components: rename private method arguments

Some component methods were refering to `ctrlKey` or `shiftKey` which are not functionally meaningful. closes #3332 Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com> Signed-off-by: Rémi Rahir (rar) <rar@odoo.com>
odoo · Dec 6, 2023 · aea06fc · aea06fc
1 parent 746f13a
commit aea06fc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/components/grid/grid.ts b/src/components/grid/grid.ts
@@ -372,9 +372,9 @@ export class Grid extends Component<Props, SpreadsheetChildEnv> {
   onCellClicked(
     col: HeaderIndex,
     row: HeaderIndex,
-    { ctrlKey, shiftKey }: { ctrlKey: boolean; shiftKey: boolean }
+    { addZone, expandZone }: { addZone: boolean; expandZone: boolean }
   ) {
-    if (ctrlKey) {
+    if (addZone) {
       this.env.model.dispatch("PREPARE_SELECTION_INPUT_EXPANSION");
     }
 
@@ -384,9 +384,9 @@ export class Grid extends Component<Props, SpreadsheetChildEnv> {
     if (this.env.model.getters.getEditionMode() === "editing") {
       this.env.model.dispatch("STOP_EDITION");
     }
-    if (shiftKey) {
+    if (expandZone) {
       this.env.model.selection.setAnchorCorner(col, row);
-    } else if (ctrlKey) {
+    } else if (addZone) {
       this.env.model.selection.addCellToSelection(col, row);
     } else {
       this.env.model.selection.selectCell(col, row);

diff --git a/src/components/grid_overlay/grid_overlay.ts b/src/components/grid_overlay/grid_overlay.ts
@@ -142,7 +142,7 @@ interface Props {
   onCellClicked: (
     col: HeaderIndex,
     row: HeaderIndex,
-    modifiers: { ctrlKey: boolean; shiftKey: boolean }
+    modifiers: { addZone: boolean; expandZone: boolean }
   ) => void;
   onCellRightClicked: (col: HeaderIndex, row: HeaderIndex, coordinates: DOMCoordinates) => void;
   onGridResized: (dimension: DOMDimension) => void;
@@ -199,8 +199,8 @@ export class GridOverlay extends Component<Props, SpreadsheetChildEnv> {
     }
     const [col, row] = this.getCartesianCoordinates(ev);
     this.props.onCellClicked(col, row, {
-      shiftKey: ev.shiftKey,
-      ctrlKey: isCtrlKey(ev),
+      expandZone: ev.shiftKey,
+      addZone: isCtrlKey(ev),
     });
   }
 

diff --git a/src/components/headers_overlay/headers_overlay.ts b/src/components/headers_overlay/headers_overlay.ts
@@ -92,7 +92,7 @@ abstract class AbstractResizer extends Component<ResizerProps, SpreadsheetChildE
 
   abstract _moveElements(): void;
 
-  abstract _selectElement(index: HeaderIndex, ctrlKey: boolean): void;
+  abstract _selectElement(index: HeaderIndex, addDistinctHeader: boolean): void;
 
   abstract _increaseSelection(index: HeaderIndex): void;
 
@@ -452,8 +452,11 @@ export class ColResizer extends AbstractResizer {
     }
   }
 
-  _selectElement(index: HeaderIndex, ctrlKey: boolean): void {
-    this.env.model.selection.selectColumn(index, ctrlKey ? "newAnchor" : "overrideSelection");
+  _selectElement(index: HeaderIndex, addDistinctHeader: boolean): void {
+    this.env.model.selection.selectColumn(
+      index,
+      addDistinctHeader ? "newAnchor" : "overrideSelection"
+    );
   }
 
   _increaseSelection(index: HeaderIndex): void {
@@ -654,8 +657,11 @@ export class RowResizer extends AbstractResizer {
     }
   }
 
-  _selectElement(index: HeaderIndex, ctrlKey: boolean): void {
-    this.env.model.selection.selectRow(index, ctrlKey ? "newAnchor" : "overrideSelection");
+  _selectElement(index: HeaderIndex, addDistinctHeader: boolean): void {
+    this.env.model.selection.selectRow(
+      index,
+      addDistinctHeader ? "newAnchor" : "overrideSelection"
+    );
   }
 
   _increaseSelection(index: HeaderIndex): void {