Merge pull request #1376 from quadratichq/python-cell-ref-render

fix bug with python cell references and sheet id

Author: davidkircos

quadratic-client/src/app/gridGL/HTMLGrid/inlineEditor/inlineEditorHandler.ts

@@ -161,17 +161,17 @@ class InlineEditorHandler {
         y: sheet.cursor.originPosition.y,
       };
       let value: string;
+      let changeToFormula = false;
       if (initialValue) {
         value = initialValue;
         this.changeToFormula(value[0] === '=');
       } else {
         const formula = await quadraticCore.getCodeCell(this.location.sheetId, this.location.x, this.location.y);
         if (formula?.language === 'Formula') {
           value = '=' + formula.code_string;
-          this.changeToFormula(true);
+          changeToFormula = true;
         } else {
           value = (await quadraticCore.getEditCell(this.location.sheetId, this.location.x, this.location.y)) || '';
-          this.changeToFormula(false);
         }
       }
       inlineEditorMonaco.set(value);
@@ -197,6 +197,7 @@ class InlineEditorHandler {
       this.formulaExpandButton.style.lineHeight = this.height + 'px';
       inlineEditorMonaco.setColumn(value.length + 1);
       this.showDiv();
+      this.changeToFormula(changeToFormula);
       this.updateMonacoCursorPosition();
       this.keepCursorVisible();
       inlineEditorMonaco.focus();
@@ -447,7 +448,7 @@ class InlineEditorHandler {
     this.div.style.pointerEvents = 'none';
 
     if (this.formulaExpandButton) {
-      this.formulaExpandButton.style.display = 'none';
+      this.formulaExpandButton.style.visibility = 'hidden';
     }
     this.showing = false;
   }

quadratic-client/src/app/gridGL/UI/cellHighlights/CellHighlights.ts

@@ -10,6 +10,9 @@ import { CellPosition, ParseFormulaReturnType, Span } from '../../../helpers/for
 import { DASHED } from '../../dashedTextures';
 import { drawDashedRectangle, drawDashedRectangleMarching } from './cellHighlightsDraw';
 
+// TODO: these files need to be cleaned up and properly typed. Lots of untyped
+// data passed around within the data.
+
 export interface HighlightedCellRange {
   column: number;
   row: number;
@@ -134,7 +137,13 @@ export class CellHighlights extends Container {
   }
 
   private getSheet(cellSheet: string | undefined, sheetId: string): string {
-    return (cellSheet ? sheets.getSheetByName(cellSheet)?.id : sheetId) ?? sheetId;
+    if (!cellSheet) return sheetId;
+
+    // It may come in as either a sheet id or a sheet name.
+    if (sheets.getById(cellSheet)) {
+      return cellSheet;
+    }
+    return sheets.getSheetByName(cellSheet)?.id ?? sheetId;
   }
 
   public evalCoord(cell: { type: 'Relative' | 'Absolute'; coord: number }, origin: number) {
@@ -145,7 +154,7 @@ export class CellHighlights extends Container {
   }
 
   private fromCellRange(
-    cellRange: { type: 'CellRange'; start: CellPosition; end: CellPosition },
+    cellRange: { type: 'CellRange'; start: CellPosition; end: CellPosition; sheet?: string },
     origin: Coordinate,
     sheet: string,
     span: Span,
@@ -155,13 +164,12 @@ export class CellHighlights extends Container {
     const startY = this.evalCoord(cellRange.start.y, origin.y);
     const endX = this.evalCoord(cellRange.end.x, origin.x);
     const endY = this.evalCoord(cellRange.end.y, origin.y);
-
     this.highlightedCells.push({
       column: startX,
       row: startY,
       width: endX - startX,
       height: endY - startY,
-      sheet: this.getSheet(cellRange.start.sheet, sheet),
+      sheet: this.getSheet(cellRange.sheet ?? cellRange.start.sheet, sheet),
       span,
       index,
     });

quadratic-client/src/app/gridGL/pixiApp/urlParams/UrlParamsDev.ts

@@ -37,7 +37,7 @@ export class UrlParamsDev {
         this.loadSheets();
         this.loadCode();
       } catch (e) {
-        console.warn('Unable to parse URL param ?state=');
+        console.warn('Unable to parse URL param ?state=', e);
       }
     }
     this.setupListeners();

quadratic-client/src/app/helpers/formulaNotation.ts

@@ -28,16 +28,19 @@ export type CellRef =
       type: 'CellRange';
       start: CellPosition;
       end: CellPosition;
+      sheet?: string;
     }
   | {
       type: 'Cell';
       pos: CellPosition;
+      sheet?: string;
     };
 
 export type ParseFormulaReturnType = {
   parse_error_msg: string | undefined;
   parse_error_span: { start: number | null; end: number | null } | undefined;
   cell_refs: {
+    sheet?: string;
     cell_ref: CellRef;
     span: Span;
   }[];

quadratic-client/src/app/helpers/parseEditorPythonCell.ts

@@ -1,7 +1,7 @@
 import { SheetRect } from '@/app/quadratic-core-types';
 import { ParseFormulaReturnType } from './formulaNotation';
 
-export function parsePython(cellsAccessed?: SheetRect[] | null) {
+export function parsePython(cellsAccessed?: SheetRect[] | null): ParseFormulaReturnType {
   let parsedEditorContent: ParseFormulaReturnType = {
     // could be improved to check for errors within the editor content
     parse_error_msg: undefined,
@@ -21,10 +21,10 @@ export function parsePython(cellsAccessed?: SheetRect[] | null) {
           x: { type: 'Absolute', coord: Number(sheetRect.max.x) },
           y: { type: 'Absolute', coord: Number(sheetRect.max.y) },
         },
+        sheet: sheetRect.sheet_id.id,
       },
       span: { start: 0, end: 0 },
     });
   });
-
   return parsedEditorContent;
 }

quadratic-client/src/app/ui/menus/CodeEditor/useEditorCellHighlights.ts

@@ -93,7 +93,7 @@ export const useEditorCellHighlights = (
       let parsed;
 
       if (language === 'Python') {
-        parsed = parsePython(cellsAccessed) as ParseFormulaReturnType;
+        parsed = parsePython(cellsAccessed);
       }
 
       if (language === 'Formula') {