@odoo/o-spreadsheet 18.3.9 → 18.3.11

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.3.9
- * @date 2025-06-19T18:24:02.754Z
- * @hash a820230
+ * @version 18.3.11
+ * @date 2025-06-27T09:13:07.206Z
+ * @hash 460d5d0
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -141,6 +141,7 @@ const FROZEN_PANE_HEADER_BORDER_COLOR = "#BCBCBC";
 const FROZEN_PANE_BORDER_COLOR = "#DADFE8";
 const COMPOSER_ASSISTANT_COLOR = "#9B359B";
 const COLOR_TRANSPARENT = "#00000000";
+const TABLE_HOVER_BACKGROUND_COLOR = "#017E8414";
 const CHART_WATERFALL_POSITIVE_COLOR = "#4EA7F2";
 const CHART_WATERFALL_NEGATIVE_COLOR = "#EA6175";
 const CHART_WATERFALL_SUBTOTAL_COLOR = "#AAAAAA";
@@ -7120,6 +7121,63 @@ function parseOSClipboardContent(content, clipboardId) {
     };
     return osClipboardContent;
 }
+/**
+ * Applies each clipboard handler to paste its corresponding data into the target.
+ */
+const applyClipboardHandlersPaste = (handlers, copiedData, target, options) => {
+    handlers.forEach(({ handlerName, handler }) => {
+        const data = copiedData[handlerName];
+        if (data) {
+            handler.paste(target, data, options);
+        }
+    });
+};
+/**
+ * Returns the paste target based on clipboard handlers.
+ * Also includes the full affected zone and the list of pasted zones for selection.
+ */
+function getPasteTargetFromHandlers(sheetId, zones, copiedData, handlers, options) {
+    let zone = undefined;
+    let selectedZones = [];
+    let target = {
+        sheetId,
+        zones,
+    };
+    for (const { handlerName, handler } of handlers) {
+        const handlerData = copiedData[handlerName];
+        if (!handlerData) {
+            continue;
+        }
+        const currentTarget = handler.getPasteTarget(sheetId, zones, handlerData, options);
+        if (currentTarget.figureId) {
+            target.figureId = currentTarget.figureId;
+        }
+        for (const targetZone of currentTarget.zones) {
+            selectedZones.push(targetZone);
+            if (zone === undefined) {
+                zone = targetZone;
+                continue;
+            }
+            zone = union(zone, targetZone);
+        }
+    }
+    return {
+        target,
+        zone,
+        selectedZones,
+    };
+}
+/**
+ * Updates the selection after a paste operation.
+ */
+const selectPastedZone = (selection, sourceZones, pastedZones) => {
+    const anchorCell = {
+        col: sourceZones[0].left,
+        row: sourceZones[0].top,
+    };
+    selection.getBackToDefault();
+    selection.selectZone({ cell: anchorCell, zone: union(...pastedZones) }, { scrollIntoView: false });
+};
 
 class ClipboardHandler {
     getters;
@@ -23037,7 +23095,7 @@ class AbstractComposerStore extends SpreadsheetStore {
     }
     captureSelection(zone, col, row) {
         this.model.selection.capture(this, {
-            cell: { col: col || zone.left, row: row || zone.right },
+            cell: { col: col ?? zone.left, row: row ?? zone.right },
             zone,
         }, {
             handleEvent: this.handleEvent.bind(this),
@@ -45798,6 +45856,9 @@ class ConditionalFormattingPanel extends Component {
                     this.switchToList();
                 }
             }
+            else if (!this.editedCF) {
+                this.switchToList();
+            }
         });
     }
     get conditionalFormats() {
@@ -49821,7 +49882,7 @@ class SpreadsheetPivot {
     }
     getTypeFromZone(sheetId, zone) {
         const cells = this.getters.getEvaluatedCellsInZone(sheetId, zone);
-        const nonEmptyCells = cells.filter((cell) => cell.type !== CellValueType.empty);
+        const nonEmptyCells = cells.filter((cell) => !(cell.type === CellValueType.empty || cell.value === ""));
         if (nonEmptyCells.length === 0) {
             return "integer";
         }
@@ -53538,15 +53599,16 @@ class GridAddRowsFooter extends Component {
     }
 }
 
+const PAINT_FORMAT_HANDLER_KEYS = [
+    "cell",
+    "border",
+    "table",
+    "conditionalFormat",
+    "merge",
+];
 class PaintFormatStore extends SpreadsheetStore {
     mutators = ["activate", "cancel", "pasteFormat"];
     highlightStore = this.get(HighlightStore);
-    clipboardHandlers = [
-        new CellClipboardHandler(this.getters, this.model.dispatch),
-        new BorderClipboardHandler(this.getters, this.model.dispatch),
-        new TableClipboardHandler(this.getters, this.model.dispatch),
-        new ConditionalFormatClipboardHandler(this.getters, this.model.dispatch),
-    ];
     status = "inactive";
     copiedData;
     constructor(get) {
@@ -53577,24 +53639,38 @@ class PaintFormatStore extends SpreadsheetStore {
     get isActive() {
         return this.status !== "inactive";
     }
+    get clipboardHandlers() {
+        return PAINT_FORMAT_HANDLER_KEYS.map((handlerName) => {
+            const HandlerClass = clipboardHandlersRegistries.cellHandlers.get(handlerName);
+            return {
+                handlerName,
+                handler: new HandlerClass(this.getters, this.model.dispatch),
+            };
+        });
+    }
     copyFormats() {
         const sheetId = this.getters.getActiveSheetId();
         const zones = this.getters.getSelectedZones();
-        const copiedData = {};
-        for (const handler of this.clipboardHandlers) {
-            Object.assign(copiedData, handler.copy(getClipboardDataPositions(sheetId, zones), false));
+        const copiedData = { zones, sheetId };
+        for (const { handlerName, handler } of this.clipboardHandlers) {
+            const handlerResult = handler.copy(getClipboardDataPositions(sheetId, zones), false);
+            if (handlerResult !== undefined) {
+                copiedData[handlerName] = handlerResult;
+            }
         }
         return copiedData;
     }
     paintFormat(sheetId, target) {
-        if (this.copiedData) {
-            for (const handler of this.clipboardHandlers) {
-                handler.paste({ zones: target, sheetId }, this.copiedData, {
-                    isCutOperation: false,
-                    pasteOption: "onlyFormat",
-                });
-            }
+        if (!this.copiedData) {
+            return;
         }
+        const options = {
+            isCutOperation: false,
+            pasteOption: "onlyFormat",
+        };
+        const { target: pasteTarget, selectedZones } = getPasteTargetFromHandlers(sheetId, target, this.copiedData, this.clipboardHandlers, options);
+        applyClipboardHandlersPaste(this.clipboardHandlers, this.copiedData, pasteTarget, options);
+        selectPastedZone(this.model.selection, target, selectedZones);
         if (this.status === "oneOff") {
             this.cancel();
         }
@@ -53641,12 +53717,8 @@ class HoveredTableStore extends SpreadsheetStore {
         this.row = undefined;
     }
     computeOverlay() {
-        if (!this.getters.isDashboard()) {
-            return;
-        }
         this.overlayColors = new PositionMap();
-        const col = this.col;
-        const row = this.row;
+        const { col, row } = this;
         if (col === undefined || row === undefined) {
             return;
         }
@@ -53655,9 +53727,16 @@ class HoveredTableStore extends SpreadsheetStore {
         if (!table) {
             return;
         }
-        const { left, right } = table.range.zone;
-        for (let c = left; c <= right; c++) {
-            this.overlayColors.set({ sheetId, col: c, row }, setColorAlpha("#017E84", 0.08));
+        const { left, right, top } = table.range.zone;
+        const isTableHeader = row < top + table.config.numberOfHeaders;
+        const doesTableRowHaveContent = range(left, right + 1).some((col) => {
+            return (!this.getters.isColHidden(sheetId, col) &&
+                this.getters.getEvaluatedCell({ sheetId, col, row }).formattedValue);
+        });
+        if (!isTableHeader && doesTableRowHaveContent) {
+            for (let col = left; col <= right; col++) {
+                this.overlayColors.set({ sheetId, col, row }, TABLE_HOVER_BACKGROUND_COLOR);
+            }
         }
     }
 }
@@ -59004,7 +59083,7 @@ class DataValidationPlugin extends CorePlugin {
         else if (newRule.criterion.type === "isValueInList") {
             newRule.criterion.values = Array.from(new Set(newRule.criterion.values));
         }
-        const adaptedRules = this.removeRangesFromRules(sheetId, newRule.ranges, rules);
+        const adaptedRules = this.removeRangesFromRules(sheetId, newRule.ranges, rules, newRule.id);
         const ruleIndex = adaptedRules.findIndex((rule) => rule.id === newRule.id);
         if (ruleIndex !== -1) {
             adaptedRules[ruleIndex] = newRule;
@@ -59014,9 +59093,12 @@ class DataValidationPlugin extends CorePlugin {
             this.history.update("rules", sheetId, [...adaptedRules, newRule]);
         }
     }
-    removeRangesFromRules(sheetId, ranges, rules) {
+    removeRangesFromRules(sheetId, ranges, rules, editingRuleId) {
         rules = deepCopy(rules);
         for (const rule of rules) {
+            if (rule.id === editingRuleId) {
+                continue; // Skip the rule being edited to preserve its place in the list
+            }
             rule.ranges = this.getters.recomputeRanges(rule.ranges, ranges);
         }
         return rules.filter((rule) => rule.ranges.length > 0);
@@ -70844,49 +70926,17 @@ class ClipboardPlugin extends UIPlugin {
         if (!copiedData) {
             return;
         }
-        let zone = undefined;
-        let selectedZones = [];
         const sheetId = this.getters.getActiveSheetId();
-        let target = {
-            sheetId,
-            zones,
-        };
         const handlers = this.selectClipboardHandlers(copiedData);
-        for (const { handlerName, handler } of handlers) {
-            const handlerData = copiedData[handlerName];
-            if (!handlerData) {
-                continue;
-            }
-            const currentTarget = handler.getPasteTarget(sheetId, zones, handlerData, options);
-            if (currentTarget.figureId) {
-                target.figureId = currentTarget.figureId;
-            }
-            for (const targetZone of currentTarget.zones) {
-                selectedZones.push(targetZone);
-                if (zone === undefined) {
-                    zone = targetZone;
-                    continue;
-                }
-                zone = union(zone, targetZone);
-            }
-        }
+        const { target, zone, selectedZones } = getPasteTargetFromHandlers(sheetId, zones, copiedData, handlers, options);
         if (zone !== undefined) {
-            this.addMissingDimensions(this.getters.getActiveSheetId(), zone.right - zone.left + 1, zone.bottom - zone.top + 1, zone.left, zone.top);
+            this.addMissingDimensions(sheetId, zone.right - zone.left + 1, zone.bottom - zone.top + 1, zone.left, zone.top);
         }
-        handlers.forEach(({ handlerName, handler }) => {
-            const handlerData = copiedData[handlerName];
-            if (handlerData) {
-                handler.paste(target, handlerData, options);
-            }
-        });
+        applyClipboardHandlersPaste(handlers, copiedData, target, options);
         if (!options?.selectTarget) {
             return;
         }
-        const selection = zones[0];
-        const col = selection.left;
-        const row = selection.top;
-        this.selection.getBackToDefault();
-        this.selection.selectZone({ cell: { col, row }, zone: union(...selectedZones) }, { scrollIntoView: false });
+        selectPastedZone(this.selection, zones, selectedZones);
     }
     /**
      * Add columns and/or rows to ensure that col + width and row + height are still
@@ -77293,26 +77343,28 @@ class SelectionStreamProcessorImpl {
                 bottom: Math.min(this.getters.getNumberRows(sheetId) - 1, bottom),
             };
         };
-        const { col: refCol, row: refRow } = this.getReferencePosition();
+        const { cell: refCell, zone: refZone } = this.getReferenceAnchor();
+        const { col: refCol, row: refRow } = refCell;
         // check if we can shrink selection
         let n = 0;
         while (result !== null) {
             n++;
             if (deltaCol < 0) {
                 const newRight = this.getNextAvailableCol(deltaCol, right - (n - 1), refRow);
-                result = refCol <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
+                result = refZone.right <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
             }
             if (deltaCol > 0) {
                 const newLeft = this.getNextAvailableCol(deltaCol, left + (n - 1), refRow);
-                result = left + n <= refCol ? expand({ top, left: newLeft, bottom, right }) : null;
+                result = left + n <= refZone.left ? expand({ top, left: newLeft, bottom, right }) : null;
             }
             if (deltaRow < 0) {
                 const newBottom = this.getNextAvailableRow(deltaRow, refCol, bottom - (n - 1));
-                result = refRow <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
+                result =
+                    refZone.bottom <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
             }
             if (deltaRow > 0) {
                 const newTop = this.getNextAvailableRow(deltaRow, refCol, top + (n - 1));
-                result = top + n <= refRow ? expand({ top: newTop, left, bottom, right }) : null;
+                result = top + n <= refZone.top ? expand({ top: newTop, left, bottom, right }) : null;
             }
             result = result ? reorderZone(result) : result;
             if (result && !isEqual(result, anchor.zone)) {
@@ -77542,18 +77594,26 @@ class SelectionStreamProcessorImpl {
      * If the anchor is hidden, browses from left to right and top to bottom to
      * find a visible cell.
      */
-    getReferencePosition() {
+    getReferenceAnchor() {
         const sheetId = this.getters.getActiveSheetId();
         const anchor = this.anchor;
         const { left, right, top, bottom } = anchor.zone;
         const { col: anchorCol, row: anchorRow } = anchor.cell;
+        const col = this.getters.isColHidden(sheetId, anchorCol)
+            ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
+            : anchorCol;
+        const row = this.getters.isRowHidden(sheetId, anchorRow)
+            ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
+            : anchorRow;
+        const zone = this.getters.expandZone(sheetId, {
+            left: col,
+            right: col,
+            top: row,
+            bottom: row,
+        });
         return {
-            col: this.getters.isColHidden(sheetId, anchorCol)
-                ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
-                : anchorCol,
-            row: this.getters.isRowHidden(sheetId, anchorRow)
-                ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
-                : anchorRow,
+            cell: { col, row },
+            zone,
         };
     }
     deltaToTarget(position, direction, step) {
@@ -80663,6 +80723,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, 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.3.9";
-__info__.date = "2025-06-19T18:24:02.754Z";
-__info__.hash = "a820230";
+__info__.version = "18.3.11";
+__info__.date = "2025-06-27T09:13:07.206Z";
+__info__.hash = "460d5d0";