@odoo/o-spreadsheet 17.4.6 → 17.4.7

package/dist/o-spreadsheet.cjs.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.6
- * @date 2024-08-26T13:50:49.623Z
- * @hash f5648d9
+ * @version 17.4.7
+ * @date 2024-09-05T09:32:00.461Z
+ * @hash c14a4c9
  */
 
 'use strict';
@@ -4561,6 +4561,17 @@ function reorderZone(zone) {
     }
     return zone;
 }
+function aggregatePositionsToZones(positions) {
+    const result = {};
+    for (const position of positions) {
+        result[position.sheetId] ??= [];
+        result[position.sheetId].push(positionToZone(position));
+    }
+    for (const sheetId in result) {
+        result[sheetId] = recomputeZones(result[sheetId]);
+    }
+    return result;
+}
 /**
  * This function returns a zone with coordinates modified according to the change
  * applied to the zone. It may be possible to change the zone by resizing or moving
@@ -6776,9 +6787,11 @@ class CellClipboardHandler extends AbstractCellClipboardHandler {
         const targetCell = this.getters.getEvaluatedCell(target);
         const originFormat = origin.cell?.format ?? origin.evaluatedCell.format;
         if (clipboardOption?.pasteOption === "asValue") {
-            const locale = this.getters.getLocale();
-            const content = formatValue(origin.evaluatedCell.value, { locale });
-            this.dispatch("UPDATE_CELL", { ...target, content, format: originFormat });
+            this.dispatch("UPDATE_CELL", {
+                ...target,
+                content: origin.evaluatedCell.value?.toString() || "",
+                format: originFormat,
+            });
             return;
         }
         if (clipboardOption?.pasteOption === "onlyFormat") {
@@ -28380,8 +28393,26 @@ const CREATE_PIVOT = (env) => {
         env.openSidePanel("PivotSidePanel", { pivotId });
     }
 };
-const REINSERT_PIVOT_CHILDREN = (env) => env.model.getters.getPivotIds().map((pivotId, index) => ({
-    id: `reinsert_pivot_${env.model.getters.getPivotFormulaId(pivotId)}`,
+const REINSERT_DYNAMIC_PIVOT_CHILDREN = (env) => env.model.getters.getPivotIds().map((pivotId, index) => ({
+    id: `reinsert_dynamic_pivot_${env.model.getters.getPivotFormulaId(pivotId)}`,
+    name: env.model.getters.getPivotDisplayName(pivotId),
+    sequence: index,
+    execute: (env) => {
+        const zone = env.model.getters.getSelectedZone();
+        const table = env.model.getters.getPivot(pivotId).getTableStructure().export();
+        env.model.dispatch("INSERT_PIVOT_WITH_TABLE", {
+            pivotId,
+            table,
+            col: zone.left,
+            row: zone.top,
+            sheetId: env.model.getters.getActiveSheetId(),
+            pivotMode: "dynamic",
+        });
+        env.model.dispatch("REFRESH_PIVOT", { id: pivotId });
+    },
+}));
+const REINSERT_STATIC_PIVOT_CHILDREN = (env) => env.model.getters.getPivotIds().map((pivotId, index) => ({
+    id: `reinsert_static_pivot_${env.model.getters.getPivotFormulaId(pivotId)}`,
     name: env.model.getters.getPivotDisplayName(pivotId),
     sequence: index,
     execute: (env) => {
@@ -28393,6 +28424,7 @@ const REINSERT_PIVOT_CHILDREN = (env) => env.model.getters.getPivotIds().map((pi
             col: zone.left,
             row: zone.top,
             sheetId: env.model.getters.getActiveSheetId(),
+            pivotMode: "static",
         });
         env.model.dispatch("REFRESH_PIVOT", { id: pivotId });
     },
@@ -29261,12 +29293,20 @@ const splitToColumns = {
     isEnabled: (env) => env.model.getters.isSingleColSelected(),
     icon: "o-spreadsheet-Icon.SPLIT_TEXT",
 };
-const reinsertPivotMenu = {
-    id: "reinsert_pivot",
-    name: _t("Re-insert pivot"),
+const reinsertDynamicPivotMenu = {
+    id: "reinsert_dynamic_pivot",
+    name: _t("Re-insert dynamic pivot"),
+    sequence: 1020,
+    icon: "o-spreadsheet-Icon.INSERT_PIVOT",
+    children: [REINSERT_DYNAMIC_PIVOT_CHILDREN],
+    isVisible: (env) => env.model.getters.getPivotIds().length > 0,
+};
+const reinsertStaticPivotMenu = {
+    id: "reinsert_static_pivot",
+    name: _t("Re-insert static pivot"),
     sequence: 1020,
     icon: "o-spreadsheet-Icon.INSERT_PIVOT",
-    children: [REINSERT_PIVOT_CHILDREN],
+    children: [REINSERT_STATIC_PIVOT_CHILDREN],
     isVisible: (env) => env.model.getters.getPivotIds().length > 0,
 };
 
@@ -29275,7 +29315,8 @@ var ACTION_DATA = /*#__PURE__*/Object.freeze({
   createRemoveFilter: createRemoveFilter,
   createRemoveFilterTool: createRemoveFilterTool,
   dataCleanup: dataCleanup,
-  reinsertPivotMenu: reinsertPivotMenu,
+  reinsertDynamicPivotMenu: reinsertDynamicPivotMenu,
+  reinsertStaticPivotMenu: reinsertStaticPivotMenu,
   removeDuplicates: removeDuplicates,
   sortAscending: sortAscending,
   sortDescending: sortDescending,
@@ -30757,7 +30798,8 @@ topbarMenuRegistry
         };
     });
 })
-    .addChild("reinsert_pivot", ["data"], reinsertPivotMenu);
+    .addChild("reinsert_dynamic_pivot", ["data"], reinsertDynamicPivotMenu)
+    .addChild("reinsert_static_pivot", ["data"], reinsertStaticPivotMenu);
 
 class OTRegistry extends Registry {
     /**
@@ -44067,6 +44109,18 @@ function convertOperator(operator) {
 // -------------------------------------
 //        WORKSHEET HELPERS
 // -------------------------------------
+function getCellType(value) {
+    switch (typeof value) {
+        case "boolean":
+            return "b";
+        case "string":
+            return "str";
+        case "number":
+            return "n";
+        default:
+            return undefined;
+    }
+}
 function convertHeightToExcel(height) {
     return Math.round(HEIGHT_FACTOR * height * 100) / 100;
 }
@@ -54317,8 +54371,9 @@ class Evaluator {
     }
     getCellsDependingOn(positions) {
         const ranges = [];
-        for (const position of positions) {
-            ranges.push({ sheetId: position.sheetId, zone: positionToZone(position) });
+        const zonesBySheetIds = aggregatePositionsToZones(positions);
+        for (const sheetId in zonesBySheetIds) {
+            ranges.push(...zonesBySheetIds[sheetId].map((zone) => ({ sheetId, zone })));
         }
         return this.formulaDependencies().getCellsDependingOn(ranges);
     }
@@ -57228,9 +57283,9 @@ class Session extends EventBus {
     /**
      * Notify the server that the user client left the collaborative session
      */
-    leave(data) {
+    async leave(data) {
         if (Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
-            this.snapshot(data());
+            await this.snapshot(data());
         }
         delete this.clients[this.clientId];
         this.transportService.leave(this.clientId);
@@ -57243,12 +57298,12 @@ class Session extends EventBus {
     /**
      * Send a snapshot of the spreadsheet to the collaboration server
      */
-    snapshot(data) {
+    async snapshot(data) {
         if (this.pendingMessages.length !== 0) {
             return;
         }
         const snapshotId = this.uuidGenerator.uuidv4();
-        this.transportService.sendMessage({
+        await this.transportService.sendMessage({
             type: "SNAPSHOT",
             nextRevisionId: snapshotId,
             serverRevisionId: this.serverRevisionId,
@@ -57932,7 +57987,7 @@ class InsertPivotPlugin extends UIPlugin {
                 this.duplicatePivotInNewSheet(cmd.pivotId, cmd.newPivotId, cmd.newSheetId);
                 break;
             case "INSERT_PIVOT_WITH_TABLE":
-                this.insertPivotWithTable(cmd.sheetId, cmd.col, cmd.row, cmd.pivotId, cmd.table);
+                this.insertPivotWithTable(cmd.sheetId, cmd.col, cmd.row, cmd.pivotId, cmd.table, cmd.pivotMode);
                 break;
         }
     }
@@ -58008,26 +58063,44 @@ class InsertPivotPlugin extends UIPlugin {
         }
         return name;
     }
-    insertPivotWithTable(sheetId, col, row, pivotId, table) {
+    insertPivotWithTable(sheetId, col, row, pivotId, table, mode) {
         const { cols, rows, measures, fieldsType } = table;
         const pivotTable = new SpreadsheetPivotTable(cols, rows, measures, fieldsType || {});
+        const numberOfHeaders = pivotTable.columns.length - 1;
         this.resizeSheet(sheetId, col, row, pivotTable);
         const pivotFormulaId = this.getters.getPivotFormulaId(pivotId);
-        this.dispatch("UPDATE_CELL", {
-            sheetId,
-            col,
-            row,
-            content: `=PIVOT(${pivotFormulaId})`,
-        });
-        const zone = {
-            left: col,
-            right: col,
-            top: row,
-            bottom: row,
-        };
-        const numberOfHeaders = pivotTable.columns.length - 1;
+        let zone;
+        if (mode === "dynamic") {
+            this.dispatch("UPDATE_CELL", {
+                sheetId,
+                col,
+                row,
+                content: `=PIVOT(${pivotFormulaId})`,
+            });
+            zone = {
+                left: col,
+                right: col,
+                top: row,
+                bottom: row,
+            };
+        }
+        else {
+            this.dispatch("INSERT_PIVOT", {
+                sheetId,
+                col,
+                row,
+                pivotId,
+                table: pivotTable.export(),
+            });
+            zone = {
+                left: col,
+                right: col + pivotTable.getNumberOfDataColumns(),
+                top: row,
+                bottom: row + numberOfHeaders + pivotTable.rows.length,
+            };
+        }
         this.dispatch("CREATE_TABLE", {
-            tableType: "dynamic",
+            tableType: mode,
             sheetId,
             ranges: [this.getters.getRangeDataFromZone(sheetId, zone)],
             config: { ...PIVOT_TABLE_CONFIG, numberOfHeaders },
@@ -60229,6 +60302,8 @@ class GridSelectionPlugin extends UIPlugin {
                 this.selectedFigureId = null;
                 break;
         }
+    }
+    finalize() {
         /** Any change to the selection has to be  reflected in the selection processor. */
         this.selection.resetDefaultAnchor(this, deepCopy(this.gridSelection.anchor));
     }
@@ -61010,7 +61085,6 @@ class SheetViewPlugin extends UIPlugin {
         }
     }
     handle(cmd) {
-        this.cleanViewports();
         // changing the evaluation can hide/show rows because of data filters
         if (invalidateEvaluationCommands.has(cmd.type)) {
             for (const sheetId of this.getters.getSheetIds()) {
@@ -61026,6 +61100,7 @@ class SheetViewPlugin extends UIPlugin {
                 break;
             case "UNDO":
             case "REDO":
+                this.cleanViewports();
                 for (const sheetId of this.getters.getSheetIds()) {
                     this.sheetsWithDirtyViewports.add(sheetId);
                 }
@@ -61080,6 +61155,9 @@ class SheetViewPlugin extends UIPlugin {
                     }
                 }
                 break;
+            case "DELETE_SHEET":
+                this.cleanViewports();
+                break;
             case "ACTIVATE_SHEET":
                 this.sheetsWithDirtyViewports.add(cmd.sheetIdTo);
                 break;
@@ -62367,6 +62445,17 @@ css /* scss */ `
       .o-bottom-bar-fade-in {
         background-image: linear-gradient(90deg, #cfcfcf, transparent 1%);
       }
+
+      .o-sheet-list {
+        overflow-y: hidden;
+        overflow-x: auto;
+
+        &::-webkit-scrollbar {
+          display: none; /* Chrome */
+        }
+        -ms-overflow-style: none; /* IE and Edge */
+        scrollbar-width: none; /* Firefox */
+      }
     }
 
     .o-bottom-bar-arrows {
@@ -64340,7 +64429,7 @@ class Spreadsheet extends owl.Component {
 
 class LocalTransportService {
     listeners = [];
-    sendMessage(message) {
+    async sendMessage(message) {
         for (const { callback } of this.listeners) {
             callback(message);
         }
@@ -66433,17 +66522,13 @@ function addFormula(cell) {
     if (!formula) {
         return { attrs: [], node: escapeXml `` };
     }
-    const attrs = [];
-    let node = escapeXml ``;
-    let cycle = escapeXml ``;
-    const XlsxFormula = adaptFormulaToExcel(formula);
-    // hack for cycles : if we don't set a value (be it 0 or #VALUE!), it will appear as invisible on excel,
-    // Making it very hard for the client to find where the recursion is.
-    if (cell.value === CellErrorType.CircularDependency) {
-        attrs.push(["t", "str"]);
-        cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
+    const type = getCellType(cell.value);
+    if (type === undefined) {
+        return { attrs: [], node: escapeXml `` };
     }
-    node = escapeXml /*xml*/ `<f>${XlsxFormula}</f>${cycle}`;
+    const attrs = [["t", type]];
+    const XlsxFormula = adaptFormulaToExcel(formula);
+    const node = escapeXml /*xml*/ `<f>${XlsxFormula}</f><v>${cell.value}</v>`;
     return { attrs, node };
 }
 function addContent(content, sharedStrings, forceString = false) {
@@ -67857,8 +67942,8 @@ class Model extends EventBus {
     joinSession() {
         this.session.join(this.config.client);
     }
-    leaveSession() {
-        this.session.leave(lazy(() => this.exportData()));
+    async leaveSession() {
+        await this.session.leave(lazy(() => this.exportData()));
     }
     setupUiPlugin(Plugin) {
         const plugin = new Plugin(this.uiPluginConfig);
@@ -68460,6 +68545,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.4.6";
-__info__.date = "2024-08-26T13:50:49.623Z";
-__info__.hash = "f5648d9";
+__info__.version = "17.4.7";
+__info__.date = "2024-09-05T09:32:00.461Z";
+__info__.hash = "c14a4c9";

package/dist/o-spreadsheet.d.ts

@@ -1283,6 +1283,7 @@ interface InsertPivotWithTableCommand {
     row: HeaderIndex;
     pivotId: UID;
     table: PivotTableData;
+    pivotMode: "static" | "dynamic";
 }
 type CoreCommand = 
 /** CELLS */
@@ -3769,7 +3770,7 @@ interface TransportService<T = any> {
     /**
      * Send a message to all clients
      */
-    sendMessage: (message: T) => void;
+    sendMessage: (message: T) => Promise<void>;
     /**
      * Register a callback function which will be called each time
      * a new message is received.
@@ -3866,11 +3867,11 @@ declare class Session extends EventBus<CollaborativeEvent> {
     /**
      * Notify the server that the user client left the collaborative session
      */
-    leave(data: Lazy<WorkbookData>): void;
+    leave(data: Lazy<WorkbookData>): Promise<void>;
     /**
      * Send a snapshot of the spreadsheet to the collaboration server
      */
-    snapshot(data: WorkbookData): void;
+    snapshot(data: WorkbookData): Promise<void>;
     getClient(): Client;
     getConnectedClients(): Set<Client>;
     getRevisionId(): UID;
@@ -4829,6 +4830,7 @@ declare class GridSelectionPlugin extends UIPlugin {
     allowDispatch(cmd: LocalCommand): CommandResult;
     private handleEvent;
     handle(cmd: Command): void;
+    finalize(): void;
     isGridSelectionActive(): boolean;
     getActiveSheet(): Readonly<Sheet>;
     getActiveSheetId(): UID;
@@ -5780,7 +5782,7 @@ declare class Model extends EventBus<any> implements CommandDispatcher {
     private readonly coreHandlers;
     constructor(data?: any, config?: Partial<ModelConfig>, stateUpdateMessages?: StateUpdateMessage[], uuidGenerator?: UuidGenerator, verboseImport?: boolean);
     joinSession(): void;
-    leaveSession(): void;
+    leaveSession(): Promise<void>;
     private setupUiPlugin;
     /**
      * Initialize and properly configure a plugin.
@@ -9929,12 +9931,14 @@ declare const sortDescending: ActionSpec;
 declare const createRemoveFilter: ActionSpec;
 declare const createRemoveFilterTool: ActionSpec;
 declare const splitToColumns: ActionSpec;
-declare const reinsertPivotMenu: ActionSpec;
+declare const reinsertDynamicPivotMenu: ActionSpec;
+declare const reinsertStaticPivotMenu: ActionSpec;
 
 declare const ACTION_DATA_createRemoveFilter: typeof createRemoveFilter;
 declare const ACTION_DATA_createRemoveFilterTool: typeof createRemoveFilterTool;
 declare const ACTION_DATA_dataCleanup: typeof dataCleanup;
-declare const ACTION_DATA_reinsertPivotMenu: typeof reinsertPivotMenu;
+declare const ACTION_DATA_reinsertDynamicPivotMenu: typeof reinsertDynamicPivotMenu;
+declare const ACTION_DATA_reinsertStaticPivotMenu: typeof reinsertStaticPivotMenu;
 declare const ACTION_DATA_removeDuplicates: typeof removeDuplicates;
 declare const ACTION_DATA_sortAscending: typeof sortAscending;
 declare const ACTION_DATA_sortDescending: typeof sortDescending;
@@ -9946,7 +9950,8 @@ declare namespace ACTION_DATA {
     ACTION_DATA_createRemoveFilter as createRemoveFilter,
     ACTION_DATA_createRemoveFilterTool as createRemoveFilterTool,
     ACTION_DATA_dataCleanup as dataCleanup,
-    ACTION_DATA_reinsertPivotMenu as reinsertPivotMenu,
+    ACTION_DATA_reinsertDynamicPivotMenu as reinsertDynamicPivotMenu,
+    ACTION_DATA_reinsertStaticPivotMenu as reinsertStaticPivotMenu,
     ACTION_DATA_removeDuplicates as removeDuplicates,
     ACTION_DATA_sortAscending as sortAscending,
     ACTION_DATA_sortDescending as sortDescending,