@odoo/o-spreadsheet 18.4.18 → 18.4.22

package/dist/o-spreadsheet.esm.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.4.18
- * @date 2025-11-24T07:42:07.821Z
- * @hash 4f83667
+ * @version 18.4.22
+ * @date 2025-12-26T10:19:07.786Z
+ * @hash 6ddac00
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, useExternalListener, onWillUpdateProps, onWillStart, onWillPatch, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -2613,7 +2613,6 @@ const invalidateEvaluationCommands = new Set([
     "REDO",
     "ADD_MERGE",
     "REMOVE_MERGE",
-    "DUPLICATE_SHEET",
     "UPDATE_LOCALE",
     "ADD_PIVOT",
     "UPDATE_PIVOT",
@@ -5214,17 +5213,41 @@ function toCriterionDateNumber(dateValue) {
     const today = DateTime.now();
     switch (dateValue) {
         case "today":
-            return jsDateToNumber(today);
-        case "yesterday":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setDate(today.getDate() - 1)));
-        case "tomorrow":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setDate(today.getDate() + 1)));
+            return Math.floor(jsDateToNumber(today));
+        case "yesterday": {
+            today.setDate(today.getDate() - 1);
+            return Math.floor(jsDateToNumber(today));
+        }
+        case "tomorrow": {
+            today.setDate(today.getDate() + 1);
+            return Math.floor(jsDateToNumber(today));
+        }
         case "lastWeek":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setDate(today.getDate() - 7)));
-        case "lastMonth":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setMonth(today.getMonth() - 1)));
+            today.setDate(today.getDate() - 6);
+            return Math.floor(jsDateToNumber(today));
+        case "lastMonth": {
+            const lastMonth = today.getMonth() === 0 ? 11 : today.getMonth() - 1;
+            const dateInLastMonth = new DateTime(today.getFullYear(), lastMonth, 1);
+            if (today.getDate() > getDaysInMonth(dateInLastMonth)) {
+                today.setDate(1);
+            }
+            else {
+                today.setDate(today.getDate() + 1);
+                today.setMonth(today.getMonth() - 1);
+            }
+            return Math.floor(jsDateToNumber(today));
+        }
         case "lastYear":
-            return jsDateToNumber(DateTime.fromTimestamp(today.setFullYear(today.getFullYear() - 1)));
+            // Handle leap year case
+            if (today.getMonth() === 1 && today.getDate() === 29) {
+                today.setDate(28);
+                today.setFullYear(today.getFullYear() - 1);
+            }
+            else {
+                today.setDate(today.getDate() + 1);
+                today.setFullYear(today.getFullYear() - 1);
+            }
+            return Math.floor(jsDateToNumber(today));
     }
 }
 /** Get all the dates values of a criterion converted to numbers, converting date values such as "today" to actual dates  */
@@ -22582,6 +22605,9 @@ function getTreeMapGroupColors(definition, tree) {
     }));
 }
 function getTreeMapColorScale(tree, coloringOption) {
+    if (tree.length === 0) {
+        return undefined;
+    }
     const treeNodesByLevel = pyramidizeTree(tree);
     const nodes = treeNodesByLevel[treeNodesByLevel.length - 1];
     const minValue = Math.min(...nodes.map((node) => node.value));
@@ -24251,11 +24277,18 @@ function chartToImageUrl(runtime, figure, type) {
     // we have to add the canvas to the DOM otherwise it won't be rendered
     document.body.append(div);
     if ("chartJsConfig" in runtime) {
+        const extensionsLoaded = areChartJSExtensionsLoaded();
+        if (!extensionsLoaded) {
+            registerChartJSExtensions();
+        }
         const config = deepCopy(runtime.chartJsConfig);
         config.plugins = [backgroundColorChartJSPlugin];
         const chart = new window.Chart(canvas, config);
         imageContent = chart.toBase64Image();
         chart.destroy();
+        if (!extensionsLoaded) {
+            unregisterChartJsExtensions();
+        }
     }
     else if (type === "scorecard") {
         const design = getScorecardConfiguration(figure, runtime);
@@ -24285,11 +24318,18 @@ async function chartToImageFile(runtime, figure, type) {
     document.body.append(div);
     let chartBlob = null;
     if ("chartJsConfig" in runtime) {
+        const extensionsLoaded = areChartJSExtensionsLoaded();
+        if (!extensionsLoaded) {
+            registerChartJSExtensions();
+        }
         const config = deepCopy(runtime.chartJsConfig);
         config.plugins = [backgroundColorChartJSPlugin];
         const chart = new window.Chart(canvas, config);
         chartBlob = await new Promise((resolve) => canvas.toBlob(resolve, "image/png"));
         chart.destroy();
+        if (!extensionsLoaded) {
+            unregisterChartJsExtensions();
+        }
     }
     else if (type === "scorecard") {
         const design = getScorecardConfiguration(figure, runtime);
@@ -29702,7 +29742,7 @@ function escapeQueryNameSpaces(query) {
     return query.replaceAll(/([a-zA-Z0-9]+):([a-zA-Z0-9]+)/g, "NAMESPACE" + "$1" + "NAMESPACE" + "$2");
 }
 
-function getChartMenuActions(figureId, onFigureDeleted, env) {
+function getChartMenuActions(figureId, env) {
     const menuItemSpecs = [
         {
             id: "edit",
@@ -29753,11 +29793,11 @@ function getChartMenuActions(figureId, onFigureDeleted, env) {
             },
             isReadonlyAllowed: true,
         },
-        getDeleteMenuItem(figureId, onFigureDeleted, env),
+        getDeleteMenuItem(figureId, env),
     ];
     return createActions(menuItemSpecs).filter((action) => env.model.getters.isReadonly() ? action.isReadonlyAllowed : true);
 }
-function getImageMenuActions(figureId, onFigureDeleted, env) {
+function getImageMenuActions(figureId, env) {
     const menuItemSpecs = [
         getCopyMenuItem(figureId, env, _t("Image copied to clipboard")),
         getCutMenuItem(figureId, env),
@@ -29802,7 +29842,7 @@ function getImageMenuActions(figureId, onFigureDeleted, env) {
             },
             icon: "o-spreadsheet-Icon.DOWNLOAD",
         },
-        getDeleteMenuItem(figureId, onFigureDeleted, env),
+        getDeleteMenuItem(figureId, env),
     ];
     return createActions(menuItemSpecs);
 }
@@ -29838,7 +29878,7 @@ function getCutMenuItem(figureId, env) {
         icon: "o-spreadsheet-Icon.CUT",
     };
 }
-function getDeleteMenuItem(figureId, onFigureDeleted, env) {
+function getDeleteMenuItem(figureId, env) {
     return {
         id: "delete",
         name: _t("Delete"),
@@ -29848,7 +29888,6 @@ function getDeleteMenuItem(figureId, onFigureDeleted, env) {
                 sheetId: env.model.getters.getActiveSheetId(),
                 figureId,
             });
-            onFigureDeleted();
         },
         icon: "o-spreadsheet-Icon.TRASH",
     };
@@ -30693,7 +30732,7 @@ class ChartDashboardMenu extends Component {
     openContextMenu(ev) {
         this.menuState.isOpen = true;
         this.menuState.anchorRect = getBoundingRectAsPOJO(ev.currentTarget);
-        this.menuState.menuItems = getChartMenuActions(this.props.figureUI.id, () => { }, this.env);
+        this.menuState.menuItems = getChartMenuActions(this.props.figureUI.id, this.env);
     }
     get fullScreenMenuItem() {
         const definition = this.env.model.getters.getChartDefinition(this.props.figureUI.id);
@@ -30735,7 +30774,6 @@ class ChartFigure extends Component {
     static template = "o-spreadsheet-ChartFigure";
     static props = {
         figureUI: Object,
-        onFigureDeleted: Function,
     };
     static components = { ChartDashboardMenu };
     onDoubleClick() {
@@ -30759,7 +30797,6 @@ class ImageFigure extends Component {
     static template = "o-spreadsheet-ImageFigure";
     static props = {
         figureUI: Object,
-        onFigureDeleted: Function,
     };
     static components = {};
     // ---------------------------------------------------------------------------
@@ -30870,13 +30907,11 @@ class FigureComponent extends Component {
     static props = {
         figureUI: Object,
         style: { type: String, optional: true },
-        onFigureDeleted: { type: Function, optional: true },
         onMouseDown: { type: Function, optional: true },
         onClickAnchor: { type: Function, optional: true },
     };
     static components = { MenuPopover };
     static defaultProps = {
-        onFigureDeleted: () => { },
         onMouseDown: () => { },
         onClickAnchor: () => { },
     };
@@ -30953,9 +30988,6 @@ class FigureComponent extends Component {
             this.props.figureUI.id,
             this.figureRef.el,
         ]);
-        onWillUnmount(() => {
-            this.props.onFigureDeleted();
-        });
     }
     clickAnchor(dirX, dirY, ev) {
         this.props.onClickAnchor(dirX, dirY, ev);
@@ -30979,7 +31011,6 @@ class FigureComponent extends Component {
                     sheetId: this.env.model.getters.getActiveSheetId(),
                     figureId: this.props.figureUI.id,
                 });
-                this.props.onFigureDeleted();
                 ev.preventDefault();
                 ev.stopPropagation();
                 break;
@@ -31072,7 +31103,7 @@ class FigureComponent extends Component {
         this.menuState.anchorRect = anchorRect;
         this.menuState.menuItems = figureRegistry
             .get(this.props.figureUI.tag)
-            .menuBuilder(this.props.figureUI.id, this.props.onFigureDeleted, this.env);
+            .menuBuilder(this.props.figureUI.id, this.env);
     }
 }
 
@@ -31437,7 +31468,7 @@ criterionEvaluatorRegistry.add("dateIs", {
             return false;
         }
         if (["lastWeek", "lastMonth", "lastYear"].includes(criterion.dateValue)) {
-            const today = jsDateToRoundNumber(DateTime.now());
+            const today = Math.floor(jsDateToNumber(DateTime.now()));
             return isDateBetween(dateValue, today, criterionValue);
         }
         return areDatesSameDay(dateValue, criterionValue);
@@ -32642,7 +32673,7 @@ class AbstractComposerStore extends SpreadsheetStore {
         }
         this.selectionStart = start;
         this.selectionEnd = end;
-        this.editionMode = "editing";
+        this.stopComposerRangeSelection();
         this.computeFormulaCursorContext();
         this.computeParenthesisRelatedToCursor();
         this.updateAutoCompleteProvider();
@@ -33547,7 +33578,8 @@ class Composer extends Component {
                 assistantStyle["max-height"] = `${availableSpaceAbove - CLOSE_ICON_RADIUS}px`;
                 // render top
                 // We compensate 2 px of margin on the assistant style + 1px for design reasons
-                assistantStyle.transform = `translate(0, calc(-100% - ${cellHeight + 3}px))`;
+                assistantStyle.top = `-3px`;
+                assistantStyle.transform = `translate(0, -100%)`;
             }
             if (cellX + ASSISTANT_WIDTH > this.props.delimitation.width) {
                 // render left
@@ -45238,7 +45270,6 @@ class ArrayFormulaHighlight extends SpreadsheetStore {
     }
     get highlights() {
         const position = this.model.getters.getActivePosition();
-        const cell = this.getters.getEvaluatedCell(position);
         const spreader = this.model.getters.getArrayFormulaSpreadingOn(position);
         const zone = spreader
             ? this.model.getters.getSpreadZone(spreader, { ignoreSpillError: true })
@@ -45246,10 +45277,11 @@ class ArrayFormulaHighlight extends SpreadsheetStore {
         if (!zone) {
             return [];
         }
+        const isArrayFormulaBlocked = this.model.getters.isArrayFormulaSpillBlocked(spreader ?? position);
         return [
             {
                 range: this.model.getters.getRangeFromZone(position.sheetId, zone),
-                dashed: cell.value === CellErrorType.SpilledBlocked,
+                dashed: isArrayFormulaBlocked,
                 color: "#17A2B8",
                 noFill: true,
                 thinLine: true,
@@ -46347,9 +46379,7 @@ css /*SCSS*/ `
  */
 class FiguresContainer extends Component {
     static template = "o-spreadsheet-FiguresContainer";
-    static props = {
-        onFigureDeleted: Function,
-    };
+    static props = {};
     static components = { FigureComponent };
     dnd = useState({
         draggedFigure: undefined,
@@ -46724,16 +46754,16 @@ css /* scss */ `
 `;
 class GridAddRowsFooter extends Component {
     static template = "o-spreadsheet-GridAddRowsFooter";
-    static props = {
-        focusGrid: Function,
-    };
+    static props = {};
     static components = { ValidationMessages };
+    DOMFocusableElementStore;
     inputRef = useRef("inputRef");
     state = useState({
         inputValue: "100",
         errorFlag: false,
     });
     setup() {
+        this.DOMFocusableElementStore = useStore(DOMFocusableElementStore);
         useExternalListener(window, "click", this.onExternalClick, { capture: true });
     }
     get addRowsPosition() {
@@ -46751,7 +46781,7 @@ class GridAddRowsFooter extends Component {
     }
     onKeydown(ev) {
         if (ev.key.toUpperCase() === "ESCAPE") {
-            this.props.focusGrid();
+            this.focusDefaultElement();
         }
         else if (ev.key.toUpperCase() === "ENTER") {
             this.onConfirm();
@@ -46778,7 +46808,7 @@ class GridAddRowsFooter extends Component {
             quantity,
             dimension: "ROW",
         });
-        this.props.focusGrid();
+        this.focusDefaultElement();
         // After adding new rows, scroll down to the new last row
         const { scrollX } = this.env.model.getters.getActiveSheetScrollInfo();
         const { end } = this.env.model.getters.getRowDimensions(activeSheetId, rowNumber + quantity - 1);
@@ -46791,7 +46821,12 @@ class GridAddRowsFooter extends Component {
         if (this.inputRef.el !== document.activeElement || ev.target === this.inputRef.el) {
             return;
         }
-        this.props.focusGrid();
+        this.focusDefaultElement();
+    }
+    focusDefaultElement() {
+        if (document.activeElement === this.inputRef.el) {
+            this.DOMFocusableElementStore.focus();
+        }
     }
 }
 
@@ -47066,7 +47101,6 @@ class GridOverlay extends Component {
         onCellClicked: { type: Function, optional: true },
         onCellRightClicked: { type: Function, optional: true },
         onGridResized: { type: Function, optional: true },
-        onFigureDeleted: { type: Function, optional: true },
         onGridMoved: Function,
         gridOverlayDimensions: String,
         slots: { type: Object, optional: true },
@@ -47081,7 +47115,6 @@ class GridOverlay extends Component {
         onCellClicked: () => { },
         onCellRightClicked: () => { },
         onGridResized: () => { },
-        onFigureDeleted: () => { },
     };
     gridOverlay = useRef("gridOverlay");
     cellPopovers;
@@ -51940,7 +51973,7 @@ function useHighlights(highlightProvider) {
 }
 
 css /* scss */ `
-  .o-cf-preview {
+  .o-spreadsheet .o-cf-preview {
     &.o-cf-cursor-ptr {
       cursor: pointer;
     }
@@ -51948,6 +51981,7 @@ css /* scss */ `
     border-bottom: 1px solid ${GRAY_300};
     height: 80px;
     padding: 10px;
+    box-sizing: border-box;
     position: relative;
     cursor: pointer;
     &:hover,
@@ -51961,7 +51995,6 @@ css /* scss */ `
     .o-cf-preview-icon {
       border: 1px solid ${GRAY_300};
       background-color: #fff;
-      position: absolute;
       height: 50px;
       width: 50px;
       .o-icon {
@@ -51970,12 +52003,6 @@ css /* scss */ `
       }
     }
     .o-cf-preview-description {
-      left: 65px;
-      margin-bottom: auto;
-      margin-right: 8px;
-      margin-top: auto;
-      position: relative;
-      width: 142px;
       .o-cf-preview-description-rule {
         margin-bottom: 4px;
         max-height: 2.8em;
@@ -51985,16 +52012,11 @@ css /* scss */ `
         font-size: 12px;
       }
     }
-    .o-cf-delete {
-      left: 90%;
-      top: 39%;
-      position: absolute;
-    }
     &:not(:hover):not(.o-cf-dragging) .o-cf-drag-handle {
       display: none !important;
     }
     .o-cf-drag-handle {
-      left: -8px;
+      left: 2px;
       cursor: move;
       .o-icon {
         width: 6px;
@@ -56039,12 +56061,41 @@ const dateGranularities = [
 pivotRegistry.add("SPREADSHEET", {
     ui: SpreadsheetPivot,
     definition: SpreadsheetPivotRuntimeDefinition,
-    externalData: false,
     dateGranularities: [...dateGranularities],
     datetimeGranularities: [...dateGranularities, "hour_number", "minute_number", "second_number"],
     isMeasureCandidate: (field) => field.type !== "boolean",
     isGroupable: () => true,
+    adaptRanges: (getters, definition, applyChange) => {
+        if (definition.type !== "SPREADSHEET" || !definition.dataSet) {
+            return definition;
+        }
+        const { sheetId, zone } = definition.dataSet;
+        const range = getters.getRangeFromZone(sheetId, zone);
+        const adaptedRange = adaptPivotRange(range, applyChange);
+        if (adaptedRange === range) {
+            return definition;
+        }
+        const dataSet = adaptedRange && {
+            sheetId: adaptedRange.sheetId,
+            zone: adaptedRange.zone,
+        };
+        return { ...definition, dataSet };
+    },
 });
+function adaptPivotRange(range, applyChange) {
+    if (!range) {
+        return undefined;
+    }
+    const change = applyChange(range);
+    switch (change.changeType) {
+        case "NONE":
+            return range;
+        case "REMOVE":
+            return undefined;
+        default:
+            return change.range;
+    }
+}
 
 class PivotSidePanelStore extends SpreadsheetStore {
     pivotId;
@@ -62197,6 +62248,7 @@ function rangeToMerge(mergeId, range) {
 class RangeAdapter {
     getters;
     providers = [];
+    isAdaptingRanges = false;
     constructor(getters) {
         this.getters = getters;
     }
@@ -62228,6 +62280,9 @@ class RangeAdapter {
     }
     beforeHandle(command) { }
     handle(cmd) {
+        if (this.isAdaptingRanges) {
+            throw new Error("Plugins cannot dispatch commands during adaptRanges phase");
+        }
         const rangeAdapter = getRangeAdapter(cmd);
         if (rangeAdapter?.applyChange) {
             this.executeOnAllRanges(rangeAdapter.applyChange, rangeAdapter.sheetId, rangeAdapter.sheetName);
@@ -62250,10 +62305,12 @@ class RangeAdapter {
         };
     }
     executeOnAllRanges(adaptRange, sheetId, sheetName) {
+        this.isAdaptingRanges = true;
         const func = this.verifyRangeRemoved(adaptRange);
         for (const provider of this.providers) {
             provider(func, sheetId, sheetName);
         }
+        this.isAdaptingRanges = false;
     }
     /**
      * Stores the functions bound to each plugin to be able to iterate over all ranges of the application,
@@ -64289,6 +64346,18 @@ class PivotCorePlugin extends CorePlugin {
         }
     }
     adaptRanges(applyChange) {
+        for (const pivotId in this.pivots) {
+            const definition = deepCopy(this.pivots[pivotId]?.definition);
+            if (!definition) {
+                continue;
+            }
+            const newDefinition = pivotRegistry
+                .get(definition.type)
+                ?.adaptRanges?.(this.getters, definition, applyChange);
+            if (newDefinition && !deepEquals(definition, newDefinition)) {
+                this.history.update("pivots", pivotId, "definition", newDefinition);
+            }
+        }
         for (const sheetId in this.compiledMeasureFormulas) {
             for (const formulaString in this.compiledMeasureFormulas[sheetId]) {
                 const compiledFormula = this.compiledMeasureFormulas[sheetId][formulaString];
@@ -64540,20 +64609,6 @@ class SettingsPlugin extends CorePlugin {
     }
 }
 
-function adaptPivotRange(range, applyChange) {
-    if (!range) {
-        return undefined;
-    }
-    const change = applyChange(range);
-    switch (change.changeType) {
-        case "NONE":
-            return range;
-        case "REMOVE":
-            return undefined;
-        default:
-            return change.range;
-    }
-}
 class SpreadsheetPivotCorePlugin extends CorePlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
@@ -64564,24 +64619,6 @@ class SpreadsheetPivotCorePlugin extends CorePlugin {
         }
         return "Success" /* CommandResult.Success */;
     }
-    adaptRanges(applyChange) {
-        for (const pivotId of this.getters.getPivotIds()) {
-            const definition = this.getters.getPivotCoreDefinition(pivotId);
-            if (definition.type !== "SPREADSHEET") {
-                continue;
-            }
-            if (definition.dataSet) {
-                const { sheetId, zone } = definition.dataSet;
-                const range = this.getters.getRangeFromZone(sheetId, zone);
-                const adaptedRange = adaptPivotRange(range, applyChange);
-                const dataSet = adaptedRange && {
-                    sheetId: adaptedRange.sheetId,
-                    zone: adaptedRange.zone,
-                };
-                this.dispatch("UPDATE_PIVOT", { pivotId, pivot: { ...definition, dataSet } });
-            }
-        }
-    }
     checkDataSetValidity(definition) {
         if (definition.type === "SPREADSHEET" && definition.dataSet) {
             const { zone, sheetId } = definition.dataSet;
@@ -65923,6 +65960,9 @@ class Evaluator {
         const arrayFormulas = this.spreadingRelations.searchFormulaPositionsSpreadingOn(position.sheetId, positionToZone(position));
         return Array.from(arrayFormulas).find((position) => !this.blockedArrayFormulas.has(position));
     }
+    isArrayFormulaSpillBlocked(position) {
+        return this.blockedArrayFormulas.has(position);
+    }
     updateDependencies(position) {
         // removing dependencies is slow because it requires
         // to traverse the entire r-tree.
@@ -65934,13 +65974,8 @@ class Evaluator {
     addDependencies(position, dependencies) {
         this.formulaDependencies().addDependencies(position, dependencies);
         for (const range of dependencies) {
-            const sheetId = range.sheetId;
-            const { left, bottom, right, top } = range.zone;
-            for (let col = left; col <= right; col++) {
-                for (let row = top; row <= bottom; row++) {
-                    this.computeAndSave({ sheetId, col, row });
-                }
-            }
+            // ensure that all ranges are computed
+            this.compilationParams.ensureRange(range);
         }
     }
     updateCompilationParameters() {
@@ -66143,6 +66178,10 @@ class Evaluator {
         this.assertSheetHasEnoughSpaceToSpreadFormulaResult(formulaPosition, formulaReturn);
         const nbColumns = formulaReturn.length;
         const nbRows = formulaReturn[0].length;
+        if (nbRows === 0) {
+            // empty matrix
+            return createEvaluatedCell({ value: 0 }, this.getters.getLocale(), cellData);
+        }
         const resultZone = {
             top: formulaPosition.row,
             bottom: formulaPosition.row + nbRows - 1,
@@ -66418,6 +66457,7 @@ class EvaluationPlugin extends CoreViewPlugin {
         "getEvaluatedCellsPositions",
         "getSpreadZone",
         "getArrayFormulaSpreadingOn",
+        "isArrayFormulaSpillBlocked",
         "isEmpty",
     ];
     shouldRebuildDependenciesGraph = true;
@@ -66530,6 +66570,9 @@ class EvaluationPlugin extends CoreViewPlugin {
     getArrayFormulaSpreadingOn(position) {
         return this.evaluator.getArrayFormulaSpreadingOn(position);
     }
+    isArrayFormulaSpillBlocked(position) {
+        return this.evaluator.isArrayFormulaSpillBlocked(position);
+    }
     /**
      * Check if a zone only contains empty cells
      */
@@ -68579,9 +68622,7 @@ class PivotUIPlugin extends CoreViewPlugin {
     handle(cmd) {
         if (invalidateEvaluationCommands.has(cmd.type)) {
             for (const pivotId of this.getters.getPivotIds()) {
-                if (!pivotRegistry.get(this.getters.getPivotCoreDefinition(pivotId).type).externalData) {
-                    this.setupPivot(pivotId, { recreate: true });
-                }
+                this.setupPivot(pivotId, { recreate: true });
             }
         }
         switch (cmd.type) {
@@ -68789,7 +68830,7 @@ class PivotUIPlugin extends CoreViewPlugin {
         pivot.init({ reload: true });
     }
     setupPivot(pivotId, { recreate } = { recreate: false }) {
-        const definition = this.getters.getPivotCoreDefinition(pivotId);
+        const definition = deepCopy(this.getters.getPivotCoreDefinition(pivotId));
         if (!(pivotId in this.pivots)) {
             const Pivot = withPivotPresentationLayer(pivotRegistry.get(definition.type).ui);
             this.pivots[pivotId] = new Pivot(this.custom, { definition, getters: this.getters });
@@ -78042,16 +78083,18 @@ class ClickableCellsStore extends SpreadsheetStore {
     get clickableCells() {
         const cells = [];
         const getters = this.getters;
-        const sheetId = getters.getActiveSheetId();
         for (const position of this.getters.getVisibleCellPositions()) {
             const item = this.getClickableItem(position);
             if (!item) {
                 continue;
             }
             const title = typeof item.title === "function" ? item.title(position, getters) : item.title;
-            const zone = getters.expandZone(sheetId, positionToZone(position));
+            const rect = this.getClickableCellRect(position);
+            if (!rect) {
+                continue;
+            }
             cells.push({
-                coordinates: getters.getVisibleRect(zone),
+                coordinates: rect,
                 position,
                 action: item.execute,
                 title: title || "",
@@ -78059,6 +78102,31 @@ class ClickableCellsStore extends SpreadsheetStore {
         }
         return cells;
     }
+    getClickableCellRect(position) {
+        const zone = this.getters.expandZone(position.sheetId, positionToZone(position));
+        const clickableRect = this.getters.getVisibleRect(zone);
+        const icons = this.getters.getCellIcons(position);
+        const iconsAtPosition = {
+            center: icons.find((icon) => icon.horizontalAlign === "center"),
+            left: icons.find((icon) => icon.horizontalAlign === "left"),
+            right: icons.find((icon) => icon.horizontalAlign === "right"),
+        };
+        if (iconsAtPosition.center?.onClick) {
+            return undefined;
+        }
+        if (iconsAtPosition.right?.onClick) {
+            const cellRect = this.getters.getRect(zone);
+            const iconRect = this.getters.getCellIconRect(iconsAtPosition.right, cellRect);
+            clickableRect.width -= iconRect.width + iconsAtPosition.right.margin;
+        }
+        if (iconsAtPosition.left?.onClick) {
+            const cellRect = this.getters.getRect(zone);
+            const iconRect = this.getters.getCellIconRect(iconsAtPosition.left, cellRect);
+            clickableRect.x += iconRect.width + iconsAtPosition.left.margin;
+            clickableRect.width -= iconRect.width + iconsAtPosition.left.margin;
+        }
+        return clickableRect;
+    }
 }
 
 css /* scss */ `
@@ -78815,7 +78883,7 @@ class SmallBottomBar extends Component {
                 height: this.focus === "inactive" ? "26px" : "fit-content",
                 "max-height": `130px`,
             }),
-            showAssistant: !isIOS(), // Hide assistant on iOS as it breaks visually
+            showAssistant: false, // Hide assistant in small composer as it gets cropped ATM
             placeholder: this.composerStore.placeholder,
         };
     }
@@ -80307,7 +80375,7 @@ class Spreadsheet extends Component {
                 document.activeElement?.contains(this.spreadsheetRef.el)) {
                 this.focusGrid();
             }
-        }, () => [this.env.model.getters.getActiveSheetId()]);
+        });
         useExternalListener(window, "resize", () => this.render(true));
         // For some reason, the wheel event is not properly registered inside templates
         // in Chromium-based browsers based on chromium 125
@@ -84900,6 +84968,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, ClientDisconnectedError, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, LocalTransportService, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateChartEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "18.4.18";
-__info__.date = "2025-11-24T07:42:07.821Z";
-__info__.hash = "4f83667";
+__info__.version = "18.4.22";
+__info__.date = "2025-12-26T10:19:07.786Z";
+__info__.hash = "6ddac00";