@odoo/o-spreadsheet 18.1.2 → 18.1.4

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.1.2
- * @date 2025-01-15T08:06:07.728Z
- * @hash 002aa4a
+ * @version 18.1.4
+ * @date 2025-01-29T06:27:32.901Z
+ * @hash a11ef27
  */
 
 (function (exports, owl) {
@@ -4379,15 +4379,18 @@
       let currentIndex;
       let currentVal;
       let currentType;
+      const getValue = sortOrder === "desc"
+          ? (i) => normalizeValue(getValueInData(data, rangeLength - i - 1))
+          : (i) => normalizeValue(getValueInData(data, i));
       while (indexRight - indexLeft >= 0) {
           indexMedian = Math.floor((indexLeft + indexRight) / 2);
           currentIndex = indexMedian;
-          currentVal = normalizeValue(getValueInData(data, currentIndex));
+          currentVal = getValue(currentIndex);
           currentType = typeof currentVal;
           // 1 - linear search to find value with the same type
           while (indexLeft < currentIndex && targetType !== currentType) {
               currentIndex--;
-              currentVal = normalizeValue(getValueInData(data, currentIndex));
+              currentVal = getValue(currentIndex);
               currentType = typeof currentVal;
           }
           if (currentType !== targetType || currentVal === undefined || currentVal === null) {
@@ -4403,8 +4406,7 @@
               if (matchVal === undefined ||
                   matchVal === null ||
                   matchVal < currentVal ||
-                  (matchVal === currentVal && sortOrder === "asc" && matchValIndex < currentIndex) ||
-                  (matchVal === currentVal && sortOrder === "desc" && matchValIndex > currentIndex)) {
+                  (matchVal === currentVal && matchValIndex < currentIndex)) {
                   matchVal = currentVal;
                   matchValIndex = currentIndex;
               }
@@ -4412,15 +4414,13 @@
           else if (mode === "nextGreater" && currentVal >= _target) {
               if (matchVal === undefined ||
                   matchVal > currentVal ||
-                  (matchVal === currentVal && sortOrder === "asc" && matchValIndex < currentIndex) ||
-                  (matchVal === currentVal && sortOrder === "desc" && matchValIndex > currentIndex)) {
+                  (matchVal === currentVal && matchValIndex < currentIndex)) {
                   matchVal = currentVal;
                   matchValIndex = currentIndex;
               }
           }
           // 3 - give new indexes for the Binary search
-          if ((sortOrder === "asc" && currentVal > _target) ||
-              (sortOrder === "desc" && currentVal <= _target)) {
+          if (currentVal > _target || (mode === "strict" && currentVal === _target)) {
               indexRight = currentIndex - 1;
           }
           else {
@@ -4428,7 +4428,10 @@
           }
       }
       // note that valMinIndex could be 0
-      return matchValIndex !== undefined ? matchValIndex : -1;
+      if (matchValIndex === undefined) {
+          return -1;
+      }
+      return sortOrder === "desc" ? rangeLength - matchValIndex - 1 : matchValIndex;
   }
   /**
    * Perform a linear search and return the index of the match.
@@ -9654,13 +9657,13 @@ stores.inject(MyMetaStore, storeInstance);
       else if (ds.labelCell) {
           label = {
               reference: getters.getRangeString(ds.labelCell, "forceSheetReference", {
-                  useFixedReference: true,
+                  useBoundedReference: true,
               }),
           };
       }
       return {
           label,
-          range: getters.getRangeString(dataRange, "forceSheetReference", { useFixedReference: true }),
+          range: getters.getRangeString(dataRange, "forceSheetReference", { useBoundedReference: true }),
           backgroundColor: ds.backgroundColor,
           rightYAxis: ds.rightYAxis,
       };
@@ -9675,7 +9678,7 @@ stores.inject(MyMetaStore, storeInstance);
           zone.top = zone.top + 1;
       }
       const range = labelRange.clone({ zone });
-      return getters.getRangeString(range, "forceSheetReference", { useFixedReference: true });
+      return getters.getRangeString(range, "forceSheetReference", { useBoundedReference: true });
   }
   /**
    * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -32202,6 +32205,10 @@ stores.inject(MyMetaStore, storeInstance);
               this.currentDisplayValue = newDisplay;
               if (!anchor)
                   return;
+              el.style.top = "";
+              el.style.left = "";
+              el.style["max-height"] = "";
+              el.style["max-width"] = "";
               const propsMaxSize = { width: this.props.maxWidth, height: this.props.maxHeight };
               let elDims = {
                   width: el.getBoundingClientRect().width,
@@ -48637,7 +48644,7 @@ stores.inject(MyMetaStore, storeInstance);
               return;
           }
           const sheetId = this.env.model.getters.getActiveSheetId();
-          const zone = this.env.model.getters.getSelectedZone();
+          const zone = positionToZone(this.env.model.getters.getSelection().anchor.cell);
           const rect = this.env.model.getters.getVisibleRect(zone);
           if (!deepEquals(rect, this.rect) || sheetId !== this.composerStore.currentEditedCell.sheetId) {
               this.isCellReferenceVisible = true;
@@ -50473,13 +50480,23 @@ stores.inject(MyMetaStore, storeInstance);
       drawLayer(renderingContext, layer) {
           switch (layer) {
               case "Background":
-                  const boxes = this.getGridBoxes();
-                  this.drawBackground(renderingContext, boxes);
-                  this.drawOverflowingCellBackground(renderingContext, boxes);
-                  this.drawCellBackground(renderingContext, boxes);
-                  this.drawBorders(renderingContext, boxes);
-                  this.drawTexts(renderingContext, boxes);
-                  this.drawIcon(renderingContext, boxes);
+                  this.drawGlobalBackground(renderingContext);
+                  for (const zone of this.getters.getAllActiveViewportsZones()) {
+                      const { ctx } = renderingContext;
+                      ctx.save();
+                      ctx.beginPath();
+                      const rect = this.getters.getVisibleRect(zone);
+                      ctx.rect(rect.x, rect.y, rect.width, rect.height);
+                      ctx.clip();
+                      const boxes = this.getGridBoxes(zone);
+                      this.drawBackground(renderingContext, boxes);
+                      this.drawOverflowingCellBackground(renderingContext, boxes);
+                      this.drawCellBackground(renderingContext, boxes);
+                      this.drawBorders(renderingContext, boxes);
+                      this.drawTexts(renderingContext, boxes);
+                      this.drawIcon(renderingContext, boxes);
+                      ctx.restore();
+                  }
                   this.drawFrozenPanes(renderingContext);
                   break;
               case "Headers":
@@ -50490,12 +50507,15 @@ stores.inject(MyMetaStore, storeInstance);
                   break;
           }
       }
-      drawBackground(renderingContext, boxes) {
-          const { ctx, thinLineWidth } = renderingContext;
+      drawGlobalBackground(renderingContext) {
+          const { ctx } = renderingContext;
           const { width, height } = this.getters.getSheetViewDimensionWithHeaders();
           // white background
           ctx.fillStyle = "#ffffff";
           ctx.fillRect(0, 0, width + CANVAS_SHIFT, height + CANVAS_SHIFT);
+      }
+      drawBackground(renderingContext, boxes) {
+          const { ctx, thinLineWidth } = renderingContext;
           const areGridLinesVisible = !this.getters.isDashboard() &&
               this.getters.getGridLinesVisibility(this.getters.getActiveSheetId());
           const inset = areGridLinesVisible ? 0.1 * thinLineWidth : 0;
@@ -50926,7 +50946,7 @@ stores.inject(MyMetaStore, storeInstance);
           const position = { sheetId, col, row };
           const cell = this.getters.getEvaluatedCell(position);
           const showFormula = this.getters.shouldShowFormulas();
-          const { x, y, width, height } = this.getters.getVisibleRect(zone);
+          const { x, y, width, height } = this.getters.getRect(zone);
           const { verticalAlign } = this.getters.getCellStyle(position);
           let style = this.getters.getCellComputedStyle(position);
           if (this.fingerprints.isEnabled) {
@@ -51051,12 +51071,16 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return box;
       }
-      getGridBoxes() {
+      getGridBoxes(zone) {
           const boxes = [];
-          const visibleCols = this.getters.getSheetViewVisibleCols();
+          const visibleCols = this.getters
+              .getSheetViewVisibleCols()
+              .filter((col) => col >= zone.left && col <= zone.right);
           const left = visibleCols[0];
           const right = visibleCols[visibleCols.length - 1];
-          const visibleRows = this.getters.getSheetViewVisibleRows();
+          const visibleRows = this.getters
+              .getSheetViewVisibleRows()
+              .filter((row) => row >= zone.top && row <= zone.bottom);
           const top = visibleRows[0];
           const bottom = visibleRows[visibleRows.length - 1];
           const viewport = { left, right, top, bottom };
@@ -53288,7 +53312,7 @@ stores.inject(MyMetaStore, storeInstance);
       /*
        * Reconstructs the original formula string based on new dependencies
        */
-      getFormulaString(sheetId, tokens, dependencies, useFixedReference = false) {
+      getFormulaString(sheetId, tokens, dependencies, useBoundedReference = false) {
           if (!dependencies.length) {
               return concat(tokens.map((token) => token.value));
           }
@@ -53296,7 +53320,7 @@ stores.inject(MyMetaStore, storeInstance);
           return concat(tokens.map((token) => {
               if (token.type === "REFERENCE") {
                   const range = dependencies[rangeIndex++];
-                  return this.getters.getRangeString(range, sheetId, { useFixedReference });
+                  return this.getters.getRangeString(range, sheetId, { useBoundedReference });
               }
               return token.value;
           }));
@@ -53576,7 +53600,7 @@ stores.inject(MyMetaStore, storeInstance);
               if (token.type === "REFERENCE") {
                   const index = rangeIndex++;
                   return this.getRangeString(this.compiledFormula.dependencies[index], this.sheetId, {
-                      useFixedReference: true,
+                      useBoundedReference: true,
                   });
               }
               return token.value;
@@ -53913,7 +53937,7 @@ stores.inject(MyMetaStore, storeInstance);
           if (data.sheets) {
               for (let sheet of data.sheets) {
                   if (this.cfRules[sheet.id]) {
-                      sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                      sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useBoundedReference: true }));
                   }
               }
           }
@@ -53982,9 +54006,9 @@ stores.inject(MyMetaStore, storeInstance);
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
-      mapToConditionalFormat(sheetId, cf, { useFixedReference } = { useFixedReference: false }) {
+      mapToConditionalFormat(sheetId, cf, { useBoundedReference } = { useBoundedReference: false }) {
           const ranges = cf.ranges.map((range) => {
-              return this.getters.getRangeString(range, sheetId, { useFixedReference });
+              return this.getters.getRangeString(range, sheetId, { useBoundedReference });
           });
           if (cf.rule.type !== "DataBarRule") {
               return {
@@ -53999,7 +54023,7 @@ stores.inject(MyMetaStore, storeInstance);
                   ...cf.rule,
                   rangeValues: cf.rule.rangeValues &&
                       this.getters.getRangeString(cf.rule.rangeValues, sheetId, {
-                          useFixedReference,
+                          useBoundedReference,
                       }),
               },
               ranges,
@@ -54440,10 +54464,20 @@ stores.inject(MyMetaStore, storeInstance);
           for (const sheet of data.sheets) {
               sheet.dataValidationRules = [];
               for (const rule of this.rules[sheet.id]) {
-                  sheet.dataValidationRules.push({
-                      ...rule,
-                      ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useFixedReference: true })),
-                  });
+                  const excelRule = {
+                      ...deepCopy(rule),
+                      ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useBoundedReference: true })),
+                  };
+                  if (rule.criterion.type === "isValueInRange") {
+                      excelRule.criterion.values = rule.criterion.values.map((value) => {
+                          const range = this.getters.getRangeFromSheetXC(sheet.id, value);
+                          return this.getters.getRangeString(range, sheet.id, {
+                              useBoundedReference: true,
+                              useFixedReference: true,
+                          });
+                      });
+                  }
+                  sheet.dataValidationRules.push(excelRule);
               }
           }
       }
@@ -55864,9 +55898,10 @@ stores.inject(MyMetaStore, storeInstance);
        * @param range the range (received from getRangeFromXC or getRangeFromZone)
        * @param forSheetId the id of the sheet where the range string is supposed to be used.
        * @param options
+       * @param options.useBoundedReference if true, the range will be returned with bounded row and column
        * @param options.useFixedReference if true, the range will be returned with fixed row and column
        */
-      getRangeString(range, forSheetId, options = { useFixedReference: false }) {
+      getRangeString(range, forSheetId, options = { useBoundedReference: false, useFixedReference: false }) {
           if (!range) {
               return CellErrorType.InvalidReference;
           }
@@ -55969,13 +56004,13 @@ stores.inject(MyMetaStore, storeInstance);
       /**
        * Get a Xc string that represent a part of a range
        */
-      getRangePartString(range, part, options = { useFixedReference: false }) {
-          const colFixed = range.parts && range.parts[part]?.colFixed ? "$" : "";
+      getRangePartString(range, part, options = { useBoundedReference: false, useFixedReference: false }) {
+          const colFixed = range.parts[part]?.colFixed || options.useFixedReference ? "$" : "";
           const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
-          const rowFixed = range.parts && range.parts[part]?.rowFixed ? "$" : "";
+          const rowFixed = range.parts[part]?.rowFixed || options.useFixedReference ? "$" : "";
           const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
           let str = "";
-          if (range.isFullCol && !options.useFixedReference) {
+          if (range.isFullCol && !options.useBoundedReference) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -55983,7 +56018,7 @@ stores.inject(MyMetaStore, storeInstance);
                   str = colFixed + col;
               }
           }
-          else if (range.isFullRow && !options.useFixedReference) {
+          else if (range.isFullRow && !options.useBoundedReference) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -63162,6 +63197,7 @@ stores.inject(MyMetaStore, storeInstance);
       waitingUndoRedoAck = false;
       isReplayingInitialRevisions = false;
       processedRevisions = new Set();
+      lastRevisionMessage = undefined;
       uuidGenerator = new UuidGenerator();
       lastLocalOperation;
       /**
@@ -63262,7 +63298,10 @@ stores.inject(MyMetaStore, storeInstance);
        * Notify the server that the user client left the collaborative session
        */
       async leave(data) {
-          if (data && Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
+          if (data &&
+              Object.keys(this.clients).length === 1 &&
+              this.lastRevisionMessage &&
+              this.lastRevisionMessage?.type !== "SNAPSHOT_CREATED") {
               await this.snapshot(data());
           }
           delete this.clients[this.clientId];
@@ -63483,6 +63522,7 @@ stores.inject(MyMetaStore, storeInstance);
                   this.pendingMessages = this.pendingMessages.filter((msg) => msg.nextRevisionId !== message.nextRevisionId);
                   this.serverRevisionId = message.nextRevisionId;
                   this.processedRevisions.add(message.nextRevisionId);
+                  this.lastRevisionMessage = message;
                   this.sendPendingMessage();
                   break;
           }
@@ -66722,8 +66762,12 @@ stores.inject(MyMetaStore, storeInstance);
               },
           ];
           handler.paste({ zones: pasteTarget, sheetId }, data, { isCutOperation: true });
+          const selection = pasteTarget[0];
+          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 = cmd.base;
+          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);
@@ -67014,22 +67058,33 @@ stores.inject(MyMetaStore, storeInstance);
       }
       /**
        *
-       * @param zone
-       * @returns Computes the absolute coordinate of a given zone inside the viewport
+       * Computes the visible coordinates & dimensions of a given zone inside the viewport
+       *
        */
-      getRect(zone) {
+      getVisibleRect(zone) {
           const targetZone = intersection(zone, this);
           if (targetZone) {
               const x = this.getters.getColRowOffset("COL", this.left, targetZone.left) + this.offsetCorrectionX;
               const y = this.getters.getColRowOffset("ROW", this.top, targetZone.top) + this.offsetCorrectionY;
               const width = Math.min(this.getters.getColRowOffset("COL", targetZone.left, targetZone.right + 1), this.viewportWidth);
               const height = Math.min(this.getters.getColRowOffset("ROW", targetZone.top, targetZone.bottom + 1), this.viewportHeight);
-              return {
-                  x,
-                  y,
-                  width,
-                  height,
-              };
+              return { x, y, width, height };
+          }
+          return undefined;
+      }
+      /**
+       *
+       * @returns Computes the absolute coordinates & dimensions of a given zone inside the viewport
+       *
+       */
+      getFullRect(zone) {
+          const targetZone = intersection(zone, this);
+          if (targetZone) {
+              const x = this.getters.getColRowOffset("COL", this.left, zone.left) + this.offsetCorrectionX;
+              const y = this.getters.getColRowOffset("ROW", this.top, zone.top) + this.offsetCorrectionY;
+              const width = this.getters.getColRowOffset("COL", zone.left, zone.right + 1);
+              const height = this.getters.getColRowOffset("ROW", zone.top, zone.bottom + 1);
+              return { x, y, width, height };
           }
           return undefined;
       }
@@ -67199,6 +67254,8 @@ stores.inject(MyMetaStore, storeInstance);
           "isPositionVisible",
           "getColDimensionsInViewport",
           "getRowDimensionsInViewport",
+          "getAllActiveViewportsZones",
+          "getRect",
       ];
       viewports = {};
       /**
@@ -67582,16 +67639,27 @@ stores.inject(MyMetaStore, storeInstance);
       getVisibleRectWithoutHeaders(zone) {
           const sheetId = this.getters.getActiveSheetId();
           const viewportRects = this.getSubViewports(sheetId)
-              .map((viewport) => viewport.getRect(zone))
+              .map((viewport) => viewport.getVisibleRect(zone))
               .filter(isDefined);
           if (viewportRects.length === 0) {
               return { x: 0, y: 0, width: 0, height: 0 };
           }
-          const x = Math.min(...viewportRects.map((rect) => rect.x));
-          const y = Math.min(...viewportRects.map((rect) => rect.y));
-          const width = Math.max(...viewportRects.map((rect) => rect.x + rect.width)) - x;
-          const height = Math.max(...viewportRects.map((rect) => rect.y + rect.height)) - y;
-          return { x, y, width, height };
+          return this.recomposeRect(viewportRects);
+      }
+      /**
+       * Computes the actual size and position (:Rect) of the zone on the canvas
+       * regardless of the viewport dimensions.
+       */
+      getRect(zone) {
+          const sheetId = this.getters.getActiveSheetId();
+          const viewportRects = this.getSubViewports(sheetId)
+              .map((viewport) => viewport.getFullRect(zone))
+              .filter(isDefined);
+          if (viewportRects.length === 0) {
+              return { x: 0, y: 0, width: 0, height: 0 };
+          }
+          const rect = this.recomposeRect(viewportRects);
+          return { ...rect, x: rect.x + this.gridOffsetX, y: rect.y + this.gridOffsetY };
       }
       /**
        * Returns the position of the MainViewport relatively to the start of the grid (without headers)
@@ -67635,6 +67703,10 @@ stores.inject(MyMetaStore, storeInstance);
               end: start + (isRowHidden ? 0 : size),
           };
       }
+      getAllActiveViewportsZones() {
+          const sheetId = this.getters.getActiveSheetId();
+          return this.getSubViewports(sheetId);
+      }
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
@@ -67825,6 +67897,13 @@ stores.inject(MyMetaStore, storeInstance);
           const height = this.sheetViewHeight + this.gridOffsetY;
           return { xRatio: offsetCorrectionX / width, yRatio: offsetCorrectionY / height };
       }
+      recomposeRect(viewportRects) {
+          const x = Math.min(...viewportRects.map((rect) => rect.x));
+          const y = Math.min(...viewportRects.map((rect) => rect.y));
+          const width = Math.max(...viewportRects.map((rect) => rect.x + rect.width)) - x;
+          const height = Math.max(...viewportRects.map((rect) => rect.y + rect.height)) - y;
+          return { x, y, width, height };
+      }
   }
 
   class HeaderPositionsUIPlugin extends UIPlugin {
@@ -74953,9 +75032,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.1.2";
-  __info__.date = "2025-01-15T08:06:07.728Z";
-  __info__.hash = "002aa4a";
+  __info__.version = "18.1.4";
+  __info__.date = "2025-01-29T06:27:32.901Z";
+  __info__.hash = "a11ef27";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);