@odoo/o-spreadsheet 17.2.10 → 17.2.12

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.10
- * @date 2024-06-10T09:38:54.354Z
- * @hash 14317ee
+ * @version 17.2.12
+ * @date 2024-06-21T19:58:15.248Z
+ * @hash 1aaacc4
  */
 
 'use strict';
@@ -8881,10 +8881,8 @@ class ComposerStore extends SpreadsheetStore {
             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;
@@ -21845,7 +21843,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,
             };
@@ -21853,7 +21851,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];
             }
@@ -21916,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 +
@@ -29212,13 +29215,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;
@@ -29226,7 +29233,7 @@ class SelectMenu extends owl.Component {
     get menuPosition() {
         return {
             x: this.selectRect.x,
-            y: this.selectRect.y,
+            y: this.selectRect.y + this.selectRect.height,
         };
     }
 }
@@ -30166,9 +30173,9 @@ class FindAndReplacePanel extends owl.Component {
     static props = {
         onCloseSidePanel: Function,
     };
-    dataRange = "";
     searchInput = owl.useRef("searchInput");
     store;
+    state;
     get hasSearchResult() {
         return this.store.selectedMatchIndex !== null;
     }
@@ -30198,6 +30205,7 @@ class FindAndReplacePanel extends owl.Component {
     }
     setup() {
         this.store = useLocalStore(FindAndReplaceStore);
+        this.state = owl.useState({ dataRange: "" });
         owl.onMounted(() => this.searchInput.el?.focus());
     }
     onFocusSearch() {
@@ -30234,13 +30242,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 });
     }
 }
@@ -33528,7 +33536,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;
@@ -50291,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({
@@ -50304,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",
@@ -60216,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);
@@ -60770,6 +60784,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.10";
-__info__.date = "2024-06-10T09:38:54.354Z";
-__info__.hash = "14317ee";
+__info__.version = "17.2.12";
+__info__.date = "2024-06-21T19:58:15.248Z";
+__info__.hash = "1aaacc4";

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.10
- * @date 2024-06-10T09:38:54.354Z
- * @hash 14317ee
+ * @version 17.2.12
+ * @date 2024-06-21T19:58:15.248Z
+ * @hash 1aaacc4
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw } from '@odoo/owl';
@@ -8879,10 +8879,8 @@ class ComposerStore extends SpreadsheetStore {
             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;
@@ -21843,7 +21841,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,
             };
@@ -21851,7 +21849,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];
             }
@@ -21914,8 +21919,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 +29213,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;
@@ -29224,7 +29231,7 @@ class SelectMenu extends Component {
     get menuPosition() {
         return {
             x: this.selectRect.x,
-            y: this.selectRect.y,
+            y: this.selectRect.y + this.selectRect.height,
         };
     }
 }
@@ -30164,9 +30171,9 @@ class FindAndReplacePanel extends Component {
     static props = {
         onCloseSidePanel: Function,
     };
-    dataRange = "";
     searchInput = useRef("searchInput");
     store;
+    state;
     get hasSearchResult() {
         return this.store.selectedMatchIndex !== null;
     }
@@ -30196,6 +30203,7 @@ class FindAndReplacePanel extends Component {
     }
     setup() {
         this.store = useLocalStore(FindAndReplaceStore);
+        this.state = useState({ dataRange: "" });
         onMounted(() => this.searchInput.el?.focus());
     }
     onFocusSearch() {
@@ -30232,13 +30240,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 });
     }
 }
@@ -33526,7 +33534,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;
@@ -50289,7 +50297,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({
@@ -50302,6 +50313,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",
@@ -60214,7 +60228,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);
@@ -60727,6 +60741,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.10";
-__info__.date = "2024-06-10T09:38:54.354Z";
-__info__.hash = "14317ee";
+__info__.version = "17.2.12";
+__info__.date = "2024-06-21T19:58:15.248Z";
+__info__.hash = "1aaacc4";

package/dist/o-spreadsheet.iife.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.10
- * @date 2024-06-10T09:38:54.354Z
- * @hash 14317ee
+ * @version 17.2.12
+ * @date 2024-06-21T19:58:15.248Z
+ * @hash 1aaacc4
  */
 
 (function (exports, owl) {
@@ -8880,10 +8880,8 @@ stores.inject(MyMetaStore, storeInstance);
               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;
@@ -21844,7 +21842,7 @@ stores.inject(MyMetaStore, storeInstance);
               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,
               };
@@ -21852,7 +21850,14 @@ stores.inject(MyMetaStore, storeInstance);
               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];
               }
@@ -21915,8 +21920,6 @@ stores.inject(MyMetaStore, storeInstance);
           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 +
@@ -29211,13 +29214,17 @@ stores.inject(MyMetaStore, storeInstance);
           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;
@@ -29225,7 +29232,7 @@ stores.inject(MyMetaStore, storeInstance);
       get menuPosition() {
           return {
               x: this.selectRect.x,
-              y: this.selectRect.y,
+              y: this.selectRect.y + this.selectRect.height,
           };
       }
   }
@@ -30165,9 +30172,9 @@ stores.inject(MyMetaStore, storeInstance);
       static props = {
           onCloseSidePanel: Function,
       };
-      dataRange = "";
       searchInput = owl.useRef("searchInput");
       store;
+      state;
       get hasSearchResult() {
           return this.store.selectedMatchIndex !== null;
       }
@@ -30197,6 +30204,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       setup() {
           this.store = useLocalStore(FindAndReplaceStore);
+          this.state = owl.useState({ dataRange: "" });
           owl.onMounted(() => this.searchInput.el?.focus());
       }
       onFocusSearch() {
@@ -30233,13 +30241,13 @@ stores.inject(MyMetaStore, storeInstance);
           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 });
       }
   }
@@ -33527,7 +33535,7 @@ stores.inject(MyMetaStore, storeInstance);
           });
       }
       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;
@@ -50290,7 +50298,10 @@ stores.inject(MyMetaStore, storeInstance);
       /**
        * 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({
@@ -50303,6 +50314,9 @@ stores.inject(MyMetaStore, storeInstance);
        * 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",
@@ -60215,7 +60229,7 @@ stores.inject(MyMetaStore, storeInstance);
           this.session.join(this.config.client);
       }
       leaveSession() {
-          this.session.leave();
+          this.session.leave(this.exportData());
       }
       setupUiPlugin(Plugin) {
           const plugin = new Plugin(this.uiPluginConfig);
@@ -60769,9 +60783,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.2.10";
-  __info__.date = "2024-06-10T09:38:54.354Z";
-  __info__.hash = "14317ee";
+  __info__.version = "17.2.12";
+  __info__.date = "2024-06-21T19:58:15.248Z";
+  __info__.hash = "1aaacc4";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);