v2

Author: fdamhaut

src/components/autofill/autofill.ts

@@ -21,7 +21,7 @@ interface Position {
 
 interface State {
   position: Position;
-  oPosition: Position;
+  nextValuePosition: Position;
   handler: boolean;
 }
 
@@ -33,7 +33,7 @@ export class Autofill extends Component<Props, SpreadsheetChildEnv> {
   };
   state: State = useState({
     position: { left: 0, top: 0 },
-    oPosition: { left: 0, top: 0 },
+    nextValuePosition: { left: 0, top: 0 },
     handler: false,
   });
 
@@ -56,7 +56,7 @@ export class Autofill extends Component<Props, SpreadsheetChildEnv> {
   }
 
   get styleNextValue() {
-    const { left, top } = this.state.oPosition;
+    const { left, top } = this.state.nextValuePosition;
     return cssPropertiesToCss({
       top: `${top + 5}px`,
       left: `${left + 15}px`,
@@ -81,7 +81,7 @@ export class Autofill extends Component<Props, SpreadsheetChildEnv> {
       left: ev.clientX - this.props.position.left,
       top: ev.clientY - this.props.position.top,
     };
-    const oStart = {
+    const nextValueStart = {
       left: ev.clientX / zoom - this.props.position.left,
       top: ev.clientY / zoom - this.props.position.top,
     };
@@ -96,9 +96,9 @@ export class Autofill extends Component<Props, SpreadsheetChildEnv> {
         left: ev.clientX - start.left,
         top: ev.clientY - start.top,
       };
-      this.state.oPosition = {
-        left: ev.clientX / zoom - oStart.left,
-        top: ev.clientY / zoom - oStart.top,
+      this.state.nextValuePosition = {
+        left: ev.clientX / zoom - nextValueStart.left,
+        top: ev.clientY / zoom - nextValueStart.top,
       };
       if (lastCol !== col || lastRow !== row) {
         const activeSheetId = this.env.model.getters.getActiveSheetId();

src/components/grid_overlay/grid_overlay.ts

@@ -225,8 +225,7 @@ export class GridOverlay extends Component<Props, SpreadsheetChildEnv> {
     if (this.env.isMobile()) {
       return;
     }
-    const oMouseEvent = applyZoomLevel(this.env, ev);
-    const icon = this.getInteractiveIconAtEvent(oMouseEvent);
+    const icon = this.getInteractiveIconAtEvent(applyZoomLevel(this.env, ev));
     const hoveredIcon = icon?.type ? { id: icon.type, position: icon.position } : undefined;
     if (!deepEquals(hoveredIcon, this.hoveredIconStore.hoveredIcon)) {
       this.hoveredIconStore.setHoveredIcon(hoveredIcon);
@@ -238,17 +237,15 @@ export class GridOverlay extends Component<Props, SpreadsheetChildEnv> {
       // not main button, probably a context menu
       return;
     }
-    const oMouseEvent = applyZoomLevel(this.env, ev);
-    this.onCellClicked(oMouseEvent);
+    this.onCellClicked(applyZoomLevel(this.env, ev));
   }
 
   onClick(ev: MouseEvent) {
     if (ev.button > 0 || !this.env.isMobile()) {
       // not main button, probably a context menu
       return;
     }
-    const oMouseEvent = applyZoomLevel(this.env, ev);
-    this.onCellClicked(oMouseEvent);
+    this.onCellClicked(applyZoomLevel(this.env, ev));
   }
 
   onCellClicked(oMouseEvent: OMouseEvent<MouseEvent | PointerEvent>) {
@@ -294,8 +291,7 @@ export class GridOverlay extends Component<Props, SpreadsheetChildEnv> {
   }
 
   onContextMenu(ev: MouseEvent) {
-    const oMouseEvent = applyZoomLevel(this.env, ev);
-    const [col, row] = this.getCartesianCoordinates(oMouseEvent);
+    const [col, row] = this.getCartesianCoordinates(applyZoomLevel(this.env, ev));
     this.props.onCellRightClicked(col, row, { x: ev.clientX, y: ev.clientY });
   }
 

src/components/headers_overlay/headers_overlay.ts

@@ -189,8 +189,7 @@ abstract class AbstractResizer extends Component<ResizerProps, SpreadsheetChildE
       }
     };
     const onMouseMove = (ev: MouseEvent) => {
-      const oMouseEvent = applyZoomLevel(this.env, ev);
-      this.state.delta = this._getClientPosition(oMouseEvent) - initialPosition;
+      this.state.delta = this._getClientPosition(applyZoomLevel(this.env, ev)) - initialPosition;
       this.state.draggerLinePosition = styleValue + this.state.delta;
       if (this.state.draggerLinePosition < minSize) {
         this.state.draggerLinePosition = minSize;
@@ -324,8 +323,7 @@ abstract class AbstractResizer extends Component<ResizerProps, SpreadsheetChildE
 
   onContextMenu(ev: MouseEvent) {
     ev.preventDefault();
-    const oMouseEvent = applyZoomLevel(this.env, ev);
-    const index = this._getElementIndex(this._getEvOffset(oMouseEvent));
+    const index = this._getElementIndex(this._getEvOffset(applyZoomLevel(this.env, ev)));
     if (index < 0) return;
     if (!this._getActiveElements().has(index)) {
       this._selectElement(index, false);

src/plugins/ui_stateful/sheetview.ts

@@ -125,7 +125,7 @@ export class SheetViewPlugin extends UIPlugin {
   private sheetViewHeight: Pixel = getDefaultSheetViewSize();
   private gridOffsetX: Pixel = 0;
   private gridOffsetY: Pixel = 0;
-  private zoomLevel: number = 1.5;
+  private zoomLevel: number = 1;
 
   private sheetsWithDirtyViewports: Set<UID> = new Set();
   private shouldAdjustViewports: boolean = false;
@@ -205,7 +205,7 @@ export class SheetViewPlugin extends UIPlugin {
         this.setSheetViewOffset(cmd.offsetX, cmd.offsetY);
         break;
       case "SET_ZOOM":
-        this.zoomLevel = cmd.zoom;
+        this.zoomLevel = cmd.zoom || 1;
         break;
       case "SHIFT_VIEWPORT_DOWN":
         const sheetId = this.getters.getActiveSheetId();