@odoo/o-spreadsheet 16.5.0-alpha.1 → 16.5.0-alpha.2

package/dist/o-spreadsheet.esm.js

@@ -2995,11 +2995,18 @@ class RangeImpl {
     constructor(args, getSheetSize) {
         this.getSheetSize = getSheetSize;
         this._zone = args.zone;
-        this.parts = args.parts;
         this.prefixSheet = args.prefixSheet;
         this.invalidXc = args.invalidXc;
         this.sheetId = args.sheetId;
         this.invalidSheetName = args.invalidSheetName;
+        let _fixedParts = [...args.parts];
+        if (args.parts.length === 1 && getZoneArea(this.zone) > 1) {
+            _fixedParts.push({ ...args.parts[0] });
+        }
+        else if (args.parts.length === 2 && getZoneArea(this.zone) === 1) {
+            _fixedParts.pop();
+        }
+        this.parts = _fixedParts;
     }
     static fromRange(range, getters) {
         if (range instanceof RangeImpl) {
@@ -4049,8 +4056,6 @@ const readonlyAllowedCommands = new Set([
     "START",
     "ACTIVATE_SHEET",
     "COPY",
-    "PREPARE_SELECTION_INPUT_EXPANSION",
-    "STOP_SELECTION_INPUT",
     "RESIZE_SHEETVIEW",
     "SET_VIEWPORT_OFFSET",
     "SELECT_SEARCH_NEXT_MATCH",
@@ -5126,8 +5131,7 @@ autofillModifiersRegistry
             return { cellData: {} };
         }
         const sheetId = data.sheetId;
-        const ranges = getters.createAdaptedRanges(cell.dependencies, x, y, sheetId);
-        const content = getters.buildFormulaContent(sheetId, cell, ranges);
+        const content = getters.getTranslatedCellFormula(sheetId, x, y, cell.compiledFormula, cell.dependencies);
         return {
             cellData: {
                 border: data.border,
@@ -22419,6 +22423,18 @@ class ConditionalFormattingPanel extends Component {
         style[tool] = !style[tool];
         this.closeMenus();
     }
+    onKeydown(event) {
+        if (event.key === "F4") {
+            const target = event.target;
+            const update = this.env.model.getters.getCycledReference({ start: target.selectionStart ?? 0, end: target.selectionEnd ?? 0 }, target.value);
+            if (!update) {
+                return;
+            }
+            target.value = update.content;
+            target.setSelectionRange(update.selection.start, update.selection.end);
+            target.dispatchEvent(new Event("input"));
+        }
+    }
     setColor(target, color) {
         this.state.rules.cellIs.style[target] = color;
         this.closeMenus();
@@ -24689,6 +24705,15 @@ function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }
             y = initialFigure.y - deltaY;
         }
     }
+    // Restrict resizing if x or y reaches header boundaries
+    if (x < 0) {
+        width += x;
+        x = 0;
+    }
+    if (y < 0) {
+        height += y;
+        y = 0;
+    }
     return { ...initialFigure, x, y, width, height };
 }
 
@@ -25281,10 +25306,29 @@ function useCellHovered(env, gridRef, callback) {
             setPosition(undefined, undefined);
         }
     }
+    function onMouseLeave(e) {
+        const x = e.offsetX;
+        const y = e.offsetY;
+        const gridRect = getBoundingRectAsPOJO(gridRef.el);
+        if (y < 0 || y > gridRect.height || x < 0 || x > gridRect.width) {
+            return updateMousePosition(e);
+        }
+        else {
+            return pause();
+        }
+    }
     useRefListener(gridRef, "mousemove", updateMousePosition);
-    useRefListener(gridRef, "mouseleave", pause);
+    useRefListener(gridRef, "mouseleave", onMouseLeave);
     useRefListener(gridRef, "mouseenter", resume);
     useRefListener(gridRef, "mousedown", recompute);
+    useExternalListener(window, "click", handleGlobalClick);
+    function handleGlobalClick(e) {
+        const target = e.target;
+        const grid = gridRef.el;
+        if (!grid.contains(target)) {
+            setPosition(undefined, undefined);
+        }
+    }
     function setPosition(col, row) {
         if (col !== hoveredPosition.col || row !== hoveredPosition.row) {
             hoveredPosition.col = col;
@@ -25608,7 +25652,6 @@ class AbstractResizer extends Component {
         const mouseUpSelect = () => {
             this.state.isSelecting = false;
             this.lastSelectedElementIndex = null;
-            this.env.model.dispatch(ev.ctrlKey ? "PREPARE_SELECTION_INPUT_EXPANSION" : "STOP_SELECTION_INPUT");
             this._computeGrabDisplay(ev);
         };
         dragAndDropBeyondTheViewport(this.env, mouseMoveSelect, mouseUpSelect);
@@ -26173,9 +26216,7 @@ class Highlight extends Component {
         let lastCol = isLeft ? z.left : z.right;
         let lastRow = isTop ? z.top : z.bottom;
         let currentZone = z;
-        this.env.model.dispatch("START_CHANGE_HIGHLIGHT", {
-            range: this.env.model.getters.getRangeDataFromZone(activeSheetId, currentZone),
-        });
+        this.env.model.dispatch("START_CHANGE_HIGHLIGHT", { zone: currentZone });
         const mouseMove = (col, row) => {
             if (lastCol !== col || lastRow !== row) {
                 lastCol = clip(col === -1 ? lastCol : col, 0, this.env.model.getters.getNumberCols(activeSheetId) - 1);
@@ -26186,21 +26227,17 @@ class Highlight extends Component {
                     right: Math.max(pivotCol, lastCol),
                     bottom: Math.max(pivotRow, lastRow),
                 };
-                newZone = this.env.model.getters.expandZone(activeSheetId, newZone);
                 if (!isEqual(newZone, currentZone)) {
-                    this.env.model.dispatch("CHANGE_HIGHLIGHT", {
-                        range: this.env.model.getters.getRangeFromZone(activeSheetId, this.env.model.getters.getUnboundedZone(activeSheetId, newZone)).rangeData,
-                    });
+                    this.env.model.selection.selectZone({
+                        cell: { col: newZone.left, row: newZone.top },
+                        zone: newZone,
+                    }, { unbounded: true });
                     currentZone = newZone;
                 }
             }
         };
         const mouseUp = () => {
             this.highlightState.shiftingMode = "none";
-            // To do:
-            // Command used here to restore focus to the current composer,
-            // to be changed when refactoring the 'edition' plugin
-            this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
         };
         dragAndDropBeyondTheViewport(this.env, mouseMove, mouseUp);
     }
@@ -26216,9 +26253,7 @@ class Highlight extends Component {
         const deltaRowMin = -z.top;
         const deltaRowMax = this.env.model.getters.getNumberRows(activeSheetId) - z.bottom - 1;
         let currentZone = z;
-        this.env.model.dispatch("START_CHANGE_HIGHLIGHT", {
-            range: this.env.model.getters.getRangeDataFromZone(activeSheetId, currentZone),
-        });
+        this.env.model.dispatch("START_CHANGE_HIGHLIGHT", { zone: currentZone });
         let lastCol = initCol;
         let lastRow = initRow;
         const mouseMove = (col, row) => {
@@ -26233,21 +26268,17 @@ class Highlight extends Component {
                     right: z.right + deltaCol,
                     bottom: z.bottom + deltaRow,
                 };
-                newZone = this.env.model.getters.expandZone(activeSheetId, newZone);
                 if (!isEqual(newZone, currentZone)) {
-                    this.env.model.dispatch("CHANGE_HIGHLIGHT", {
-                        range: this.env.model.getters.getRangeFromZone(activeSheetId, this.env.model.getters.getUnboundedZone(activeSheetId, newZone)).rangeData,
-                    });
+                    this.env.model.selection.selectZone({
+                        cell: { col: newZone.left, row: newZone.top },
+                        zone: newZone,
+                    }, { unbounded: true });
                     currentZone = newZone;
                 }
             }
         };
         const mouseUp = () => {
             this.highlightState.shiftingMode = "none";
-            // To do:
-            // Command used here to restore focus to the current composer,
-            // to be changed when refactoring the 'edition' plugin
-            this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
         };
         dragAndDropBeyondTheViewport(this.env, mouseMove, mouseUp);
     }
@@ -26740,9 +26771,6 @@ class Grid extends Component {
     // Zone selection with mouse
     // ---------------------------------------------------------------------------
     onCellClicked(col, row, { ctrlKey, shiftKey }) {
-        if (ctrlKey) {
-            this.env.model.dispatch("PREPARE_SELECTION_INPUT_EXPANSION");
-        }
         if (this.env.model.getters.hasOpenedPopover()) {
             this.closeOpenedPopover();
         }
@@ -26768,7 +26796,6 @@ class Grid extends Component {
             }
         };
         const onMouseUp = () => {
-            this.env.model.dispatch("STOP_SELECTION_INPUT");
             if (this.env.model.getters.isPaintingFormat()) {
                 this.env.model.dispatch("PASTE", {
                     target: this.env.model.getters.getSelectedZones(),
@@ -31486,8 +31513,8 @@ class CellPlugin extends CorePlugin {
         "zoneToXC",
         "getCells",
         "getFormulaCellContent",
+        "getTranslatedCellFormula",
         "getCellStyle",
-        "buildFormulaContent",
         "getCellById",
     ];
     nextId = 1;
@@ -31686,7 +31713,7 @@ class CellPlugin extends CorePlugin {
     /*
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
-    buildFormulaContent(sheetId, cell, dependencies) {
+    getFormulaCellContent(sheetId, cell, dependencies) {
         const ranges = dependencies || [...cell.dependencies];
         return concat(cell.compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
@@ -31696,8 +31723,15 @@ class CellPlugin extends CorePlugin {
             return token.value;
         }));
     }
-    getFormulaCellContent(sheetId, cell) {
-        return this.buildFormulaContent(sheetId, cell);
+    /*
+     * Constructs a formula string based on an initial formula and a translation vector
+     */
+    getTranslatedCellFormula(sheetId, offsetX, offsetY, compiledFormula, dependencies) {
+        const adaptedDependencies = this.getters.createAdaptedRanges(dependencies, offsetX, offsetY, sheetId);
+        return this.getFormulaCellContent(sheetId, {
+            compiledFormula,
+            dependencies: adaptedDependencies,
+        });
     }
     getCellStyle(position) {
         return this.getters.getCell(position)?.style || {};
@@ -31887,7 +31921,7 @@ class CellPlugin extends CorePlugin {
      */
     createFormulaCellWithDependencies(id, compiledFormula, format, style, sheetId) {
         const dependencies = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-        return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.buildFormulaContent.bind(this));
+        return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getFormulaCellContent.bind(this));
     }
     createErrorFormula(id, content, format, style, error) {
         return {
@@ -31921,19 +31955,19 @@ class FormulaCellWithDependencies {
     style;
     dependencies;
     sheetId;
-    buildFormulaContent;
+    getFormulaCellContent;
     isFormula = true;
-    constructor(id, compiledFormula, format, style, dependencies, sheetId, buildFormulaContent) {
+    constructor(id, compiledFormula, format, style, dependencies, sheetId, getFormulaCellContent) {
         this.id = id;
         this.compiledFormula = compiledFormula;
         this.format = format;
         this.style = style;
         this.dependencies = dependencies;
         this.sheetId = sheetId;
-        this.buildFormulaContent = buildFormulaContent;
+        this.getFormulaCellContent = getFormulaCellContent;
     }
     get content() {
-        return this.buildFormulaContent(this.sheetId, {
+        return this.getFormulaCellContent(this.sheetId, {
             dependencies: this.dependencies,
             compiledFormula: this.compiledFormula,
         });
@@ -36448,13 +36482,21 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
                         }
                         break;
                     case "CellIsRule":
+                        const formulas = cf.rule.values.map((value) => value.startsWith("=") ? compile(value) : undefined);
                         for (let ref of cf.ranges) {
                             const zone = this.getters.getRangeFromSheetXC(sheetId, ref).zone;
                             for (let row = zone.top; row <= zone.bottom; row++) {
                                 for (let col = zone.left; col <= zone.right; col++) {
-                                    const pr = this.rulePredicate[cf.rule.type];
-                                    let cell = this.getters.getEvaluatedCell({ sheetId, col, row });
-                                    if (pr && pr(cell, cf.rule)) {
+                                    const predicate = this.rulePredicate[cf.rule.type];
+                                    const target = { sheetId, col, row };
+                                    const values = cf.rule.values.map((value, i) => {
+                                        const compiledFormula = formulas[i];
+                                        if (compiledFormula) {
+                                            return this.getters.getTranslatedCellFormula(sheetId, col - zone.left, row - zone.top, compiledFormula, compiledFormula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)));
+                                        }
+                                        return value;
+                                    });
+                                    if (predicate && predicate(target, { ...cf.rule, values })) {
                                         if (!computedStyle[col])
                                             computedStyle[col] = [];
                                         // we must combine all the properties of all the CF rules applied to the given cell
@@ -36622,12 +36664,18 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
      * Execute the predicate to know if a conditional formatting rule should be applied to a cell
      */
     rulePredicate = {
-        CellIsRule: (cell, rule) => {
+        CellIsRule: (target, rule) => {
+            const cell = this.getters.getEvaluatedCell(target);
             if (cell.type === CellValueType.error) {
                 return false;
             }
             const locale = this.getters.getLocale();
-            const values = rule.values.map((val) => parseLiteral(val, locale));
+            const values = rule.values.map((value) => {
+                if (value.startsWith("=")) {
+                    return this.getters.evaluateFormula(target.sheetId, value);
+                }
+                return parseLiteral(value, locale);
+            });
             switch (rule.operator) {
                 case "IsEmpty":
                     return cell.value.toString().trim() === "";
@@ -38552,9 +38600,17 @@ class FindAndReplacePlugin extends UIPlugin {
             case "REPLACE_ALL_SEARCH":
                 this.replaceAll(cmd.replaceWith);
                 break;
+            case "EVALUATE_CELLS":
+            case "UPDATE_CELL":
+            case "REMOVE_FILTER_TABLE":
+            case "UPDATE_FILTER":
+                this.isSearchDirty = true;
+                break;
             case "UNDO":
             case "REDO":
             case "REMOVE_COLUMNS_ROWS":
+            case "HIDE_COLUMNS_ROWS":
+            case "UNHIDE_COLUMNS_ROWS":
             case "ADD_COLUMNS_ROWS":
             case "EVALUATE_CELLS":
             case "UPDATE_CELL":
@@ -38690,37 +38746,32 @@ class FindAndReplacePlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     // Replace
     // ---------------------------------------------------------------------------
-    /**
-     * Replace the value of the currently selected match
-     */
-    replace(replaceWith) {
-        if (this.selectedMatchIndex === null || !this.currentSearchRegex) {
+    replaceMatch(selectedMatch, replaceWith) {
+        if (!this.currentSearchRegex) {
             return;
         }
-        const matches = this.searchMatches;
-        const selectedMatch = matches[this.selectedMatchIndex];
         const sheetId = this.getters.getActiveSheetId();
         const cell = this.getters.getCell({ sheetId, ...selectedMatch });
+        const { col, row } = selectedMatch;
         if (cell?.isFormula && !this.searchOptions.searchFormulas) {
-            this.selectNextCell(Direction.next);
+            return;
         }
-        else {
-            const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
-            const toReplace = this.getSearchableString({
-                sheetId,
-                col: selectedMatch.col,
-                row: selectedMatch.row,
-            });
-            const newContent = toReplace.replace(replaceRegex, replaceWith);
-            this.dispatch("UPDATE_CELL", {
-                sheetId: this.getters.getActiveSheetId(),
-                col: selectedMatch.col,
-                row: selectedMatch.row,
-                content: canonicalizeContent(newContent, this.getters.getLocale()),
-            });
-            this.searchMatches.splice(this.selectedMatchIndex, 1);
-            this.selectNextCell(Direction.current);
+        const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
+        const toReplace = this.getSearchableString({ sheetId, col, row });
+        const content = toReplace.replace(replaceRegex, replaceWith);
+        const canonicalContent = canonicalizeContent(content, this.getters.getLocale());
+        this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
+    }
+    /**
+     * Replace the value of the currently selected match
+     */
+    replace(replaceWith) {
+        if (this.selectedMatchIndex === null) {
+            return;
         }
+        const selectedMatch = this.searchMatches[this.selectedMatchIndex];
+        this.replaceMatch(selectedMatch, replaceWith);
+        this.selectNextCell(Direction.next);
     }
     /**
      * Apply the replace function to all the matches one time.
@@ -38728,7 +38779,7 @@ class FindAndReplacePlugin extends UIPlugin {
     replaceAll(replaceWith) {
         const matchCount = this.searchMatches.length;
         for (let i = 0; i < matchCount; i++) {
-            this.replace(replaceWith);
+            this.replaceMatch(this.searchMatches[i], replaceWith);
         }
     }
     getSearchableString(position) {
@@ -39650,8 +39701,7 @@ class SelectionInputPlugin extends UIPlugin {
     static getters = [];
     ranges = [];
     focusedRangeIndex = null;
-    activeSheet;
-    willAddNewRange = false;
+    inputSheetId;
     constructor(config, initialRanges, inputHasSingleRange) {
         if (inputHasSingleRange && initialRanges.length > 1) {
             throw new Error("Input with a single range cannot be instantiated with several range references.");
@@ -39659,7 +39709,7 @@ class SelectionInputPlugin extends UIPlugin {
         super(config);
         this.inputHasSingleRange = inputHasSingleRange;
         this.insertNewRange(0, initialRanges);
-        this.activeSheet = this.getters.getActiveSheetId();
+        this.inputSheetId = this.getters.getActiveSheetId();
         if (this.ranges.length === 0) {
             this.insertNewRange(this.ranges.length, [""]);
             this.focusLast();
@@ -39685,11 +39735,33 @@ class SelectionInputPlugin extends UIPlugin {
         return 0 /* CommandResult.Success */;
     }
     handleEvent(event) {
-        const inputSheetId = this.activeSheet;
-        const sheetId = this.getters.getActiveSheetId();
-        const zone = event.anchor.zone;
-        const range = this.getters.getRangeFromZone(sheetId, event.options.unbounded ? this.getters.getUnboundedZone(sheetId, zone) : zone);
-        this.add([this.getters.getSelectionRangeString(range, inputSheetId)]);
+        if (this.focusedRangeIndex === null) {
+            return;
+        }
+        const inputSheetId = this.inputSheetId;
+        const activeSheetId = this.getters.getActiveSheetId();
+        const zone = event.options.unbounded
+            ? this.getters.getUnboundedZone(activeSheetId, event.anchor.zone)
+            : event.anchor.zone;
+        const range = this.getters.getRangeFromZone(activeSheetId, zone);
+        const willAddNewRange = event.mode === "newAnchor" &&
+            !this.inputHasSingleRange &&
+            this.ranges[this.focusedRangeIndex].xc.trim() !== "";
+        if (willAddNewRange) {
+            const xc = this.getters.getSelectionRangeString(range, inputSheetId);
+            this.insertNewRange(this.ranges.length, [xc]);
+            this.focusLast();
+        }
+        else {
+            let parts = range.parts;
+            const previousXc = this.ranges[this.focusedRangeIndex].xc.trim();
+            if (previousXc) {
+                parts = this.getters.getRangeFromSheetXC(inputSheetId, previousXc).parts;
+            }
+            const newRange = range.clone({ parts });
+            const xc = this.getters.getSelectionRangeString(newRange, inputSheetId);
+            this.setRange(this.focusedRangeIndex, [xc]);
+        }
     }
     handle(cmd) {
         switch (cmd.type) {
@@ -39725,16 +39797,6 @@ class SelectionInputPlugin extends UIPlugin {
                     this.removeRange(index);
                 }
                 break;
-            case "STOP_SELECTION_INPUT":
-                this.willAddNewRange = false;
-                break;
-            case "PREPARE_SELECTION_INPUT_EXPANSION": {
-                const index = this.focusedRangeIndex;
-                if (index !== null && !this.inputHasSingleRange) {
-                    this.willAddNewRange = this.ranges[index].xc.trim() !== "";
-                }
-                break;
-            }
             case "ACTIVATE_SHEET": {
                 if (cmd.sheetIdFrom !== cmd.sheetIdTo) {
                     const { col, row } = this.getters.getNextVisibleCellPosition({
@@ -39745,7 +39807,26 @@ class SelectionInputPlugin extends UIPlugin {
                     const zone = this.getters.expandZone(cmd.sheetIdTo, positionToZone({ col, row }));
                     this.selection.resetAnchor(this, { cell: { col, row }, zone });
                 }
+                break;
             }
+            case "START_CHANGE_HIGHLIGHT":
+                const activeSheetId = this.getters.getActiveSheetId();
+                const newZone = this.getters.expandZone(activeSheetId, cmd.zone);
+                const focusIndex = this.ranges.findIndex((range) => {
+                    const { xc, sheetName: sheet } = splitReference(range.xc);
+                    const sheetName = sheet || this.getters.getSheetName(this.inputSheetId);
+                    if (this.getters.getSheetName(activeSheetId) !== sheetName) {
+                        return false;
+                    }
+                    const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
+                    return isEqual(this.getters.expandZone(activeSheetId, refRange.zone), newZone);
+                });
+                if (focusIndex !== -1) {
+                    this.focus(focusIndex);
+                    const { left, top } = newZone;
+                    this.selection.resetAnchor(this, { cell: { col: left, row: top }, zone: newZone });
+                }
+                break;
         }
     }
     // ---------------------------------------------------------------------------
@@ -39774,19 +39855,6 @@ class SelectionInputPlugin extends UIPlugin {
     unfocus() {
         this.focusedRangeIndex = null;
     }
-    add(newRanges) {
-        if (this.focusedRangeIndex === null || newRanges.length === 0) {
-            return;
-        }
-        if (this.willAddNewRange) {
-            this.insertNewRange(this.ranges.length, newRanges);
-            this.focusLast();
-            this.willAddNewRange = false;
-        }
-        else {
-            this.setRange(this.focusedRangeIndex, newRanges);
-        }
-    }
     setContent(index, xc) {
         this.ranges[index] = {
             ...this.ranges[index],
@@ -39832,12 +39900,12 @@ class SelectionInputPlugin extends UIPlugin {
     inputToHighlights({ xc, color }) {
         const XCs = this.cleanInputs([xc])
             .filter((range) => this.getters.isRangeValid(range))
-            .filter((reference) => this.shouldBeHighlighted(this.activeSheet, reference));
+            .filter((reference) => this.shouldBeHighlighted(this.inputSheetId, reference));
         return XCs.map((xc) => {
             const { sheetName } = splitReference(xc);
             return {
-                zone: this.getters.getRangeFromSheetXC(this.activeSheet, xc).zone,
-                sheetId: (sheetName && this.getters.getSheetIdByName(sheetName)) || this.activeSheet,
+                zone: this.getters.getRangeFromSheetXC(this.inputSheetId, xc).zone,
+                sheetId: (sheetName && this.getters.getSheetIdByName(sheetName)) || this.inputSheetId,
                 color,
             };
         });
@@ -40262,10 +40330,8 @@ class SortPlugin extends UIPlugin {
                     let content = cell.content;
                     if (cell.isFormula) {
                         const position = this.getters.getCellPosition(cell.id);
-                        const offsetY = newRow - position.row;
                         // we only have a vertical offset
-                        const ranges = this.getters.createAdaptedRanges(cell.dependencies, 0, offsetY, sheetId);
-                        content = this.getters.buildFormulaContent(sheetId, cell, ranges);
+                        content = this.getters.getTranslatedCellFormula(sheetId, 0, newRow - position.row, cell.compiledFormula, cell.dependencies);
                     }
                     newCellValues.style = cell.style;
                     newCellValues.content = content;
@@ -41372,9 +41438,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             }
             let content = origin.cell.content;
             if (origin.cell.isFormula && operation === "COPY") {
-                const offsetX = col - origin.position.col;
-                const offsetY = row - origin.position.row;
-                content = this.getUpdatedContent(sheetId, origin.cell, offsetX, offsetY, operation);
+                content = this.getters.getTranslatedCellFormula(sheetId, col - origin.position.col, row - origin.position.row, origin.cell.compiledFormula, origin.cell.dependencies);
             }
             this.dispatch("UPDATE_CELL", {
                 ...target,
@@ -41395,13 +41459,6 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             }
         }
     }
-    /**
-     * Get the newly updated formula, after applying offsets
-     */
-    getUpdatedContent(sheetId, cell, offsetX, offsetY, operation) {
-        const ranges = this.getters.createAdaptedRanges(cell.dependencies, offsetX, offsetY, sheetId);
-        return this.getters.buildFormulaContent(sheetId, cell, ranges);
-    }
     /**
      * If the origin position given is the top left of a merge, merge the target
      * position.
@@ -42143,6 +42200,7 @@ class EditionPlugin extends UIPlugin {
         "getTokenAtCursor",
         "getComposerHighlights",
         "getCurrentEditedCell",
+        "getCycledReference",
     ];
     col = 0;
     row = 0;
@@ -42152,10 +42210,7 @@ class EditionPlugin extends UIPlugin {
     currentTokens = [];
     selectionStart = 0;
     selectionEnd = 0;
-    selectionInitialStart = 0;
     initialContent = "";
-    previousRef = "";
-    previousRange = undefined;
     colorIndexByRange = {};
     // ---------------------------------------------------------------------------
     // Command Handling
@@ -42184,9 +42239,6 @@ class EditionPlugin extends UIPlugin {
         }
     }
     handleEvent(event) {
-        if (this.mode !== "selecting") {
-            return;
-        }
         const sheetId = this.getters.getActiveSheetId();
         let unboundedZone;
         if (event.options.unbounded) {
@@ -42197,10 +42249,17 @@ class EditionPlugin extends UIPlugin {
         }
         switch (event.mode) {
             case "newAnchor":
-                this.insertSelectedRange(unboundedZone);
+                if (this.mode === "selecting") {
+                    this.insertSelectedRange(unboundedZone);
+                }
                 break;
             default:
-                this.replaceSelectedRanges(unboundedZone);
+                if (this.mode === "selecting") {
+                    this.replaceSelectedRange(unboundedZone);
+                }
+                else {
+                    this.updateComposerRange(event.previousAnchor.zone, unboundedZone);
+                }
                 break;
         }
     }
@@ -42257,35 +42316,12 @@ class EditionPlugin extends UIPlugin {
                 }
                 break;
             case "START_CHANGE_HIGHLIGHT":
-                // FIXME: thiws whole ordeal could be handled with the Selection Processor which would extend the feature to selection inputs
-                this.dispatch("STOP_COMPOSER_RANGE_SELECTION");
-                // FIXME: we should check range SheetId compared to this.activeSheetId r maybe not have a sheetId in the payload ??
-                const range = this.getters.getRangeFromRangeData(cmd.range);
-                const previousRefToken = this.currentTokens
-                    .filter((token) => token.type === "REFERENCE")
-                    .find((token) => {
-                    const { xc, sheetName: sheet } = splitReference(token.value);
-                    const sheetName = sheet || this.getters.getSheetName(this.sheetId);
-                    const activeSheetId = this.getters.getActiveSheetId();
-                    if (this.getters.getSheetName(activeSheetId) !== sheetName) {
-                        return false;
-                    }
-                    const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
-                    return isEqual(this.getters.expandZone(activeSheetId, refRange.zone), range.zone);
-                });
-                this.previousRef = previousRefToken.value;
-                this.previousRange = this.getters.getRangeFromSheetXC(this.getters.getActiveSheetId(), this.previousRef);
-                this.selectionInitialStart = previousRefToken.start;
-                break;
-            case "CHANGE_HIGHLIGHT":
-                const cmdRange = this.getters.getRangeFromRangeData(cmd.range);
-                const newRef = this.getRangeReference(cmdRange, this.previousRange.parts);
-                this.selectionStart = this.selectionInitialStart;
-                this.selectionEnd = this.selectionInitialStart + this.previousRef.length;
-                this.replaceSelection(newRef);
-                this.previousRef = newRef;
-                this.selectionStart = this.currentContent.length;
-                this.selectionEnd = this.currentContent.length;
+                const { left, top } = cmd.zone;
+                // changing the highlight can conflit with the 'selecting' mode
+                if (this.isSelectingForComposer()) {
+                    this.mode = "editing";
+                }
+                this.selection.resetAnchor(this, { cell: { col: left, row: top }, zone: cmd.zone });
                 break;
             case "ACTIVATE_SHEET":
                 if (!this.currentContent.startsWith("=")) {
@@ -42369,33 +42405,45 @@ class EditionPlugin extends UIPlugin {
             return this.currentTokens.find((t) => t.start <= start && t.end >= end);
         }
     }
-    // ---------------------------------------------------------------------------
-    // Misc
-    // ---------------------------------------------------------------------------
-    cycleReferences() {
-        const tokens = this.getTokensInSelection();
+    /**
+     * Return the cycled reference if any (A1 -> $A$1 -> A$1 -> $A1 -> A1)
+     */
+    getCycledReference(selection, content) {
+        const locale = this.getters.getLocale();
+        const currentTokens = content.startsWith("=") ? composerTokenize(content, locale) : [];
+        const tokens = currentTokens.filter((t) => (t.start <= selection.start && t.end >= selection.start) ||
+            (t.start >= selection.start && t.start < selection.end));
         const refTokens = tokens.filter((token) => token.type === "REFERENCE");
-        if (refTokens.length === 0)
+        if (refTokens.length === 0) {
             return;
+        }
         const updatedReferences = tokens
             .map(loopThroughReferenceType)
             .map((token) => token.value)
             .join("");
-        const content = this.currentContent;
         const start = tokens[0].start;
         const end = tokens[tokens.length - 1].end;
         const newContent = content.slice(0, start) + updatedReferences + content.slice(end);
         const lengthDiff = newContent.length - content.length;
         const startOfTokens = refTokens[0].start;
         const endOfTokens = refTokens[refTokens.length - 1].end + lengthDiff;
-        const selection = { start: startOfTokens, end: endOfTokens };
-        // Put the selection at the end of the token if we cycled on a single token
-        if (refTokens.length === 1 && this.selectionStart === this.selectionEnd) {
-            selection.start = selection.end;
+        const newSelection = { start: startOfTokens, end: endOfTokens };
+        if (refTokens.length === 1 && selection.start === selection.end) {
+            newSelection.start = newSelection.end;
+        }
+        return { content: newContent, selection: newSelection };
+    }
+    // ---------------------------------------------------------------------------
+    // Misc
+    // ---------------------------------------------------------------------------
+    cycleReferences() {
+        const updated = this.getCycledReference(this.getComposerSelection(), this.currentContent);
+        if (updated === undefined) {
+            return;
         }
         this.dispatch("SET_CURRENT_CONTENT", {
-            content: newContent,
-            selection,
+            content: updated.content,
+            selection: updated.selection,
         });
     }
     validateSelection(length, start, end) {
@@ -42443,7 +42491,6 @@ class EditionPlugin extends UIPlugin {
             this.selection.resetAnchor(this, { cell: { col: this.col, row: this.row }, zone });
         }
         this.mode = "selecting";
-        this.selectionInitialStart = this.selectionStart;
     }
     /**
      * start the edition of a cell
@@ -42603,19 +42650,49 @@ class EditionPlugin extends UIPlugin {
         const ref = this.getZoneReference(zone);
         if (this.canStartComposerRangeSelection()) {
             this.insertText(ref, start);
-            this.selectionInitialStart = start;
         }
         else {
             this.insertText("," + ref, start);
-            this.selectionInitialStart = start + 1;
         }
     }
     /**
      * Replace the current reference selected by the new one.
      * */
-    replaceSelectedRanges(zone) {
+    replaceSelectedRange(zone) {
         const ref = this.getZoneReference(zone);
-        this.replaceText(ref, this.selectionInitialStart, this.selectionEnd);
+        const currentToken = this.getTokenAtCursor();
+        const start = currentToken?.type === "REFERENCE" ? currentToken.start : this.selectionStart;
+        this.replaceText(ref, start, this.selectionEnd);
+    }
+    /**
+     * Replace the reference of the old zone by the new one.
+     */
+    updateComposerRange(oldZone, newZone) {
+        const activeSheetId = this.getters.getActiveSheetId();
+        const tokentAtCursor = this.getTokenAtCursor();
+        const tokens = tokentAtCursor ? [tokentAtCursor, ...this.currentTokens] : this.currentTokens;
+        const previousRefToken = tokens
+            .filter((token) => token.type === "REFERENCE")
+            .find((token) => {
+            const { xc, sheetName: sheet } = splitReference(token.value);
+            const sheetName = sheet || this.getters.getSheetName(this.sheetId);
+            if (this.getters.getSheetName(activeSheetId) !== sheetName) {
+                return false;
+            }
+            const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
+            return isEqual(this.getters.expandZone(activeSheetId, refRange.zone), oldZone);
+        });
+        // this function assumes that the previous range is always found because
+        // it's called when changing a highlight, which exists by definition
+        if (!previousRefToken) {
+            throw new Error("Previous range not found");
+        }
+        const previousRange = this.getters.getRangeFromSheetXC(activeSheetId, previousRefToken.value);
+        this.selectionStart = previousRefToken.start;
+        this.selectionEnd = this.selectionStart + previousRefToken.value.length;
+        const newRange = this.getters.getRangeFromZone(activeSheetId, newZone);
+        const newRef = this.getRangeReference(newRange, previousRange.parts);
+        this.replaceSelection(newRef);
     }
     getZoneReference(zone) {
         const inputSheetId = this.getters.getCurrentEditedCell().sheetId;
@@ -42623,14 +42700,8 @@ class EditionPlugin extends UIPlugin {
         const range = this.getters.getRangeFromZone(sheetId, zone);
         return this.getters.getSelectionRangeString(range, inputSheetId);
     }
-    getRangeReference(range, fixedParts = [{ colFixed: false, rowFixed: false }]) {
+    getRangeReference(range, fixedParts) {
         let _fixedParts = [...fixedParts];
-        if (fixedParts.length === 1 && getZoneArea(range.zone) > 1) {
-            _fixedParts.push({ ...fixedParts[0] });
-        }
-        else if (fixedParts.length === 2 && getZoneArea(range.zone) === 1) {
-            _fixedParts.pop();
-        }
         const newRange = range.clone({ parts: _fixedParts });
         return this.getters.getSelectionRangeString(newRange, this.getters.getCurrentEditedCell().sheetId);
     }
@@ -42757,15 +42828,6 @@ class EditionPlugin extends UIPlugin {
         }
         return false;
     }
-    /**
-     * Return all the tokens between selectionStart and selectionEnd.
-     * Includes token that begin right on selectionStart or end right on selectionEnd.
-     */
-    getTokensInSelection() {
-        const start = Math.min(this.selectionStart, this.selectionEnd);
-        const end = Math.max(this.selectionStart, this.selectionEnd);
-        return this.currentTokens.filter((t) => (t.start <= start && t.end >= start) || (t.start >= start && t.start < end));
-    }
 }
 
 class FilterEvaluationPlugin extends UIPlugin {
@@ -50299,10 +50361,17 @@ class Model extends EventBus {
      * It will call `beforeHandle` and `handle`
      */
     dispatchToHandlers(handlers, command) {
+        const isCommandCore = isCoreCommand(command);
         for (const handler of handlers) {
+            if (!isCommandCore && handler instanceof CorePlugin) {
+                continue;
+            }
             handler.beforeHandle(command);
         }
         for (const handler of handlers) {
+            if (!isCommandCore && handler instanceof CorePlugin) {
+                continue;
+            }
             handler.handle(command);
         }
     }
@@ -50488,6 +50557,9 @@ const components = {
 };
 function addFunction(functionName, functionDescription) {
     functionRegistry.add(functionName, functionDescription);
+    return {
+        addFunction: (fName, fDescription) => addFunction(fName, fDescription),
+    };
 }
 const constants = {
     DEFAULT_LOCALE,
@@ -50496,6 +50568,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.5.0-alpha.1';
-__info__.date = '2023-07-26T12:11:43.109Z';
-__info__.hash = '9160731';
+__info__.version = '16.5.0-alpha.2';
+__info__.date = '2023-08-07T09:02:00.623Z';
+__info__.hash = 'e74f3ef';