@odoo/o-spreadsheet 18.2.21 → 18.2.23

package/dist/o-spreadsheet.iife.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.2.21
- * @date 2025-07-11T11:11:48.661Z
- * @hash 1c32303
+ * @version 18.2.23
+ * @date 2025-07-30T11:19:55.262Z
+ * @hash 4419b30
  */
 
 (function (exports, owl) {
@@ -8366,12 +8366,12 @@
       avg: _t("Average"),
       sum: _t("Sum"),
   };
-  const NUMBER_CHAR_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
+  const DEFAULT_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
   const AGGREGATORS_BY_FIELD_TYPE = {
-      integer: NUMBER_CHAR_AGGREGATORS,
-      char: NUMBER_CHAR_AGGREGATORS,
+      integer: DEFAULT_AGGREGATORS,
+      char: DEFAULT_AGGREGATORS,
+      datetime: DEFAULT_AGGREGATORS,
       boolean: ["count_distinct", "count", "bool_and", "bool_or"],
-      datetime: ["max", "min", "count_distinct", "count"],
   };
   const AGGREGATORS = {};
   for (const type in AGGREGATORS_BY_FIELD_TYPE) {
@@ -11308,6 +11308,7 @@ stores.inject(MyMetaStore, storeInstance);
 
   autoCompleteProviders.add("dataValidation", {
       displayAllOnInitialContent: true,
+      canBeToggled: false,
       getProposals(tokenAtCursor, content) {
           if (content.startsWith("=")) {
               return [];
@@ -11315,31 +11316,40 @@ stores.inject(MyMetaStore, storeInstance);
           if (!this.composer.currentEditedCell) {
               return [];
           }
-          const position = this.composer.currentEditedCell;
-          const rule = this.getters.getValidationRuleForCell(position);
-          if (!rule ||
-              (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
-              return [];
-          }
-          let values;
-          if (rule.criterion.type === "isValueInList") {
-              values = rule.criterion.values;
-          }
-          else {
-              const range = this.getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
-              values = Array.from(new Set(this.getters
-                  .getRangeValues(range)
-                  .filter(isNotNull)
-                  .map((value) => value.toString())
-                  .filter((val) => val !== "")));
-          }
-          return values.map((value) => ({ text: value }));
+          return getProposedValues(this.getters, this.composer.currentEditedCell).map((value) => ({
+              text: value.value?.toString() || "",
+              htmlContent: [{ value: value.label }],
+              fuzzySearchKey: value.label,
+          }));
       },
       selectProposal(tokenAtCursor, value) {
           this.composer.setCurrentContent(value);
           this.composer.stopEdition();
       },
   });
+  function getProposedValues(getters, position) {
+      const rule = getters.getValidationRuleForCell(position);
+      if (!rule ||
+          (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
+          return [];
+      }
+      let values = [];
+      if (rule.criterion.type === "isValueInList") {
+          values = rule.criterion.values.map((value) => ({ label: value, value }));
+      }
+      else {
+          const labelsSet = new Set();
+          const range = getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
+          for (const p of positions(range.zone)) {
+              const cell = getters.getEvaluatedCell({ ...p, sheetId: range.sheetId });
+              if (cell.formattedValue && !labelsSet.has(cell.formattedValue)) {
+                  labelsSet.add(cell.formattedValue);
+                  values.push({ label: cell.formattedValue, value: cell.value });
+              }
+          }
+      }
+      return values;
+  }
 
   function getHtmlContentFromPattern(pattern, value, highlightColor, className) {
       const pendingHtmlContent = [];
@@ -19110,11 +19120,17 @@ stores.inject(MyMetaStore, storeInstance);
           if (isEvaluationError(cellReference?.value)) {
               return cellReference;
           }
-          const column = cellReference === undefined
-              ? this.__originCellPosition?.col
-              : toZone(cellReference.value).left;
-          assert(() => column !== undefined, "In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter.");
-          return column + 1;
+          if (cellReference === undefined) {
+              assert(() => this.__originCellPosition?.col !== undefined, "In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter.");
+              return this.__originCellPosition.col + 1;
+          }
+          const zone = this.getters.getRangeFromSheetXC(this.getters.getActiveSheetId(), cellReference.value).zone;
+          if (zone.left === zone.right) {
+              return zone.left + 1;
+          }
+          return generateMatrix(zone.right - zone.left + 1, 1, (col, row) => ({
+              value: zone.left + col + 1,
+          }));
       },
       isExported: true,
   };
@@ -19333,11 +19349,17 @@ stores.inject(MyMetaStore, storeInstance);
           if (isEvaluationError(cellReference?.value)) {
               return cellReference;
           }
-          const row = cellReference === undefined
-              ? this.__originCellPosition?.row
-              : toZone(cellReference.value).top;
-          assert(() => row !== undefined, "In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter.");
-          return row + 1;
+          if (cellReference === undefined) {
+              assert(() => this.__originCellPosition?.row !== undefined, "In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter.");
+              return this.__originCellPosition.row + 1;
+          }
+          const zone = this.getters.getRangeFromSheetXC(this.getters.getActiveSheetId(), cellReference.value).zone;
+          if (zone.top === zone.bottom) {
+              return zone.top + 1;
+          }
+          return generateMatrix(1, zone.bottom - zone.top + 1, (col, row) => ({
+              value: zone.top + row + 1,
+          }));
       },
       isExported: true,
   };
@@ -21613,6 +21635,7 @@ stores.inject(MyMetaStore, storeInstance);
                       proposals,
                       selectProposal: provider.selectProposal,
                       autoSelectFirstProposal: provider.autoSelectFirstProposal ?? false,
+                      canBeToggled: provider.canBeToggled,
                   };
               }
               if (exactMatch && this._currentContent !== this.initialContent) {
@@ -21635,6 +21658,7 @@ stores.inject(MyMetaStore, storeInstance);
                       proposals,
                       selectProposal: provider.selectProposal,
                       autoSelectFirstProposal: provider.autoSelectFirstProposal ?? false,
+                      canBeToggled: provider.canBeToggled,
                   };
               }
           }
@@ -41306,9 +41330,13 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       closeAssistant() {
+          if (!this.canBeToggled)
+              return;
           this.assistant.forcedClosed = true;
       }
       openAssistant() {
+          if (!this.canBeToggled)
+              return;
           this.assistant.forcedClosed = false;
       }
       onWheel(event) {
@@ -41318,6 +41346,9 @@ stores.inject(MyMetaStore, storeInstance);
               event.stopPropagation();
           }
       }
+      get canBeToggled() {
+          return this.autoCompleteState.provider?.canBeToggled ?? true;
+      }
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
@@ -41453,7 +41484,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       autoComplete(value) {
-          if (!value || this.assistant.forcedClosed) {
+          if (!value || (this.assistant.forcedClosed && this.canBeToggled)) {
               return;
           }
           this.autoCompleteState.provider?.selectProposal(value);
@@ -42789,7 +42820,8 @@ stores.inject(MyMetaStore, storeInstance);
       static props = {
           editedCf: Object,
           onCancel: Function,
-          onSave: Function,
+          onExit: Function,
+          isNewCf: Boolean,
       };
       static components = {
           SelectionInput,
@@ -42808,6 +42840,7 @@ stores.inject(MyMetaStore, storeInstance);
       getTextDecoration = getTextDecoration;
       colorNumberString = colorNumberString;
       state;
+      hasEditedCf = this.props.isNewCf;
       setup() {
           this.state = owl.useState({
               errors: [],
@@ -42865,6 +42898,9 @@ stores.inject(MyMetaStore, storeInstance);
               ranges: ranges.map((xc) => this.env.model.getters.getRangeDataFromXc(sheetId, xc)),
               sheetId,
           });
+          if (result.isSuccessful) {
+              this.hasEditedCf = true;
+          }
           const reasons = result.reasons.filter((r) => r !== "NoChanges" /* CommandResult.NoChanges */);
           if (!newCf.suppressErrors) {
               this.state.errors = reasons;
@@ -42886,7 +42922,15 @@ stores.inject(MyMetaStore, storeInstance);
       onSave() {
           const result = this.updateConditionalFormat({});
           if (result.length === 0) {
-              this.props.onSave();
+              this.props.onExit();
+          }
+      }
+      onCancel() {
+          if (this.hasEditedCf) {
+              this.props.onCancel();
+          }
+          else {
+              this.props.onExit();
           }
       }
       getDefaultRules() {
@@ -47237,9 +47281,15 @@ stores.inject(MyMetaStore, storeInstance);
           return domain.reduce((current, acc) => this.filterDataEntriesFromDomainNode(current, acc), dataEntries);
       }
       filterDataEntriesFromDomainNode(dataEntries, domain) {
-          const { field, value } = domain;
+          const { field, value, type } = domain;
           const { nameWithGranularity } = this.getDimension(field);
-          return dataEntries.filter((entry) => entry[nameWithGranularity]?.value === value);
+          return dataEntries.filter((entry) => {
+              const cellValue = entry[nameWithGranularity]?.value;
+              if (type === "char") {
+                  return String(cellValue) === String(value);
+              }
+              return cellValue === value;
+          });
       }
       getDimension(nameWithGranularity) {
           return this.definition.getDimension(nameWithGranularity);
@@ -49735,6 +49785,11 @@ stores.inject(MyMetaStore, storeInstance);
       rect = this.defaultRect;
       isEditing = false;
       isCellReferenceVisible = false;
+      currentEditedCell = {
+          col: 0,
+          row: 0,
+          sheetId: this.env.model.getters.getActiveSheetId(),
+      };
       composerStore;
       composerFocusStore;
       composerInterface;
@@ -49764,7 +49819,7 @@ stores.inject(MyMetaStore, storeInstance);
           return this.isCellReferenceVisible;
       }
       get cellReference() {
-          const { col, row, sheetId } = this.composerStore.currentEditedCell;
+          const { col, row, sheetId } = this.currentEditedCell;
           const prefixSheet = sheetId !== this.env.model.getters.getActiveSheetId();
           return getFullReference(prefixSheet ? this.env.model.getters.getSheetName(sheetId) : undefined, toXC(col, row));
       }
@@ -49856,12 +49911,17 @@ stores.inject(MyMetaStore, storeInstance);
           if (!isEditing && this.composerFocusStore.activeComposer !== this.composerInterface) {
               this.composerFocusStore.focusComposer(this.composerInterface, { focusMode: "inactive" });
           }
+          let shouldRecomputeRect = isEditing && !deepEquals(this.currentEditedCell, this.composerStore.currentEditedCell);
           if (this.isEditing !== isEditing) {
               this.isEditing = isEditing;
               if (!isEditing) {
                   this.rect = this.defaultRect;
                   return;
               }
+              this.currentEditedCell = this.composerStore.currentEditedCell;
+              shouldRecomputeRect = true;
+          }
+          if (shouldRecomputeRect) {
               const position = this.env.model.getters.getActivePosition();
               const zone = this.env.model.getters.expandZone(position.sheetId, positionToZone(position));
               this.rect = this.env.model.getters.getVisibleRect(zone);
@@ -62970,6 +63030,23 @@ stores.inject(MyMetaStore, storeInstance);
       static getters = ["getRowSize", "getHeaderSize"];
       tallestCellInRow = {};
       ctx = document.createElement("canvas").getContext("2d");
+      beforeHandle(cmd) {
+          switch (cmd.type) {
+              // Ensure rows are updated before "UPDATE_CELL" is dispatched from cell plugin.
+              // "UPDATE_CELL" uses the Sheet core plugin to access row data.
+              // If "ADD_COLUMNS_ROWS" has not been processed yet by header_sizes_ui,
+              // size updates may apply to incorrect (pre-insert) rows.
+              case "ADD_COLUMNS_ROWS":
+                  if (cmd.dimension === "COL") {
+                      return;
+                  }
+                  const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
+                  const newCells = Array(cmd.quantity).fill(undefined);
+                  const newTallestCells = insertItemsAtIndex(this.tallestCellInRow[cmd.sheetId], newCells, addIndex);
+                  this.history.update("tallestCellInRow", cmd.sheetId, newTallestCells);
+                  break;
+          }
+      }
       handle(cmd) {
           switch (cmd.type) {
               case "START":
@@ -62999,16 +63076,6 @@ stores.inject(MyMetaStore, storeInstance);
                   this.history.update("tallestCellInRow", cmd.sheetId, tallestCells);
                   break;
               }
-              case "ADD_COLUMNS_ROWS": {
-                  if (cmd.dimension === "COL") {
-                      return;
-                  }
-                  const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
-                  const newCells = Array(cmd.quantity).fill(undefined);
-                  const newTallestCells = insertItemsAtIndex(this.tallestCellInRow[cmd.sheetId], newCells, addIndex);
-                  this.history.update("tallestCellInRow", cmd.sheetId, newTallestCells);
-                  break;
-              }
               case "RESIZE_COLUMNS_ROWS":
                   {
                       const sheetId = cmd.sheetId;
@@ -68761,6 +68828,14 @@ stores.inject(MyMetaStore, storeInstance);
           const isBasedBefore = cmd.base < start;
           const deltaCol = isBasedBefore && isCol ? thickness : 0;
           const deltaRow = isBasedBefore && !isCol ? thickness : 0;
+          const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
+          const originalSize = Object.fromEntries(toRemove.map((element) => {
+              const size = isCol
+                  ? this.getters.getColSize(cmd.sheetId, element)
+                  : this.getters.getUserRowSize(cmd.sheetId, element);
+              const isDefaultCol = isCol && size === DEFAULT_CELL_WIDTH;
+              return [element, isDefaultCol ? undefined : size];
+          }));
           const target = [
               {
                   left: isCol ? start + deltaCol : 0,
@@ -68791,13 +68866,12 @@ stores.inject(MyMetaStore, storeInstance);
           const col = selection.left;
           const row = selection.top;
           this.setSelectionMixin({ zone: selection, cell: { col, row } }, [selection]);
-          const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
           let currentIndex = isBasedBefore ? cmd.base : cmd.base + 1;
           const resizingGroups = {};
           for (const element of toRemove) {
-              const size = this.getters.getHeaderSize(cmd.sheetId, cmd.dimension, element);
+              const size = originalSize[element];
               const currentSize = this.getters.getHeaderSize(cmd.sheetId, cmd.dimension, currentIndex);
-              if (size != currentSize) {
+              if (size && size != currentSize) {
                   resizingGroups[size] ??= [];
                   resizingGroups[size].push(currentIndex);
                   currentIndex += 1;
@@ -70482,14 +70556,12 @@ stores.inject(MyMetaStore, storeInstance);
           this.editionState = "initializing";
       }
       stopEdition() {
-          const input = this.sheetNameRef.el;
-          if (!this.state.isEditing || !input)
+          if (!this.state.isEditing || !this.sheetNameRef.el)
               return;
           this.state.isEditing = false;
           this.editionState = "initializing";
-          input.blur();
+          this.sheetNameRef.el.blur();
           const inputValue = this.getInputContent() || "";
-          input.innerText = inputValue;
           interactiveRenameSheet(this.env, this.props.sheetId, inputValue, () => this.startEdition());
       }
       cancelEdition() {
@@ -77186,9 +77258,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.2.21";
-  __info__.date = "2025-07-11T11:11:48.661Z";
-  __info__.hash = "1c32303";
+  __info__.version = "18.2.23";
+  __info__.date = "2025-07-30T11:19:55.262Z";
+  __info__.hash = "4419b30";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);