@odoo/o-spreadsheet 17.1.18 → 17.1.19

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.1.18
- * @date 2024-06-10T09:34:55.045Z
- * @hash 0e756ce
+ * @version 17.1.19
+ * @date 2024-06-14T10:03:04.850Z
+ * @hash 8a74f95
  */
 
 'use strict';
@@ -6995,7 +6995,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,
             };
@@ -7003,7 +7003,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];
             }
@@ -7066,8 +7073,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 +
@@ -25473,13 +25478,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;
@@ -25487,7 +25496,7 @@ class SelectMenu extends owl.Component {
     get menuPosition() {
         return {
             x: this.selectRect.x,
-            y: this.selectRect.y,
+            y: this.selectRect.y + this.selectRect.height,
         };
     }
 }
@@ -28525,7 +28534,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;
@@ -44798,7 +44807,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({
@@ -44811,6 +44823,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",
@@ -49510,10 +49525,8 @@ class EditionPlugin extends UIPlugin {
             const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
             return isEqual(this.getters.expandZone(activeSheetId, refRange.zone), oldZone);
         });
-        // this function assumes that the previous range is always found because
-        // it's called when changing a highlight, which exists by definition
         if (!previousRefToken) {
-            throw new Error("Previous range not found");
+            return;
         }
         const previousRange = this.getters.getRangeFromSheetXC(activeSheetId, previousRefToken.value);
         this.selectionStart = previousRefToken.start;
@@ -57266,7 +57279,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);
@@ -57690,6 +57703,7 @@ const helpers = {
     createAction,
     createActions,
     transformRangeData,
+    deepEquals,
 };
 const links = {
     isMarkdownLink,
@@ -57777,6 +57791,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.1.18";
-__info__.date = "2024-06-10T09:34:55.045Z";
-__info__.hash = "0e756ce";
+__info__.version = "17.1.19";
+__info__.date = "2024-06-14T10:03:04.850Z";
+__info__.hash = "8a74f95";

package/dist/o-spreadsheet.d.ts

@@ -841,7 +841,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
      */
@@ -982,6 +982,10 @@ declare function isDefined<T>(argument: T | undefined): argument is T;
  * Lazy value computed by the provided function.
  */
 declare function lazy<T>(fn: (() => T) | T): Lazy<T>;
+/**
+ * Compares two objects.
+ */
+declare function deepEquals(o1: any, o2: any, ignoreFunctions?: "ignoreFunctions"): boolean;
 
 interface ConstructorArgs {
     readonly zone: Readonly<Zone | UnboundedZone>;
@@ -8691,6 +8695,7 @@ declare const helpers: {
     createAction: typeof createAction;
     createActions: typeof createActions;
     transformRangeData: typeof transformRangeData;
+    deepEquals: typeof deepEquals;
 };
 declare const links: {
     isMarkdownLink: typeof isMarkdownLink;

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.1.18
- * @date 2024-06-10T09:34:55.045Z
- * @hash 0e756ce
+ * @version 17.1.19
+ * @date 2024-06-14T10:03:04.850Z
+ * @hash 8a74f95
  */
 
 import { Component, useRef, onMounted, onWillUnmount, useEffect, onWillPatch, useState, onWillUpdateProps, onPatched, useComponent, useExternalListener, onWillStart, xml, useChildSubEnv, useSubEnv, markRaw } from '@odoo/owl';
@@ -6993,7 +6993,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,
             };
@@ -7001,7 +7001,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];
             }
@@ -7064,8 +7071,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 +
@@ -25471,13 +25476,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;
@@ -25485,7 +25494,7 @@ class SelectMenu extends Component {
     get menuPosition() {
         return {
             x: this.selectRect.x,
-            y: this.selectRect.y,
+            y: this.selectRect.y + this.selectRect.height,
         };
     }
 }
@@ -28523,7 +28532,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;
@@ -44796,7 +44805,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({
@@ -44809,6 +44821,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",
@@ -49508,10 +49523,8 @@ class EditionPlugin extends UIPlugin {
             const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
             return isEqual(this.getters.expandZone(activeSheetId, refRange.zone), oldZone);
         });
-        // this function assumes that the previous range is always found because
-        // it's called when changing a highlight, which exists by definition
         if (!previousRefToken) {
-            throw new Error("Previous range not found");
+            return;
         }
         const previousRange = this.getters.getRangeFromSheetXC(activeSheetId, previousRefToken.value);
         this.selectionStart = previousRefToken.start;
@@ -57264,7 +57277,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);
@@ -57688,6 +57701,7 @@ const helpers = {
     createAction,
     createActions,
     transformRangeData,
+    deepEquals,
 };
 const links = {
     isMarkdownLink,
@@ -57739,6 +57753,6 @@ const constants = {
 export { AbstractChart, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = "17.1.18";
-__info__.date = "2024-06-10T09:34:55.045Z";
-__info__.hash = "0e756ce";
+__info__.version = "17.1.19";
+__info__.date = "2024-06-14T10:03:04.850Z";
+__info__.hash = "8a74f95";

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.1.18
- * @date 2024-06-10T09:34:55.045Z
- * @hash 0e756ce
+ * @version 17.1.19
+ * @date 2024-06-14T10:03:04.850Z
+ * @hash 8a74f95
  */
 
 (function (exports, owl) {
@@ -6994,7 +6994,7 @@
               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,
               };
@@ -7002,7 +7002,14 @@
               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];
               }
@@ -7065,8 +7072,6 @@
           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 +
@@ -25472,13 +25477,17 @@
           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;
@@ -25486,7 +25495,7 @@
       get menuPosition() {
           return {
               x: this.selectRect.x,
-              y: this.selectRect.y,
+              y: this.selectRect.y + this.selectRect.height,
           };
       }
   }
@@ -28524,7 +28533,7 @@
           });
       }
       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;
@@ -44797,7 +44806,10 @@
       /**
        * 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({
@@ -44810,6 +44822,9 @@
        * 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",
@@ -49509,10 +49524,8 @@
               const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
               return isEqual(this.getters.expandZone(activeSheetId, refRange.zone), oldZone);
           });
-          // this function assumes that the previous range is always found because
-          // it's called when changing a highlight, which exists by definition
           if (!previousRefToken) {
-              throw new Error("Previous range not found");
+              return;
           }
           const previousRange = this.getters.getRangeFromSheetXC(activeSheetId, previousRefToken.value);
           this.selectionStart = previousRefToken.start;
@@ -57265,7 +57278,7 @@
           this.session.join(this.config.client);
       }
       leaveSession() {
-          this.session.leave();
+          this.session.leave(this.exportData());
       }
       setupUiPlugin(Plugin) {
           const plugin = new Plugin(this.uiPluginConfig);
@@ -57689,6 +57702,7 @@
       createAction,
       createActions,
       transformRangeData,
+      deepEquals,
   };
   const links = {
       isMarkdownLink,
@@ -57776,9 +57790,9 @@
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.1.18";
-  __info__.date = "2024-06-10T09:34:55.045Z";
-  __info__.hash = "0e756ce";
+  __info__.version = "17.1.19";
+  __info__.date = "2024-06-14T10:03:04.850Z";
+  __info__.hash = "8a74f95";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);