@odoo/o-spreadsheet 17.4.4 → 17.4.5

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 17.4.4
- * @date 2024-08-09T12:24:07.798Z
- * @hash a43e855
+ * @version 17.4.5
+ * @date 2024-08-19T08:12:00.492Z
+ * @hash 28579ad
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -2008,6 +2008,7 @@ const coreTypes = new Set([
     "UPDATE_CELL",
     "UPDATE_CELL_POSITION",
     "CLEAR_CELL",
+    "CLEAR_CELLS",
     "DELETE_CONTENT",
     /** GRID SHAPE */
     "ADD_COLUMNS_ROWS",
@@ -6743,13 +6744,10 @@ class CellClipboardHandler extends AbstractCellClipboardHandler {
      * Clear the clipped zones: remove the cells and clear the formatting
      */
     clearClippedZones(content) {
-        for (const row of content.cells) {
-            for (const cell of row) {
-                if (cell.cell) {
-                    this.dispatch("CLEAR_CELL", cell.position);
-                }
-            }
-        }
+        this.dispatch("CLEAR_CELLS", {
+            sheetId: content.sheetId,
+            target: content.zones,
+        });
         this.dispatch("CLEAR_FORMATTING", {
             sheetId: content.sheetId,
             target: content.zones,
@@ -7717,7 +7715,7 @@ function parse(str) {
 }
 function parseTokens(tokens) {
     tokens = tokens.filter((x) => x.type !== "SPACE");
-    if (tokens[0].value === "=") {
+    if (tokens[0]?.value === "=") {
         tokens.splice(0, 1);
     }
     const result = parseExpression(tokens);
@@ -9951,7 +9949,7 @@ class ComposerStore extends SpreadsheetStore {
             if (pivotId && pivotCell.type !== "EMPTY" && !cell?.isFormula) {
                 const formulaPivotId = this.getters.getPivotFormulaId(pivotId);
                 const formula = createPivotFormula(formulaPivotId, pivotCell);
-                return formula.slice(1); // strip leading =
+                return localizeFormula(formula, this.getters.getLocale()).slice(1); // strip leading =
             }
         }
         const range = this.getters.getRangeFromZone(sheetId, zone);
@@ -44354,6 +44352,7 @@ function convertChartData(chartData) {
         return {
             dataRange: convertExcelRangeToSheetXC(data.range, dataSetsHaveTitle),
             label,
+            backgroundColor: data.backgroundColor,
         };
     });
     // For doughnut charts, in chartJS first dataset = outer dataset, in excel first dataset = inner dataset
@@ -45547,11 +45546,13 @@ class XlsxChartExtractor extends XlsxBaseExtractor {
                         label = { text };
                     }
                 }
+                const color = this.extractChildAttr(chartDataElement, "c:spPr a:solidFill a:srgbClr", "val");
                 return {
                     label,
                     range: this.extractChildTextContent(chartDataElement, "c:val c:f", {
                         required: true,
                     }),
+                    backgroundColor: color ? `${toHex(color.asString())}` : undefined,
                 };
             });
         })
@@ -47757,6 +47758,9 @@ class CellPlugin extends CorePlugin {
                     format: "",
                 });
                 break;
+            case "CLEAR_CELLS":
+                this.clearCells(cmd.sheetId, cmd.target);
+                break;
             case "DELETE_CONTENT":
                 this.clearZones(cmd.sheetId, cmd.target);
                 break;
@@ -47815,6 +47819,25 @@ class CellPlugin extends CorePlugin {
             }
         }
     }
+    /**
+     * Clear the styles, the format and the content of zones
+     */
+    clearCells(sheetId, zones) {
+        for (const zone of zones) {
+            for (let col = zone.left; col <= zone.right; col++) {
+                for (let row = zone.top; row <= zone.bottom; row++) {
+                    this.dispatch("UPDATE_CELL", {
+                        sheetId: sheetId,
+                        col,
+                        row,
+                        content: "",
+                        style: null,
+                        format: "",
+                    });
+                }
+            }
+        }
+    }
     /**
      * Copy the style of the reference column/row to the new columns/rows.
      */
@@ -51275,19 +51298,23 @@ class SheetPlugin extends CorePlugin {
         }
     }
     moveCellOnColumnsDeletion(sheet, deletedColumn) {
+        this.dispatch("CLEAR_CELLS", {
+            sheetId: sheet.id,
+            target: [
+                {
+                    left: deletedColumn,
+                    top: 0,
+                    right: deletedColumn,
+                    bottom: sheet.rows.length - 1,
+                },
+            ],
+        });
         for (let rowIndex = 0; rowIndex < sheet.rows.length; rowIndex++) {
             const row = sheet.rows[rowIndex];
             for (let i in row.cells) {
                 const colIndex = Number(i);
                 const cellId = row.cells[i];
                 if (cellId) {
-                    if (colIndex === deletedColumn) {
-                        this.dispatch("CLEAR_CELL", {
-                            sheetId: sheet.id,
-                            col: colIndex,
-                            row: rowIndex,
-                        });
-                    }
                     if (colIndex > deletedColumn) {
                         this.setNewPosition(cellId, sheet.id, colIndex - 1, rowIndex);
                     }
@@ -51333,22 +51360,20 @@ class SheetPlugin extends CorePlugin {
      *
      */
     moveCellOnRowsDeletion(sheet, deleteFromRow, deleteToRow) {
+        this.dispatch("CLEAR_CELLS", {
+            sheetId: sheet.id,
+            target: [
+                {
+                    left: 0,
+                    top: deleteFromRow,
+                    right: this.getters.getNumberCols(sheet.id),
+                    bottom: deleteToRow,
+                },
+            ],
+        });
         const numberRows = deleteToRow - deleteFromRow + 1;
         for (let rowIndex = 0; rowIndex < sheet.rows.length; rowIndex++) {
             const row = sheet.rows[rowIndex];
-            if (rowIndex >= deleteFromRow && rowIndex <= deleteToRow) {
-                for (let i in row.cells) {
-                    const colIndex = Number(i);
-                    const cellId = row.cells[i];
-                    if (cellId) {
-                        this.dispatch("CLEAR_CELL", {
-                            sheetId: sheet.id,
-                            col: colIndex,
-                            row: rowIndex,
-                        });
-                    }
-                }
-            }
             if (rowIndex > deleteToRow) {
                 for (let i in row.cells) {
                     const colIndex = Number(i);
@@ -55768,6 +55793,10 @@ class PivotUIPlugin extends UIPlugin {
                 this.setupPivot(cmd.pivotId, { recreate: true });
                 break;
             }
+            case "REMOVE_PIVOT": {
+                delete this.pivots[cmd.pivotId];
+                break;
+            }
             case "DELETE_SHEET":
             case "UPDATE_CELL": {
                 this.unusedPivots = undefined;
@@ -57202,7 +57231,7 @@ class Session extends EventBus {
      */
     leave(data) {
         if (Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
-            this.snapshot(data);
+            this.snapshot(data());
         }
         delete this.clients[this.clientId];
         this.transportService.leave(this.clientId);
@@ -57624,9 +57653,7 @@ class DataCleanupPlugin extends UIPlugin {
         if (!data) {
             return;
         }
-        for (const { col, row } of positions(zone)) {
-            this.dispatch("CLEAR_CELL", { col, row, sheetId });
-        }
+        this.dispatch("CLEAR_CELLS", { target: [zone], sheetId });
         const zonePasted = {
             left: zone.left,
             top: zone.top,
@@ -58299,6 +58326,9 @@ class SheetUIPlugin extends UIPlugin {
         if (showFormula && cell?.isFormula) {
             return localizeFormula(cell.content, this.getters.getLocale());
         }
+        else if (showFormula && !cell?.content) {
+            return "";
+        }
         else {
             return this.getters.getEvaluatedCell(position).formattedValue;
         }
@@ -58797,6 +58827,7 @@ function repeatGroupHeadersCommand(getters, cmd) {
 const repeatCommandTransformRegistry = new Registry();
 repeatCommandTransformRegistry.add("UPDATE_CELL", genericRepeat);
 repeatCommandTransformRegistry.add("CLEAR_CELL", genericRepeat);
+repeatCommandTransformRegistry.add("CLEAR_CELLS", genericRepeat);
 repeatCommandTransformRegistry.add("DELETE_CONTENT", genericRepeat);
 repeatCommandTransformRegistry.add("ADD_MERGE", genericRepeat);
 repeatCommandTransformRegistry.add("REMOVE_MERGE", genericRepeat);
@@ -59421,9 +59452,10 @@ class ClipboardPlugin extends UIPlugin {
             case "DELETE_CELL": {
                 const { cut, paste } = this.getDeleteCellsTargets(cmd.zone, cmd.shiftDimension);
                 if (!isZoneValid(cut[0])) {
-                    for (const { col, row } of positions(cmd.zone)) {
-                        this.dispatch("CLEAR_CELL", { col, row, sheetId: this.getters.getActiveSheetId() });
-                    }
+                    this.dispatch("CLEAR_CELLS", {
+                        target: [cmd.zone],
+                        sheetId: this.getters.getActiveSheetId(),
+                    });
                     break;
                 }
                 const copiedData = this.copy(cut);
@@ -67825,7 +67857,7 @@ class Model extends EventBus {
         this.session.join(this.config.client);
     }
     leaveSession() {
-        this.session.leave(this.exportData());
+        this.session.leave(lazy(() => this.exportData()));
     }
     setupUiPlugin(Plugin) {
         const plugin = new Plugin(this.uiPluginConfig);
@@ -68384,6 +68416,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "17.4.4";
-__info__.date = "2024-08-09T12:24:07.798Z";
-__info__.hash = "a43e855";
+__info__.version = "17.4.5";
+__info__.date = "2024-08-19T08:12:00.492Z";
+__info__.hash = "28579ad";

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 17.4.4
- * @date 2024-08-09T12:24:07.798Z
- * @hash a43e855
+ * @version 17.4.5
+ * @date 2024-08-19T08:12:00.492Z
+ * @hash 28579ad
  */
 
 (function (exports, owl) {
@@ -2009,6 +2009,7 @@
       "UPDATE_CELL",
       "UPDATE_CELL_POSITION",
       "CLEAR_CELL",
+      "CLEAR_CELLS",
       "DELETE_CONTENT",
       /** GRID SHAPE */
       "ADD_COLUMNS_ROWS",
@@ -6744,13 +6745,10 @@
        * Clear the clipped zones: remove the cells and clear the formatting
        */
       clearClippedZones(content) {
-          for (const row of content.cells) {
-              for (const cell of row) {
-                  if (cell.cell) {
-                      this.dispatch("CLEAR_CELL", cell.position);
-                  }
-              }
-          }
+          this.dispatch("CLEAR_CELLS", {
+              sheetId: content.sheetId,
+              target: content.zones,
+          });
           this.dispatch("CLEAR_FORMATTING", {
               sheetId: content.sheetId,
               target: content.zones,
@@ -7718,7 +7716,7 @@
   }
   function parseTokens(tokens) {
       tokens = tokens.filter((x) => x.type !== "SPACE");
-      if (tokens[0].value === "=") {
+      if (tokens[0]?.value === "=") {
           tokens.splice(0, 1);
       }
       const result = parseExpression(tokens);
@@ -9952,7 +9950,7 @@ stores.inject(MyMetaStore, storeInstance);
               if (pivotId && pivotCell.type !== "EMPTY" && !cell?.isFormula) {
                   const formulaPivotId = this.getters.getPivotFormulaId(pivotId);
                   const formula = createPivotFormula(formulaPivotId, pivotCell);
-                  return formula.slice(1); // strip leading =
+                  return localizeFormula(formula, this.getters.getLocale()).slice(1); // strip leading =
               }
           }
           const range = this.getters.getRangeFromZone(sheetId, zone);
@@ -44355,6 +44353,7 @@ stores.inject(MyMetaStore, storeInstance);
           return {
               dataRange: convertExcelRangeToSheetXC(data.range, dataSetsHaveTitle),
               label,
+              backgroundColor: data.backgroundColor,
           };
       });
       // For doughnut charts, in chartJS first dataset = outer dataset, in excel first dataset = inner dataset
@@ -45548,11 +45547,13 @@ stores.inject(MyMetaStore, storeInstance);
                           label = { text };
                       }
                   }
+                  const color = this.extractChildAttr(chartDataElement, "c:spPr a:solidFill a:srgbClr", "val");
                   return {
                       label,
                       range: this.extractChildTextContent(chartDataElement, "c:val c:f", {
                           required: true,
                       }),
+                      backgroundColor: color ? `${toHex(color.asString())}` : undefined,
                   };
               });
           })
@@ -47758,6 +47759,9 @@ stores.inject(MyMetaStore, storeInstance);
                       format: "",
                   });
                   break;
+              case "CLEAR_CELLS":
+                  this.clearCells(cmd.sheetId, cmd.target);
+                  break;
               case "DELETE_CONTENT":
                   this.clearZones(cmd.sheetId, cmd.target);
                   break;
@@ -47816,6 +47820,25 @@ stores.inject(MyMetaStore, storeInstance);
               }
           }
       }
+      /**
+       * Clear the styles, the format and the content of zones
+       */
+      clearCells(sheetId, zones) {
+          for (const zone of zones) {
+              for (let col = zone.left; col <= zone.right; col++) {
+                  for (let row = zone.top; row <= zone.bottom; row++) {
+                      this.dispatch("UPDATE_CELL", {
+                          sheetId: sheetId,
+                          col,
+                          row,
+                          content: "",
+                          style: null,
+                          format: "",
+                      });
+                  }
+              }
+          }
+      }
       /**
        * Copy the style of the reference column/row to the new columns/rows.
        */
@@ -51276,19 +51299,23 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       moveCellOnColumnsDeletion(sheet, deletedColumn) {
+          this.dispatch("CLEAR_CELLS", {
+              sheetId: sheet.id,
+              target: [
+                  {
+                      left: deletedColumn,
+                      top: 0,
+                      right: deletedColumn,
+                      bottom: sheet.rows.length - 1,
+                  },
+              ],
+          });
           for (let rowIndex = 0; rowIndex < sheet.rows.length; rowIndex++) {
               const row = sheet.rows[rowIndex];
               for (let i in row.cells) {
                   const colIndex = Number(i);
                   const cellId = row.cells[i];
                   if (cellId) {
-                      if (colIndex === deletedColumn) {
-                          this.dispatch("CLEAR_CELL", {
-                              sheetId: sheet.id,
-                              col: colIndex,
-                              row: rowIndex,
-                          });
-                      }
                       if (colIndex > deletedColumn) {
                           this.setNewPosition(cellId, sheet.id, colIndex - 1, rowIndex);
                       }
@@ -51334,22 +51361,20 @@ stores.inject(MyMetaStore, storeInstance);
        *
        */
       moveCellOnRowsDeletion(sheet, deleteFromRow, deleteToRow) {
+          this.dispatch("CLEAR_CELLS", {
+              sheetId: sheet.id,
+              target: [
+                  {
+                      left: 0,
+                      top: deleteFromRow,
+                      right: this.getters.getNumberCols(sheet.id),
+                      bottom: deleteToRow,
+                  },
+              ],
+          });
           const numberRows = deleteToRow - deleteFromRow + 1;
           for (let rowIndex = 0; rowIndex < sheet.rows.length; rowIndex++) {
               const row = sheet.rows[rowIndex];
-              if (rowIndex >= deleteFromRow && rowIndex <= deleteToRow) {
-                  for (let i in row.cells) {
-                      const colIndex = Number(i);
-                      const cellId = row.cells[i];
-                      if (cellId) {
-                          this.dispatch("CLEAR_CELL", {
-                              sheetId: sheet.id,
-                              col: colIndex,
-                              row: rowIndex,
-                          });
-                      }
-                  }
-              }
               if (rowIndex > deleteToRow) {
                   for (let i in row.cells) {
                       const colIndex = Number(i);
@@ -55769,6 +55794,10 @@ stores.inject(MyMetaStore, storeInstance);
                   this.setupPivot(cmd.pivotId, { recreate: true });
                   break;
               }
+              case "REMOVE_PIVOT": {
+                  delete this.pivots[cmd.pivotId];
+                  break;
+              }
               case "DELETE_SHEET":
               case "UPDATE_CELL": {
                   this.unusedPivots = undefined;
@@ -57203,7 +57232,7 @@ stores.inject(MyMetaStore, storeInstance);
        */
       leave(data) {
           if (Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
-              this.snapshot(data);
+              this.snapshot(data());
           }
           delete this.clients[this.clientId];
           this.transportService.leave(this.clientId);
@@ -57625,9 +57654,7 @@ stores.inject(MyMetaStore, storeInstance);
           if (!data) {
               return;
           }
-          for (const { col, row } of positions(zone)) {
-              this.dispatch("CLEAR_CELL", { col, row, sheetId });
-          }
+          this.dispatch("CLEAR_CELLS", { target: [zone], sheetId });
           const zonePasted = {
               left: zone.left,
               top: zone.top,
@@ -58300,6 +58327,9 @@ stores.inject(MyMetaStore, storeInstance);
           if (showFormula && cell?.isFormula) {
               return localizeFormula(cell.content, this.getters.getLocale());
           }
+          else if (showFormula && !cell?.content) {
+              return "";
+          }
           else {
               return this.getters.getEvaluatedCell(position).formattedValue;
           }
@@ -58798,6 +58828,7 @@ stores.inject(MyMetaStore, storeInstance);
   const repeatCommandTransformRegistry = new Registry();
   repeatCommandTransformRegistry.add("UPDATE_CELL", genericRepeat);
   repeatCommandTransformRegistry.add("CLEAR_CELL", genericRepeat);
+  repeatCommandTransformRegistry.add("CLEAR_CELLS", genericRepeat);
   repeatCommandTransformRegistry.add("DELETE_CONTENT", genericRepeat);
   repeatCommandTransformRegistry.add("ADD_MERGE", genericRepeat);
   repeatCommandTransformRegistry.add("REMOVE_MERGE", genericRepeat);
@@ -59422,9 +59453,10 @@ stores.inject(MyMetaStore, storeInstance);
               case "DELETE_CELL": {
                   const { cut, paste } = this.getDeleteCellsTargets(cmd.zone, cmd.shiftDimension);
                   if (!isZoneValid(cut[0])) {
-                      for (const { col, row } of positions(cmd.zone)) {
-                          this.dispatch("CLEAR_CELL", { col, row, sheetId: this.getters.getActiveSheetId() });
-                      }
+                      this.dispatch("CLEAR_CELLS", {
+                          target: [cmd.zone],
+                          sheetId: this.getters.getActiveSheetId(),
+                      });
                       break;
                   }
                   const copiedData = this.copy(cut);
@@ -67826,7 +67858,7 @@ stores.inject(MyMetaStore, storeInstance);
           this.session.join(this.config.client);
       }
       leaveSession() {
-          this.session.leave(this.exportData());
+          this.session.leave(lazy(() => this.exportData()));
       }
       setupUiPlugin(Plugin) {
           const plugin = new Plugin(this.uiPluginConfig);
@@ -68428,9 +68460,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.4.4";
-  __info__.date = "2024-08-09T12:24:07.798Z";
-  __info__.hash = "a43e855";
+  __info__.version = "17.4.5";
+  __info__.date = "2024-08-19T08:12:00.492Z";
+  __info__.hash = "28579ad";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);