@odoo/o-spreadsheet 17.2.9 → 17.2.11

package/dist/o-spreadsheet.cjs.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.9
- * @date 2024-06-03T14:56:21.684Z
- * @hash 086af6d
+ * @version 17.2.11
+ * @date 2024-06-14T10:03:05.033Z
+ * @hash 7704cc4
  */
 
 'use strict';
@@ -295,7 +295,10 @@ function deepCopy(obj) {
  * Check if the object is a plain old javascript object.
  */
 function isPlainObject(obj) {
-    return typeof obj === "object" && obj?.constructor === Object;
+    return (typeof obj === "object" &&
+        obj !== null &&
+        // obj.constructor can be undefined when there's no prototype (`Object.create(null, {})`)
+        (obj?.constructor === Object || obj?.constructor === undefined));
 }
 /**
  * Sanitize the name of a sheet, by eventually removing quotes
@@ -19774,7 +19777,7 @@ function chartToImage(runtime, figure, type) {
     if ("chartJsConfig" in runtime) {
         runtime.chartJsConfig.plugins = [backgroundColorChartJSPlugin];
         // @ts-ignore
-        const chart = new window.Chart(canvas, runtime.chartJsConfig);
+        const chart = new window.Chart(canvas, deepCopy(runtime.chartJsConfig));
         const imgContent = chart.toBase64Image();
         chart.destroy();
         div.remove();
@@ -21720,8 +21723,7 @@ function zoneToRect(zone) {
  */
 function useSpreadsheetRect() {
     const position = owl.useState({ x: 0, y: 0, width: 0, height: 0 });
-    let spreadsheetElement = document.querySelector(".o-spreadsheet");
-    updatePosition();
+    let spreadsheetElement = null;
     function updatePosition() {
         if (!spreadsheetElement) {
             spreadsheetElement = document.querySelector(".o-spreadsheet");
@@ -21843,7 +21845,7 @@ class Popover extends owl.Component {
             if (!anchor)
                 return;
             const propsMaxSize = { width: this.props.maxWidth, height: this.props.maxHeight };
-            const elDims = {
+            let elDims = {
                 width: el.getBoundingClientRect().width,
                 height: el.getBoundingClientRect().height,
             };
@@ -21851,7 +21853,14 @@ class Popover extends owl.Component {
             const popoverPositionHelper = this.props.positioning === "BottomLeft"
                 ? new BottomLeftPopoverContext(anchor, this.containerRect, propsMaxSize, spreadsheetRect)
                 : new TopRightPopoverContext(anchor, this.containerRect, propsMaxSize, spreadsheetRect);
-            const style = popoverPositionHelper.getCss(elDims, this.props.verticalOffset);
+            el.style["max-height"] = popoverPositionHelper.getMaxHeight(elDims.height) + "px";
+            el.style["max-width"] = popoverPositionHelper.getMaxWidth(elDims.width) + "px";
+            // Re-compute the dimensions after setting the max-width and max-height
+            elDims = {
+                width: el.getBoundingClientRect().width,
+                height: el.getBoundingClientRect().height,
+            };
+            let style = popoverPositionHelper.getCss(elDims, this.props.verticalOffset);
             for (const property of Object.keys(style)) {
                 el.style[property] = style[property];
             }
@@ -21914,8 +21923,6 @@ class PopoverPositionContext {
         const shouldRenderAtRight = this.shouldRenderAtRight(elDims.width);
         verticalOffset = shouldRenderAtBottom ? verticalOffset : -verticalOffset;
         const cssProperties = {
-            "max-height": maxHeight + "px",
-            "max-width": maxWidth + "px",
             top: this.getTopCoordinate(actualHeight, shouldRenderAtBottom) -
                 this.spreadsheetOffset.y -
                 verticalOffset +
@@ -29210,13 +29217,17 @@ class SelectMenu extends owl.Component {
         class: { type: String, optional: true },
     };
     static components = { Menu };
+    menuId = new UuidGenerator().uuidv4();
     selectRef = owl.useRef("select");
     selectRect = useAbsoluteBoundingRect(this.selectRef);
     state = owl.useState({
         isMenuOpen: false,
     });
-    onClick() {
-        this.state.isMenuOpen = true;
+    onClick(ev) {
+        if (ev.closedMenuId === this.menuId) {
+            return;
+        }
+        this.state.isMenuOpen = !this.state.isMenuOpen;
     }
     onMenuClosed() {
         this.state.isMenuOpen = false;
@@ -29224,7 +29235,7 @@ class SelectMenu extends owl.Component {
     get menuPosition() {
         return {
             x: this.selectRect.x,
-            y: this.selectRect.y,
+            y: this.selectRect.y + this.selectRect.height,
         };
     }
 }
@@ -30164,9 +30175,9 @@ class FindAndReplacePanel extends owl.Component {
     static props = {
         onCloseSidePanel: Function,
     };
-    dataRange = "";
     searchInput = owl.useRef("searchInput");
     store;
+    state;
     get hasSearchResult() {
         return this.store.selectedMatchIndex !== null;
     }
@@ -30196,6 +30207,7 @@ class FindAndReplacePanel extends owl.Component {
     }
     setup() {
         this.store = useLocalStore(FindAndReplaceStore);
+        this.state = owl.useState({ dataRange: "" });
         owl.onMounted(() => this.searchInput.el?.focus());
     }
     onFocusSearch() {
@@ -30232,13 +30244,13 @@ class FindAndReplacePanel extends owl.Component {
         this.store.updateSearchOptions({ searchScope });
     }
     onSearchRangeChanged(ranges) {
-        this.dataRange = ranges[0];
+        this.state.dataRange = ranges[0];
     }
     updateDataRange() {
-        if (!this.dataRange || this.searchOptions.searchScope !== "specificRange") {
+        if (!this.state.dataRange || this.searchOptions.searchScope !== "specificRange") {
             return;
         }
-        const specificRange = this.env.model.getters.getRangeFromSheetXC(this.env.model.getters.getActiveSheetId(), this.dataRange);
+        const specificRange = this.env.model.getters.getRangeFromSheetXC(this.env.model.getters.getActiveSheetId(), this.state.dataRange);
         this.store.updateSearchOptions({ specificRange });
     }
 }
@@ -32432,8 +32444,15 @@ class Composer extends owl.Component {
     }
     onPaste(ev) {
         if (this.composerStore.editionMode !== "inactive") {
+            // let the browser clipboard work
             ev.stopPropagation();
         }
+        else {
+            // the user meant to paste in the sheet, not open the composer with the pasted content
+            // While we're not editing, we still have the focus and should therefore prevent
+            // the native "paste" to occur.
+            ev.preventDefault();
+        }
     }
     /*
      * Triggered automatically by the content-editable between the keydown and key up
@@ -32442,9 +32461,6 @@ class Composer extends owl.Component {
         if (!this.shouldProcessInputEvents) {
             return;
         }
-        if (ev.inputType === "insertFromPaste" && this.composerStore.editionMode === "inactive") {
-            return;
-        }
         ev.stopPropagation();
         let content;
         if (this.composerStore.editionMode === "inactive") {
@@ -32811,10 +32827,7 @@ class GridComposer extends owl.Component {
     }
     get containerStyle() {
         if (this.composerStore.editionMode === "inactive") {
-            return `
-        position: absolute;
-        z-index: -1000;
-      `;
+            return `z-index: -1000;`;
         }
         const isFormula = this.composerStore.currentContent.startsWith("=");
         const cell = this.env.model.getters.getActiveCell();
@@ -33525,7 +33538,7 @@ class FiguresContainer extends owl.Component {
         });
     }
     getContainerRect(container) {
-        const { width: viewWidth, height: viewHeight } = this.env.model.getters.getMainViewportRect();
+        const { width: viewWidth, height: viewHeight } = this.env.model.getters.getSheetViewDimension();
         const { x: viewportX, y: viewportY } = this.env.model.getters.getMainViewportCoordinates();
         const x = ["bottomRight", "topRight"].includes(container) ? viewportX : 0;
         const width = viewWidth - x;
@@ -50288,7 +50301,10 @@ class Session extends EventBus {
     /**
      * Notify the server that the user client left the collaborative session
      */
-    leave() {
+    leave(data) {
+        if (Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
+            this.snapshot(data);
+        }
         delete this.clients[this.clientId];
         this.transportService.leave(this.clientId);
         this.transportService.sendMessage({
@@ -50301,6 +50317,9 @@ class Session extends EventBus {
      * Send a snapshot of the spreadsheet to the collaboration server
      */
     snapshot(data) {
+        if (this.pendingMessages.length !== 0) {
+            return;
+        }
         const snapshotId = this.uuidGenerator.uuidv4();
         this.transportService.sendMessage({
             type: "SNAPSHOT",
@@ -60213,7 +60232,7 @@ class Model extends EventBus {
         this.session.join(this.config.client);
     }
     leaveSession() {
-        this.session.leave();
+        this.session.leave(this.exportData());
     }
     setupUiPlugin(Plugin) {
         const plugin = new Plugin(this.uiPluginConfig);
@@ -60767,6 +60786,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.9";
-__info__.date = "2024-06-03T14:56:21.684Z";
-__info__.hash = "086af6d";
+__info__.version = "17.2.11";
+__info__.date = "2024-06-14T10:03:05.033Z";
+__info__.hash = "7704cc4";

package/dist/o-spreadsheet.d.ts

@@ -3440,7 +3440,7 @@ declare class Session extends EventBus<CollaborativeEvent> {
     /**
      * Notify the server that the user client left the collaborative session
      */
-    leave(): void;
+    leave(data: WorkbookData): void;
     /**
      * Send a snapshot of the spreadsheet to the collaboration server
      */

package/dist/o-spreadsheet.esm.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.9
- * @date 2024-06-03T14:56:21.684Z
- * @hash 086af6d
+ * @version 17.2.11
+ * @date 2024-06-14T10:03:05.033Z
+ * @hash 7704cc4
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw } from '@odoo/owl';
@@ -293,7 +293,10 @@ function deepCopy(obj) {
  * Check if the object is a plain old javascript object.
  */
 function isPlainObject(obj) {
-    return typeof obj === "object" && obj?.constructor === Object;
+    return (typeof obj === "object" &&
+        obj !== null &&
+        // obj.constructor can be undefined when there's no prototype (`Object.create(null, {})`)
+        (obj?.constructor === Object || obj?.constructor === undefined));
 }
 /**
  * Sanitize the name of a sheet, by eventually removing quotes
@@ -19772,7 +19775,7 @@ function chartToImage(runtime, figure, type) {
     if ("chartJsConfig" in runtime) {
         runtime.chartJsConfig.plugins = [backgroundColorChartJSPlugin];
         // @ts-ignore
-        const chart = new window.Chart(canvas, runtime.chartJsConfig);
+        const chart = new window.Chart(canvas, deepCopy(runtime.chartJsConfig));
         const imgContent = chart.toBase64Image();
         chart.destroy();
         div.remove();
@@ -21718,8 +21721,7 @@ function zoneToRect(zone) {
  */
 function useSpreadsheetRect() {
     const position = useState({ x: 0, y: 0, width: 0, height: 0 });
-    let spreadsheetElement = document.querySelector(".o-spreadsheet");
-    updatePosition();
+    let spreadsheetElement = null;
     function updatePosition() {
         if (!spreadsheetElement) {
             spreadsheetElement = document.querySelector(".o-spreadsheet");
@@ -21841,7 +21843,7 @@ class Popover extends Component {
             if (!anchor)
                 return;
             const propsMaxSize = { width: this.props.maxWidth, height: this.props.maxHeight };
-            const elDims = {
+            let elDims = {
                 width: el.getBoundingClientRect().width,
                 height: el.getBoundingClientRect().height,
             };
@@ -21849,7 +21851,14 @@ class Popover extends Component {
             const popoverPositionHelper = this.props.positioning === "BottomLeft"
                 ? new BottomLeftPopoverContext(anchor, this.containerRect, propsMaxSize, spreadsheetRect)
                 : new TopRightPopoverContext(anchor, this.containerRect, propsMaxSize, spreadsheetRect);
-            const style = popoverPositionHelper.getCss(elDims, this.props.verticalOffset);
+            el.style["max-height"] = popoverPositionHelper.getMaxHeight(elDims.height) + "px";
+            el.style["max-width"] = popoverPositionHelper.getMaxWidth(elDims.width) + "px";
+            // Re-compute the dimensions after setting the max-width and max-height
+            elDims = {
+                width: el.getBoundingClientRect().width,
+                height: el.getBoundingClientRect().height,
+            };
+            let style = popoverPositionHelper.getCss(elDims, this.props.verticalOffset);
             for (const property of Object.keys(style)) {
                 el.style[property] = style[property];
             }
@@ -21912,8 +21921,6 @@ class PopoverPositionContext {
         const shouldRenderAtRight = this.shouldRenderAtRight(elDims.width);
         verticalOffset = shouldRenderAtBottom ? verticalOffset : -verticalOffset;
         const cssProperties = {
-            "max-height": maxHeight + "px",
-            "max-width": maxWidth + "px",
             top: this.getTopCoordinate(actualHeight, shouldRenderAtBottom) -
                 this.spreadsheetOffset.y -
                 verticalOffset +
@@ -29208,13 +29215,17 @@ class SelectMenu extends Component {
         class: { type: String, optional: true },
     };
     static components = { Menu };
+    menuId = new UuidGenerator().uuidv4();
     selectRef = useRef("select");
     selectRect = useAbsoluteBoundingRect(this.selectRef);
     state = useState({
         isMenuOpen: false,
     });
-    onClick() {
-        this.state.isMenuOpen = true;
+    onClick(ev) {
+        if (ev.closedMenuId === this.menuId) {
+            return;
+        }
+        this.state.isMenuOpen = !this.state.isMenuOpen;
     }
     onMenuClosed() {
         this.state.isMenuOpen = false;
@@ -29222,7 +29233,7 @@ class SelectMenu extends Component {
     get menuPosition() {
         return {
             x: this.selectRect.x,
-            y: this.selectRect.y,
+            y: this.selectRect.y + this.selectRect.height,
         };
     }
 }
@@ -30162,9 +30173,9 @@ class FindAndReplacePanel extends Component {
     static props = {
         onCloseSidePanel: Function,
     };
-    dataRange = "";
     searchInput = useRef("searchInput");
     store;
+    state;
     get hasSearchResult() {
         return this.store.selectedMatchIndex !== null;
     }
@@ -30194,6 +30205,7 @@ class FindAndReplacePanel extends Component {
     }
     setup() {
         this.store = useLocalStore(FindAndReplaceStore);
+        this.state = useState({ dataRange: "" });
         onMounted(() => this.searchInput.el?.focus());
     }
     onFocusSearch() {
@@ -30230,13 +30242,13 @@ class FindAndReplacePanel extends Component {
         this.store.updateSearchOptions({ searchScope });
     }
     onSearchRangeChanged(ranges) {
-        this.dataRange = ranges[0];
+        this.state.dataRange = ranges[0];
     }
     updateDataRange() {
-        if (!this.dataRange || this.searchOptions.searchScope !== "specificRange") {
+        if (!this.state.dataRange || this.searchOptions.searchScope !== "specificRange") {
             return;
         }
-        const specificRange = this.env.model.getters.getRangeFromSheetXC(this.env.model.getters.getActiveSheetId(), this.dataRange);
+        const specificRange = this.env.model.getters.getRangeFromSheetXC(this.env.model.getters.getActiveSheetId(), this.state.dataRange);
         this.store.updateSearchOptions({ specificRange });
     }
 }
@@ -32430,8 +32442,15 @@ class Composer extends Component {
     }
     onPaste(ev) {
         if (this.composerStore.editionMode !== "inactive") {
+            // let the browser clipboard work
             ev.stopPropagation();
         }
+        else {
+            // the user meant to paste in the sheet, not open the composer with the pasted content
+            // While we're not editing, we still have the focus and should therefore prevent
+            // the native "paste" to occur.
+            ev.preventDefault();
+        }
     }
     /*
      * Triggered automatically by the content-editable between the keydown and key up
@@ -32440,9 +32459,6 @@ class Composer extends Component {
         if (!this.shouldProcessInputEvents) {
             return;
         }
-        if (ev.inputType === "insertFromPaste" && this.composerStore.editionMode === "inactive") {
-            return;
-        }
         ev.stopPropagation();
         let content;
         if (this.composerStore.editionMode === "inactive") {
@@ -32809,10 +32825,7 @@ class GridComposer extends Component {
     }
     get containerStyle() {
         if (this.composerStore.editionMode === "inactive") {
-            return `
-        position: absolute;
-        z-index: -1000;
-      `;
+            return `z-index: -1000;`;
         }
         const isFormula = this.composerStore.currentContent.startsWith("=");
         const cell = this.env.model.getters.getActiveCell();
@@ -33523,7 +33536,7 @@ class FiguresContainer extends Component {
         });
     }
     getContainerRect(container) {
-        const { width: viewWidth, height: viewHeight } = this.env.model.getters.getMainViewportRect();
+        const { width: viewWidth, height: viewHeight } = this.env.model.getters.getSheetViewDimension();
         const { x: viewportX, y: viewportY } = this.env.model.getters.getMainViewportCoordinates();
         const x = ["bottomRight", "topRight"].includes(container) ? viewportX : 0;
         const width = viewWidth - x;
@@ -50286,7 +50299,10 @@ class Session extends EventBus {
     /**
      * Notify the server that the user client left the collaborative session
      */
-    leave() {
+    leave(data) {
+        if (Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
+            this.snapshot(data);
+        }
         delete this.clients[this.clientId];
         this.transportService.leave(this.clientId);
         this.transportService.sendMessage({
@@ -50299,6 +50315,9 @@ class Session extends EventBus {
      * Send a snapshot of the spreadsheet to the collaboration server
      */
     snapshot(data) {
+        if (this.pendingMessages.length !== 0) {
+            return;
+        }
         const snapshotId = this.uuidGenerator.uuidv4();
         this.transportService.sendMessage({
             type: "SNAPSHOT",
@@ -60211,7 +60230,7 @@ class Model extends EventBus {
         this.session.join(this.config.client);
     }
     leaveSession() {
-        this.session.leave();
+        this.session.leave(this.exportData());
     }
     setupUiPlugin(Plugin) {
         const plugin = new Plugin(this.uiPluginConfig);
@@ -60724,6 +60743,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, 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.2.9";
-__info__.date = "2024-06-03T14:56:21.684Z";
-__info__.hash = "086af6d";
+__info__.version = "17.2.11";
+__info__.date = "2024-06-14T10:03:05.033Z";
+__info__.hash = "7704cc4";