@odoo/o-spreadsheet 16.4.9 → 16.4.11

package/dist/o-spreadsheet.cjs.js

@@ -13047,6 +13047,35 @@ const HLOOKUP = {
     isExported: true,
 };
 // -----------------------------------------------------------------------------
+// INDEX
+// -----------------------------------------------------------------------------
+const INDEX = {
+    description: _lt(`Returns the content of a cell, specified by row and column offset.`),
+    args: [
+        arg("reference (any, range)", _lt("The range of cells from which the values are returned.")),
+        arg("row (number)", _lt("The index of the row to be returned from within the reference range of cells.")),
+        arg("column (number)", _lt("The index of the column to be returned from within the reference range of cells.")),
+    ],
+    returns: ["ANY"],
+    computeFormat: function (reference, row, column) {
+        const _row = toNumber(row.value, this.locale);
+        const _column = toNumber(column.value, this.locale);
+        return reference.format[_column - 1][_row - 1];
+    },
+    compute: function (reference, row, column) {
+        const _reference = isMatrix(reference) ? reference : [[reference]];
+        const _row = toNumber(row, this.locale);
+        const _column = toNumber(column, this.locale);
+        assert(() => _column >= 0 &&
+            _column - 1 < _reference.length &&
+            _row >= 0 &&
+            _row - 1 < _reference[0].length, _lt("Index out of range."));
+        assert(() => row !== 0 && column !== 0, _lt("This function can only return a single cell value, not an array. Provide valid row and column indices."));
+        return _reference[_column - 1][_row - 1];
+    },
+    isExported: true,
+};
+// -----------------------------------------------------------------------------
 // LOOKUP
 // -----------------------------------------------------------------------------
 const LOOKUP = {
@@ -13244,6 +13273,7 @@ var lookup = /*#__PURE__*/Object.freeze({
   COLUMN: COLUMN,
   COLUMNS: COLUMNS,
   HLOOKUP: HLOOKUP,
+  INDEX: INDEX,
   LOOKUP: LOOKUP,
   MATCH: MATCH,
   ROW: ROW,
@@ -21815,7 +21845,7 @@ class ChartPanel extends owl.Component {
         });
     }
     canUpdateChart(figureId, updateDefinition) {
-        if (figureId !== this.figureId) {
+        if (figureId !== this.figureId || !this.env.model.getters.isChartDefined(figureId)) {
             return;
         }
         const definition = {
@@ -23490,7 +23520,7 @@ class ClientTag extends owl.Component {
             left: `${x - 1}px`,
             border: `1px solid ${color}`,
             "background-color": color,
-            opacity: this.props.active ? "opacity:1 !important" : undefined,
+            opacity: this.props.active ? "1 !important" : undefined,
         });
     }
 }
@@ -25683,7 +25713,14 @@ class AbstractResizer extends owl.Component {
             return;
         }
         if (this.state.waitingForMove === true) {
-            this.startMovement(ev);
+            if (!this.env.model.getters.isGridSelectionActive()) {
+                this._selectElement(index, false);
+            }
+            else {
+                // FIXME: Consider reintroducing this feature for all type of selection if we find
+                // a way to have the grid selection follow the other selections evolution
+                this.startMovement(ev);
+            }
             return;
         }
         if (this.env.model.getters.getEditionMode() === "editing") {
@@ -29109,12 +29146,15 @@ function createXMLFile(doc, path, contentType) {
     };
 }
 function xmlEscape(str) {
-    return String(str)
+    return (String(str)
         .replace(/\&/g, "&amp;")
         .replace(/\</g, "&lt;")
         .replace(/\>/g, "&gt;")
         .replace(/\"/g, "&quot;")
-        .replace(/\'/g, "&apos;");
+        .replace(/\'/g, "&apos;")
+        // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+        // They are not valid at all in XML 1.0 (even escaped)
+        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
 }
 function formatAttributes(attrs) {
     return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -41714,6 +41754,10 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
         if (!newRangesXC) {
             return;
         }
+        if (newRangesXC.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -43219,6 +43263,7 @@ class GridSelectionPlugin extends UIPlugin {
         "isSingleColSelected",
         "getElementsFromSelection",
         "tryGetActiveSheetId",
+        "isGridSelectionActive",
     ];
     gridSelection = {
         anchor: {
@@ -43428,6 +43473,9 @@ class GridSelectionPlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
+    isGridSelectionActive() {
+        return this.selection.isListening(this);
+    }
     getActiveSheet() {
         return this.activeSheet;
     }
@@ -43512,11 +43560,19 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
-        // get deduplicated cells in zones
-        const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-            .flat()
-            .filter((cell) => cell.type !== CellValueType.empty));
+        const sheetId = this.getters.getActiveSheetId();
+        const cells = new Set();
+        for (const zone of this.gridSelection.zones) {
+            for (const { col, row } of positions(zone)) {
+                if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                    continue; // Skip hidden cells
+                }
+                const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                if (evaluatedCell.type !== CellValueType.empty) {
+                    cells.add(evaluatedCell);
+                }
+            }
+        }
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -46100,6 +46156,7 @@ const BORDER_POSITIONS = [
 css /* scss */ `
   .o-border-selector {
     padding: 4px;
+    background-color: white;
   }
   .o-divider {
     border-right: 1px solid #e0e2e4;
@@ -48243,6 +48300,9 @@ class SelectionStreamProcessorImpl {
             },
         });
     }
+    isListening(owner) {
+        return this.stream.isListening(owner);
+    }
     /**
      * Process a new anchor selection event. If the new anchor is inside
      * the sheet boundaries, the event is pushed to the event stream to
@@ -50711,6 +50771,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.9';
-__info__.date = '2023-10-10T07:28:12.772Z';
-__info__.hash = '998c612';
+__info__.version = '16.4.11';
+__info__.date = '2023-10-25T10:03:47.870Z';
+__info__.hash = 'ae96a3e';

package/dist/o-spreadsheet.d.ts

@@ -1057,6 +1057,7 @@ interface SelectionProcessor {
     selectAll(): DispatchResult;
     loopSelection(): DispatchResult;
     selectTableAroundSelection(): DispatchResult;
+    isListening(owner: unknown): boolean;
 }
 type SelectionStreamProcessor = SelectionProcessor & StatefulStream<SelectionEvent, AnchorZone>;
 
@@ -4508,7 +4509,7 @@ declare class FilterEvaluationPlugin extends UIPlugin {
  */
 declare class GridSelectionPlugin extends UIPlugin {
     static layers: LAYERS[];
-    static getters: readonly ["getActiveSheet", "getActiveSheetId", "getActiveCell", "getActiveCols", "getActiveRows", "getCurrentStyle", "getSelectedZones", "getSelectedZone", "getSelectedCells", "getStatisticFnResults", "getAggregate", "getSelectedFigureId", "getSelection", "getActivePosition", "getSheetPosition", "isSelected", "isSingleColSelected", "getElementsFromSelection", "tryGetActiveSheetId"];
+    static getters: readonly ["getActiveSheet", "getActiveSheetId", "getActiveCell", "getActiveCols", "getActiveRows", "getCurrentStyle", "getSelectedZones", "getSelectedZone", "getSelectedCells", "getStatisticFnResults", "getAggregate", "getSelectedFigureId", "getSelection", "getActivePosition", "getSheetPosition", "isSelected", "isSingleColSelected", "getElementsFromSelection", "tryGetActiveSheetId", "isGridSelectionActive"];
     private gridSelection;
     private selectedFigureId;
     private sheetsData;
@@ -4518,6 +4519,7 @@ declare class GridSelectionPlugin extends UIPlugin {
     allowDispatch(cmd: LocalCommand): CommandResult;
     private handleEvent;
     handle(cmd: Command): void;
+    isGridSelectionActive(): boolean;
     getActiveSheet(): Readonly<Sheet>;
     getActiveSheetId(): UID;
     tryGetActiveSheetId(): UID | undefined;

package/dist/o-spreadsheet.esm.js

@@ -13043,6 +13043,35 @@ const HLOOKUP = {
     isExported: true,
 };
 // -----------------------------------------------------------------------------
+// INDEX
+// -----------------------------------------------------------------------------
+const INDEX = {
+    description: _lt(`Returns the content of a cell, specified by row and column offset.`),
+    args: [
+        arg("reference (any, range)", _lt("The range of cells from which the values are returned.")),
+        arg("row (number)", _lt("The index of the row to be returned from within the reference range of cells.")),
+        arg("column (number)", _lt("The index of the column to be returned from within the reference range of cells.")),
+    ],
+    returns: ["ANY"],
+    computeFormat: function (reference, row, column) {
+        const _row = toNumber(row.value, this.locale);
+        const _column = toNumber(column.value, this.locale);
+        return reference.format[_column - 1][_row - 1];
+    },
+    compute: function (reference, row, column) {
+        const _reference = isMatrix(reference) ? reference : [[reference]];
+        const _row = toNumber(row, this.locale);
+        const _column = toNumber(column, this.locale);
+        assert(() => _column >= 0 &&
+            _column - 1 < _reference.length &&
+            _row >= 0 &&
+            _row - 1 < _reference[0].length, _lt("Index out of range."));
+        assert(() => row !== 0 && column !== 0, _lt("This function can only return a single cell value, not an array. Provide valid row and column indices."));
+        return _reference[_column - 1][_row - 1];
+    },
+    isExported: true,
+};
+// -----------------------------------------------------------------------------
 // LOOKUP
 // -----------------------------------------------------------------------------
 const LOOKUP = {
@@ -13240,6 +13269,7 @@ var lookup = /*#__PURE__*/Object.freeze({
   COLUMN: COLUMN,
   COLUMNS: COLUMNS,
   HLOOKUP: HLOOKUP,
+  INDEX: INDEX,
   LOOKUP: LOOKUP,
   MATCH: MATCH,
   ROW: ROW,
@@ -21811,7 +21841,7 @@ class ChartPanel extends Component {
         });
     }
     canUpdateChart(figureId, updateDefinition) {
-        if (figureId !== this.figureId) {
+        if (figureId !== this.figureId || !this.env.model.getters.isChartDefined(figureId)) {
             return;
         }
         const definition = {
@@ -23486,7 +23516,7 @@ class ClientTag extends Component {
             left: `${x - 1}px`,
             border: `1px solid ${color}`,
             "background-color": color,
-            opacity: this.props.active ? "opacity:1 !important" : undefined,
+            opacity: this.props.active ? "1 !important" : undefined,
         });
     }
 }
@@ -25679,7 +25709,14 @@ class AbstractResizer extends Component {
             return;
         }
         if (this.state.waitingForMove === true) {
-            this.startMovement(ev);
+            if (!this.env.model.getters.isGridSelectionActive()) {
+                this._selectElement(index, false);
+            }
+            else {
+                // FIXME: Consider reintroducing this feature for all type of selection if we find
+                // a way to have the grid selection follow the other selections evolution
+                this.startMovement(ev);
+            }
             return;
         }
         if (this.env.model.getters.getEditionMode() === "editing") {
@@ -29105,12 +29142,15 @@ function createXMLFile(doc, path, contentType) {
     };
 }
 function xmlEscape(str) {
-    return String(str)
+    return (String(str)
         .replace(/\&/g, "&amp;")
         .replace(/\</g, "&lt;")
         .replace(/\>/g, "&gt;")
         .replace(/\"/g, "&quot;")
-        .replace(/\'/g, "&apos;");
+        .replace(/\'/g, "&apos;")
+        // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+        // They are not valid at all in XML 1.0 (even escaped)
+        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
 }
 function formatAttributes(attrs) {
     return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -41710,6 +41750,10 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
         if (!newRangesXC) {
             return;
         }
+        if (newRangesXC.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -43215,6 +43259,7 @@ class GridSelectionPlugin extends UIPlugin {
         "isSingleColSelected",
         "getElementsFromSelection",
         "tryGetActiveSheetId",
+        "isGridSelectionActive",
     ];
     gridSelection = {
         anchor: {
@@ -43424,6 +43469,9 @@ class GridSelectionPlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
+    isGridSelectionActive() {
+        return this.selection.isListening(this);
+    }
     getActiveSheet() {
         return this.activeSheet;
     }
@@ -43508,11 +43556,19 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
-        // get deduplicated cells in zones
-        const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-            .flat()
-            .filter((cell) => cell.type !== CellValueType.empty));
+        const sheetId = this.getters.getActiveSheetId();
+        const cells = new Set();
+        for (const zone of this.gridSelection.zones) {
+            for (const { col, row } of positions(zone)) {
+                if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                    continue; // Skip hidden cells
+                }
+                const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                if (evaluatedCell.type !== CellValueType.empty) {
+                    cells.add(evaluatedCell);
+                }
+            }
+        }
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -46096,6 +46152,7 @@ const BORDER_POSITIONS = [
 css /* scss */ `
   .o-border-selector {
     padding: 4px;
+    background-color: white;
   }
   .o-divider {
     border-right: 1px solid #e0e2e4;
@@ -48239,6 +48296,9 @@ class SelectionStreamProcessorImpl {
             },
         });
     }
+    isListening(owner) {
+        return this.stream.isListening(owner);
+    }
     /**
      * Process a new anchor selection event. If the new anchor is inside
      * the sheet boundaries, the event is pushed to the event stream to
@@ -50675,6 +50735,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.4.9';
-__info__.date = '2023-10-10T07:28:12.772Z';
-__info__.hash = '998c612';
+__info__.version = '16.4.11';
+__info__.date = '2023-10-25T10:03:47.870Z';
+__info__.hash = 'ae96a3e';

package/dist/o-spreadsheet.iife.js

@@ -13044,6 +13044,35 @@
       isExported: true,
   };
   // -----------------------------------------------------------------------------
+  // INDEX
+  // -----------------------------------------------------------------------------
+  const INDEX = {
+      description: _lt(`Returns the content of a cell, specified by row and column offset.`),
+      args: [
+          arg("reference (any, range)", _lt("The range of cells from which the values are returned.")),
+          arg("row (number)", _lt("The index of the row to be returned from within the reference range of cells.")),
+          arg("column (number)", _lt("The index of the column to be returned from within the reference range of cells.")),
+      ],
+      returns: ["ANY"],
+      computeFormat: function (reference, row, column) {
+          const _row = toNumber(row.value, this.locale);
+          const _column = toNumber(column.value, this.locale);
+          return reference.format[_column - 1][_row - 1];
+      },
+      compute: function (reference, row, column) {
+          const _reference = isMatrix(reference) ? reference : [[reference]];
+          const _row = toNumber(row, this.locale);
+          const _column = toNumber(column, this.locale);
+          assert(() => _column >= 0 &&
+              _column - 1 < _reference.length &&
+              _row >= 0 &&
+              _row - 1 < _reference[0].length, _lt("Index out of range."));
+          assert(() => row !== 0 && column !== 0, _lt("This function can only return a single cell value, not an array. Provide valid row and column indices."));
+          return _reference[_column - 1][_row - 1];
+      },
+      isExported: true,
+  };
+  // -----------------------------------------------------------------------------
   // LOOKUP
   // -----------------------------------------------------------------------------
   const LOOKUP = {
@@ -13241,6 +13270,7 @@
     COLUMN: COLUMN,
     COLUMNS: COLUMNS,
     HLOOKUP: HLOOKUP,
+    INDEX: INDEX,
     LOOKUP: LOOKUP,
     MATCH: MATCH,
     ROW: ROW,
@@ -21812,7 +21842,7 @@
           });
       }
       canUpdateChart(figureId, updateDefinition) {
-          if (figureId !== this.figureId) {
+          if (figureId !== this.figureId || !this.env.model.getters.isChartDefined(figureId)) {
               return;
           }
           const definition = {
@@ -23487,7 +23517,7 @@
               left: `${x - 1}px`,
               border: `1px solid ${color}`,
               "background-color": color,
-              opacity: this.props.active ? "opacity:1 !important" : undefined,
+              opacity: this.props.active ? "1 !important" : undefined,
           });
       }
   }
@@ -25680,7 +25710,14 @@
               return;
           }
           if (this.state.waitingForMove === true) {
-              this.startMovement(ev);
+              if (!this.env.model.getters.isGridSelectionActive()) {
+                  this._selectElement(index, false);
+              }
+              else {
+                  // FIXME: Consider reintroducing this feature for all type of selection if we find
+                  // a way to have the grid selection follow the other selections evolution
+                  this.startMovement(ev);
+              }
               return;
           }
           if (this.env.model.getters.getEditionMode() === "editing") {
@@ -29106,12 +29143,15 @@
       };
   }
   function xmlEscape(str) {
-      return String(str)
+      return (String(str)
           .replace(/\&/g, "&amp;")
           .replace(/\</g, "&lt;")
           .replace(/\>/g, "&gt;")
           .replace(/\"/g, "&quot;")
-          .replace(/\'/g, "&apos;");
+          .replace(/\'/g, "&apos;")
+          // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+          // They are not valid at all in XML 1.0 (even escaped)
+          .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
   }
   function formatAttributes(attrs) {
       return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -41711,6 +41751,10 @@
           if (!newRangesXC) {
               return;
           }
+          if (newRangesXC.length === 0) {
+              this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+              return;
+          }
           this.dispatch("ADD_CONDITIONAL_FORMAT", {
               cf: {
                   id: cf.id,
@@ -43216,6 +43260,7 @@
           "isSingleColSelected",
           "getElementsFromSelection",
           "tryGetActiveSheetId",
+          "isGridSelectionActive",
       ];
       gridSelection = {
           anchor: {
@@ -43425,6 +43470,9 @@
       // ---------------------------------------------------------------------------
       // Getters
       // ---------------------------------------------------------------------------
+      isGridSelectionActive() {
+          return this.selection.isListening(this);
+      }
       getActiveSheet() {
           return this.activeSheet;
       }
@@ -43509,11 +43557,19 @@
           }
       }
       getStatisticFnResults() {
-          // get deduplicated cells in zones
-          const cells = new Set(this.gridSelection.zones
-              .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-              .flat()
-              .filter((cell) => cell.type !== CellValueType.empty));
+          const sheetId = this.getters.getActiveSheetId();
+          const cells = new Set();
+          for (const zone of this.gridSelection.zones) {
+              for (const { col, row } of positions(zone)) {
+                  if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                      continue; // Skip hidden cells
+                  }
+                  const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                  if (evaluatedCell.type !== CellValueType.empty) {
+                      cells.add(evaluatedCell);
+                  }
+              }
+          }
           let cellsTypes = new Set();
           let cellsValues = [];
           for (let cell of cells) {
@@ -46097,6 +46153,7 @@
   css /* scss */ `
   .o-border-selector {
     padding: 4px;
+    background-color: white;
   }
   .o-divider {
     border-right: 1px solid #e0e2e4;
@@ -48240,6 +48297,9 @@
               },
           });
       }
+      isListening(owner) {
+          return this.stream.isListening(owner);
+      }
       /**
        * Process a new anchor selection event. If the new anchor is inside
        * the sheet boundaries, the event is pushed to the event stream to
@@ -50710,9 +50770,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.4.9';
-  __info__.date = '2023-10-10T07:28:12.772Z';
-  __info__.hash = '998c612';
+  __info__.version = '16.4.11';
+  __info__.date = '2023-10-25T10:03:47.870Z';
+  __info__.hash = 'ae96a3e';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);