@odoo/o-spreadsheet 18.1.7 → 18.1.9

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 18.1.7
- * @date 2025-02-10T09:00:28.556Z
- * @hash 338d8a1
+ * @version 18.1.9
+ * @date 2025-02-25T05:59:45.472Z
+ * @hash 6789c1c
  */
 
 (function (exports, owl) {
@@ -2219,17 +2219,7 @@
    */
   function toUnboundedZone(xc) {
       const zone = toZoneWithoutBoundaryChanges(xc);
-      if (zone.right !== undefined && zone.right < zone.left) {
-          const tmp = zone.left;
-          zone.left = zone.right;
-          zone.right = tmp;
-      }
-      if (zone.bottom !== undefined && zone.bottom < zone.top) {
-          const tmp = zone.top;
-          zone.top = zone.bottom;
-          zone.bottom = tmp;
-      }
-      return zone;
+      return reorderZone(zone);
   }
   /**
    * Convert from a cartesian reference to a Zone.
@@ -2503,11 +2493,11 @@
       return positions;
   }
   function reorderZone(zone) {
-      if (zone.left > zone.right) {
-          zone = { left: zone.right, right: zone.left, top: zone.top, bottom: zone.bottom };
+      if (zone.right !== undefined && zone.left > zone.right) {
+          zone = { ...zone, left: zone.right, right: zone.left };
       }
-      if (zone.top > zone.bottom) {
-          zone = { left: zone.left, right: zone.right, top: zone.bottom, bottom: zone.top };
+      if (zone.bottom !== undefined && zone.top > zone.bottom) {
+          zone = { ...zone, top: zone.bottom, bottom: zone.top };
       }
       return zone;
   }
@@ -3412,12 +3402,12 @@
   function isRangeDependant(cmd) {
       return "ranges" in cmd;
   }
-  function isZoneDependent(cmd) {
-      return "zone" in cmd;
-  }
   function isPositionDependent(cmd) {
       return "col" in cmd && "row" in cmd && "sheetId" in cmd;
   }
+  function isZoneDependent(cmd) {
+      return "sheetId" in cmd && "zone" in cmd;
+  }
   const invalidateEvaluationCommands = new Set([
       "RENAME_SHEET",
       "DELETE_SHEET",
@@ -3429,6 +3419,7 @@
       "REDO",
       "ADD_MERGE",
       "REMOVE_MERGE",
+      "DUPLICATE_SHEET",
       "UPDATE_LOCALE",
       "ADD_PIVOT",
       "UPDATE_PIVOT",
@@ -3458,7 +3449,6 @@
   ]);
   const invalidateDependenciesCommands = new Set(["MOVE_RANGES"]);
   const invalidateCFEvaluationCommands = new Set([
-      "DUPLICATE_SHEET",
       "EVALUATE_CELLS",
       "ADD_CONDITIONAL_FORMAT",
       "REMOVE_CONDITIONAL_FORMAT",
@@ -3628,6 +3618,7 @@
       CommandResult["InvalidRange"] = "InvalidRange";
       CommandResult["InvalidZones"] = "InvalidZones";
       CommandResult["InvalidSheetId"] = "InvalidSheetId";
+      CommandResult["InvalidCellId"] = "InvalidCellId";
       CommandResult["InvalidFigureId"] = "InvalidFigureId";
       CommandResult["InputAlreadyFocused"] = "InputAlreadyFocused";
       CommandResult["MaximumRangesReached"] = "MaximumRangesReached";
@@ -4459,7 +4450,7 @@
    * @param reverseSearch if true, search in the array starting from the end.
 
    */
-  function linearSearch(data, target, mode, numberOfValues, getValueInData, reverseSearch = false) {
+  function linearSearch(data, target, mode, numberOfValues, getValueInData, lookupCaches, reverseSearch = false) {
       if (target === undefined || target.value === null) {
           return -1;
       }
@@ -4468,17 +4459,48 @@
       }
       const _target = normalizeValue(target.value);
       const getValue = reverseSearch
-          ? (data, i) => getValueInData(data, numberOfValues - i - 1)
-          : getValueInData;
+          ? (data, i) => normalizeValue(getValueInData(data, numberOfValues - i - 1))
+          : (data, i) => normalizeValue(getValueInData(data, i));
+      // first check if the target is in the cache
+      const isNotWildcardTarget = mode !== "wildcard" ||
+          typeof _target !== "string" ||
+          !(_target.includes("*") || _target.includes("?"));
+      if (lookupCaches && isNotWildcardTarget) {
+          const searchMode = reverseSearch ? "reverseSearch" : "forwardSearch";
+          let cache = lookupCaches[searchMode].get(data);
+          if (cache === undefined) {
+              // build the cache for all the values
+              cache = new Map();
+              for (let i = 0; i < numberOfValues; i++) {
+                  const value = getValue(data, i) ?? null;
+                  if (!cache.has(value)) {
+                      cache.set(value, i);
+                  }
+              }
+              lookupCaches[searchMode].set(data, cache);
+          }
+          if (cache.has(_target)) {
+              const resultIndex = cache.get(_target);
+              return reverseSearch ? numberOfValues - resultIndex - 1 : resultIndex;
+          }
+          if (mode === "strict") {
+              return -1;
+          }
+      }
+      // else perform the linear search
+      const resultIndex = _linearSearch(data, _target, mode, numberOfValues, getValue);
+      return reverseSearch && resultIndex !== -1 ? numberOfValues - resultIndex - 1 : resultIndex;
+  }
+  function _linearSearch(data, _target, mode, numberOfValues, getNormalizeValue) {
       let indexMatchTarget = (i) => {
-          return normalizeValue(getValue(data, i)) === _target;
+          return getNormalizeValue(data, i) === _target;
       };
       if (mode === "wildcard" &&
           typeof _target === "string" &&
           (_target.includes("*") || _target.includes("?"))) {
           const regExp = wildcardToRegExp(_target);
           indexMatchTarget = (i) => {
-              const value = normalizeValue(getValue(data, i));
+              const value = getNormalizeValue(data, i);
               if (typeof value === "string") {
                   return regExp.test(value);
               }
@@ -4489,7 +4511,7 @@
       let closestMatchIndex = -1;
       if (mode === "nextSmaller") {
           indexMatchTarget = (i) => {
-              const value = normalizeValue(getValue(data, i));
+              const value = getNormalizeValue(data, i);
               if ((!closestMatch && compareCellValues(_target, value) >= 0) ||
                   (compareCellValues(_target, value) >= 0 && compareCellValues(value, closestMatch) > 0)) {
                   closestMatch = value;
@@ -4500,7 +4522,7 @@
       }
       if (mode === "nextGreater") {
           indexMatchTarget = (i) => {
-              const value = normalizeValue(getValue(data, i));
+              const value = getNormalizeValue(data, i);
               if ((!closestMatch && compareCellValues(_target, value) <= 0) ||
                   (compareCellValues(_target, value) <= 0 && compareCellValues(value, closestMatch) < 0)) {
                   closestMatch = value;
@@ -4511,12 +4533,10 @@
       }
       for (let i = 0; i < numberOfValues; i++) {
           if (indexMatchTarget(i)) {
-              return reverseSearch ? numberOfValues - i - 1 : i;
+              return i;
           }
       }
-      return reverseSearch && closestMatchIndex !== -1
-          ? numberOfValues - closestMatchIndex - 1
-          : closestMatchIndex;
+      return closestMatchIndex;
   }
   /**
    * Normalize a value.
@@ -6480,11 +6500,40 @@
    * https://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
    * */
   class UuidGenerator {
+      /**
+       * Generates a custom UUID using a simple 36^12 method (8-character alphanumeric string with lowercase letters)
+       * This has a higher chance of collision than a UUIDv4, but not only faster to generate than an UUIDV4,
+       * it also has a smaller size, which is preferable to alleviate the overall data size.
+       *
+       * This method is preferable when generating uuids for the core data (sheetId, figureId, etc)
+       * as they will appear several times in the revisions and local history.
+       *
+       */
+      smallUuid() {
+          if (window.crypto) {
+              return "10000000-1000".replace(/[01]/g, (c) => {
+                  const n = Number(c);
+                  return (n ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (n / 4)))).toString(16);
+              });
+          }
+          else {
+              // mainly for jest and other browsers that do not have the crypto functionality
+              return "xxxxxxxx-xxxx".replace(/[xy]/g, function (c) {
+                  const r = (Math.random() * 16) | 0, v = c == "x" ? r : (r & 0x3) | 0x8;
+                  return v.toString(16);
+              });
+          }
+      }
+      /**
+       * Generates an UUIDV4, has astronomically low chance of collision, but is larger in size than the smallUuid.
+       * This method should be used when you need to avoid collisions at all costs, like the id of a revision.
+       */
       uuidv4() {
-          //@ts-ignore
-          if (window.crypto && window.crypto.getRandomValues) {
-              //@ts-ignore
-              return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16));
+          if (window.crypto) {
+              return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, (c) => {
+                  const n = Number(c);
+                  return (n ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (n / 4)))).toString(16);
+              });
           }
           else {
               // mainly for jest and other browsers that do not have the crypto functionality
@@ -8514,7 +8563,7 @@
           };
       }
       getPasteTarget(sheetId, target, content, options) {
-          const newId = new UuidGenerator().uuidv4();
+          const newId = new UuidGenerator().smallUuid();
           return { zones: [], figureId: newId, sheetId };
       }
       paste(target, clippedContent, options) {
@@ -8680,7 +8729,7 @@
           if (!targetCF && queuedCfs) {
               targetCF = queuedCfs.find((queued) => queued.cf.stopIfTrue === originCF.stopIfTrue && deepEquals(queued.cf.rule, originCF.rule))?.cf;
           }
-          return targetCF || { ...originCF, id: this.uuidGenerator.uuidv4(), ranges: [] };
+          return targetCF || { ...originCF, id: this.uuidGenerator.smallUuid(), ranges: [] };
       }
   }
 
@@ -8773,7 +8822,7 @@
           }
           return (targetRule || {
               ...originRule,
-              id: newId ? this.uuidGenerator.uuidv4() : originRule.id,
+              id: newId ? this.uuidGenerator.smallUuid() : originRule.id,
               ranges: [],
           });
       }
@@ -8835,7 +8884,7 @@
           };
       }
       getPasteTarget(sheetId, target, content, options) {
-          const newId = new UuidGenerator().uuidv4();
+          const newId = new UuidGenerator().smallUuid();
           return { sheetId, zones: [], figureId: newId };
       }
       paste(target, clippedContent, options) {
@@ -12037,6 +12086,25 @@ stores.inject(MyMetaStore, storeInstance);
       isExported: true,
   };
   // -----------------------------------------------------------------------------
+  // LOG
+  // -----------------------------------------------------------------------------
+  const LOG = {
+      description: _t("The logarithm of a number, for a given base."),
+      args: [
+          arg("value (number)", _t("The value for which to calculate the logarithm.")),
+          arg("base (number, default=10)", _t("The base of the logarithm.")),
+      ],
+      compute: function (value, base = { value: 10 }) {
+          const _value = toNumber(value, this.locale);
+          const _base = toNumber(base, this.locale);
+          assert(() => _value > 0, _t("The value (%s) must be strictly positive.", _value.toString()));
+          assert(() => _base > 0, _t("The base (%s) must be strictly positive.", _base.toString()));
+          assert(() => _base !== 1, _t("The base must be different from 1."));
+          return Math.log10(_value) / Math.log10(_base);
+      },
+      isExported: true,
+  };
+  // -----------------------------------------------------------------------------
   // MOD
   // -----------------------------------------------------------------------------
   function mod(dividend, divisor) {
@@ -12576,6 +12644,7 @@ stores.inject(MyMetaStore, storeInstance);
     ISODD: ISODD,
     ISO_CEILING: ISO_CEILING,
     LN: LN,
+    LOG: LOG,
     MOD: MOD,
     MUNIT: MUNIT,
     ODD: ODD,
@@ -15110,7 +15179,7 @@ stores.inject(MyMetaStore, storeInstance);
               }
           }
       },
-      isExported: true,
+      isExported: false,
   };
   // -----------------------------------------------------------------------------
   // UNIQUE
@@ -18474,7 +18543,7 @@ stores.inject(MyMetaStore, storeInstance);
           const _isSorted = toBoolean(isSorted.value);
           const colIndex = _isSorted
               ? dichotomicSearch(_range, searchKey, "nextSmaller", "asc", _range.length, getValueFromRange)
-              : linearSearch(_range, searchKey, "wildcard", _range.length, getValueFromRange);
+              : linearSearch(_range, searchKey, "wildcard", _range.length, getValueFromRange, this.lookupCaches);
           const col = _range[colIndex];
           if (col === undefined) {
               return valueNotAvailable(searchKey);
@@ -18629,7 +18698,7 @@ stores.inject(MyMetaStore, storeInstance);
                   index = dichotomicSearch(_range, searchKey, "nextSmaller", "asc", rangeLen, getElement);
                   break;
               case 0:
-                  index = linearSearch(_range, searchKey, "wildcard", rangeLen, getElement);
+                  index = linearSearch(_range, searchKey, "wildcard", rangeLen, getElement, this.lookupCaches);
                   break;
               case -1:
                   index = dichotomicSearch(_range, searchKey, "nextGreater", "desc", rangeLen, getElement);
@@ -18697,7 +18766,7 @@ stores.inject(MyMetaStore, storeInstance);
           const _isSorted = toBoolean(isSorted.value);
           const rowIndex = _isSorted
               ? dichotomicSearch(_range, searchKey, "nextSmaller", "asc", _range[0].length, getValueFromRange)
-              : linearSearch(_range, searchKey, "wildcard", _range[0].length, getValueFromRange);
+              : linearSearch(_range, searchKey, "wildcard", _range[0].length, getValueFromRange, this.lookupCaches);
           const value = _range[_index - 1][rowIndex];
           if (value === undefined) {
               return valueNotAvailable(searchKey);
@@ -18753,7 +18822,7 @@ stores.inject(MyMetaStore, storeInstance);
           const reverseSearch = _searchMode === -1;
           const index = _searchMode === 2 || _searchMode === -2
               ? dichotomicSearch(_lookupRange, searchKey, mode, _searchMode === 2 ? "asc" : "desc", rangeLen, getElement)
-              : linearSearch(_lookupRange, searchKey, mode, rangeLen, getElement, reverseSearch);
+              : linearSearch(_lookupRange, searchKey, mode, rangeLen, getElement, this.lookupCaches, reverseSearch);
           if (index !== -1) {
               return lookupDirection === "col"
                   ? _returnRange.map((col) => [col[index]])
@@ -27623,7 +27692,7 @@ stores.inject(MyMetaStore, storeInstance);
       for (const sheet of data.sheets || []) {
           for (const figure of sheet.figures || []) {
               if (figureIds.has(figure.id)) {
-                  figure.id += uuidGenerator.uuidv4();
+                  figure.id += uuidGenerator.smallUuid();
               }
               figureIds.add(figure.id);
           }
@@ -28208,9 +28277,7 @@ stores.inject(MyMetaStore, storeInstance);
       const labelValues = getChartLabelValues(getters, dataSets, labelRange);
       let labels = labelValues.formattedValues;
       let dataSetsValues = getChartDatasetValues(getters, dataSets);
-      if (definition.dataSetsHaveTitle &&
-          dataSetsValues[0] &&
-          labels.length > dataSetsValues[0].data.length) {
+      if (shouldRemoveFirstLabel(labelRange, dataSets[0], definition.dataSetsHaveTitle || false)) {
           labels.shift();
       }
       ({ labels, dataSetsValues } = filterInvalidDataPoints(labels, dataSetsValues));
@@ -28243,7 +28310,7 @@ stores.inject(MyMetaStore, storeInstance);
   }
   function getPyramidChartData(definition, dataSets, labelRange, getters) {
       const barChartData = getBarChartData(definition, dataSets, labelRange, getters);
-      const barDataset = barChartData.dataSetsValues;
+      const barDataset = barChartData.dataSetsValues.filter((ds) => !ds.hidden);
       const pyramidDatasetValues = [];
       if (barDataset[0]) {
           const pyramidData = barDataset[0].data.map((value) => (value > 0 ? value : 0));
@@ -28259,13 +28326,12 @@ stores.inject(MyMetaStore, storeInstance);
       };
   }
   function getLineChartData(definition, dataSets, labelRange, getters) {
-      const axisType = getChartAxisType(definition, labelRange, getters);
+      const axisType = getChartAxisType(definition, dataSets, labelRange, getters);
       const labelValues = getChartLabelValues(getters, dataSets, labelRange);
       let labels = axisType === "linear" ? labelValues.values : labelValues.formattedValues;
       let dataSetsValues = getChartDatasetValues(getters, dataSets);
-      if (definition.dataSetsHaveTitle &&
-          dataSetsValues[0] &&
-          labels.length > dataSetsValues[0].data.length) {
+      const removeFirstLabel = shouldRemoveFirstLabel(labelRange, dataSets[0], definition.dataSetsHaveTitle || false);
+      if (removeFirstLabel) {
           labels.shift();
       }
       ({ labels, dataSetsValues } = filterInvalidDataPoints(labels, dataSetsValues));
@@ -28277,7 +28343,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       const leftAxisFormat = getChartDatasetFormat(getters, dataSets, "left");
       const rightAxisFormat = getChartDatasetFormat(getters, dataSets, "right");
-      const labelsFormat = getChartLabelFormat(getters, labelRange);
+      const labelsFormat = getChartLabelFormat(getters, labelRange, removeFirstLabel);
       const axisFormats = { y: leftAxisFormat, y1: rightAxisFormat, x: labelsFormat };
       const trendDataSetsValues = [];
       for (const index in dataSetsValues) {
@@ -28313,9 +28379,7 @@ stores.inject(MyMetaStore, storeInstance);
       const labelValues = getChartLabelValues(getters, dataSets, labelRange);
       let labels = labelValues.formattedValues;
       let dataSetsValues = getChartDatasetValues(getters, dataSets);
-      if (definition.dataSetsHaveTitle &&
-          dataSetsValues[0] &&
-          labels.length > dataSetsValues[0].data.length) {
+      if (shouldRemoveFirstLabel(labelRange, dataSets[0], definition.dataSetsHaveTitle || false)) {
           labels.shift();
       }
       ({ labels, dataSetsValues } = filterInvalidDataPoints(labels, dataSetsValues));
@@ -28335,9 +28399,7 @@ stores.inject(MyMetaStore, storeInstance);
       const labelValues = getChartLabelValues(getters, dataSets, labelRange);
       let labels = labelValues.formattedValues;
       let dataSetsValues = getChartDatasetValues(getters, dataSets);
-      if (definition.dataSetsHaveTitle &&
-          dataSetsValues[0] &&
-          labels.length > dataSetsValues[0].data.length) {
+      if (shouldRemoveFirstLabel(labelRange, dataSets[0], definition.dataSetsHaveTitle || false)) {
           labels.shift();
       }
       ({ labels, dataSetsValues } = filterInvalidDataPoints(labels, dataSetsValues));
@@ -28357,7 +28419,7 @@ stores.inject(MyMetaStore, storeInstance);
   function getGeoChartData(definition, dataSets, labelRange, getters) {
       const labelValues = getChartLabelValues(getters, dataSets, labelRange);
       let labels = labelValues.formattedValues;
-      if (definition.dataSetsHaveTitle) {
+      if (shouldRemoveFirstLabel(labelRange, dataSets[0], definition.dataSetsHaveTitle || false)) {
           labels.shift();
       }
       let dataSetsValues = getChartDatasetValues(getters, dataSets);
@@ -28518,36 +28580,41 @@ stores.inject(MyMetaStore, storeInstance);
       }
       return { normalizedLabels, normalizedNewLabels };
   }
-  function getChartAxisType(chart, labelRange, getters) {
-      if (isDateChart(chart, labelRange, getters) && isLuxonTimeAdapterInstalled()) {
+  function getChartAxisType(definition, dataSets, labelRange, getters) {
+      if (isDateChart(definition, dataSets, labelRange, getters) && isLuxonTimeAdapterInstalled()) {
           return "time";
       }
-      if (isLinearChart(chart, labelRange, getters)) {
+      if (isLinearChart(definition, dataSets, labelRange, getters)) {
           return "linear";
       }
       return "category";
   }
-  function isDateChart(definition, labelRange, getters) {
-      return !definition.labelsAsText && canBeDateChart(labelRange, getters);
+  function isDateChart(definition, dataSets, labelRange, getters) {
+      return !definition.labelsAsText && canBeDateChart(definition, dataSets, labelRange, getters);
   }
-  function isLinearChart(definition, labelRange, getters) {
-      return !definition.labelsAsText && canBeLinearChart(labelRange, getters);
+  function isLinearChart(definition, dataSets, labelRange, getters) {
+      return !definition.labelsAsText && canBeLinearChart(definition, dataSets, labelRange, getters);
   }
-  function canChartParseLabels(labelRange, getters) {
-      return canBeDateChart(labelRange, getters) || canBeLinearChart(labelRange, getters);
+  function canChartParseLabels(definition, dataSets, labelRange, getters) {
+      return (canBeDateChart(definition, dataSets, labelRange, getters) ||
+          canBeLinearChart(definition, dataSets, labelRange, getters));
   }
-  function canBeDateChart(labelRange, getters) {
-      if (!labelRange || !canBeLinearChart(labelRange, getters)) {
+  function canBeDateChart(definition, dataSets, labelRange, getters) {
+      if (!labelRange || !canBeLinearChart(definition, dataSets, labelRange, getters)) {
           return false;
       }
-      const labelFormat = getChartLabelFormat(getters, labelRange);
+      const removeFirstLabel = shouldRemoveFirstLabel(labelRange, dataSets[0], definition.dataSetsHaveTitle || false);
+      const labelFormat = getChartLabelFormat(getters, labelRange, removeFirstLabel);
       return Boolean(labelFormat && timeFormatLuxonCompatible.test(labelFormat));
   }
-  function canBeLinearChart(labelRange, getters) {
+  function canBeLinearChart(definition, dataSets, labelRange, getters) {
       if (!labelRange) {
           return false;
       }
       const labels = getters.getRangeValues(labelRange);
+      if (shouldRemoveFirstLabel(labelRange, dataSets[0], definition.dataSetsHaveTitle || false)) {
+          labels.shift();
+      }
       if (labels.some((label) => isNaN(Number(label)) && label)) {
           return false;
       }
@@ -28656,17 +28723,15 @@ stores.inject(MyMetaStore, storeInstance);
           })),
       };
   }
-  function getChartLabelFormat(getters, range) {
+  function getChartLabelFormat(getters, range, shouldRemoveFirstLabel) {
       if (!range)
           return undefined;
-      const { sheetId, zone: { left, top, bottom }, } = range;
-      for (let row = top; row <= bottom; row++) {
-          const format = getters.getEvaluatedCell({ sheetId, col: left, row }).format;
-          if (format) {
-              return format;
-          }
+      const { sheetId, zone } = range;
+      const formats = positions(zone).map((position) => getters.getEvaluatedCell({ sheetId, ...position }).format);
+      if (shouldRemoveFirstLabel) {
+          formats.shift();
       }
-      return undefined;
+      return formats.find((format) => format !== undefined);
   }
   function getChartLabelValues(getters, dataSets, labelRange) {
       let labels = { values: [], formattedValues: [] };
@@ -28722,10 +28787,8 @@ stores.inject(MyMetaStore, storeInstance);
   function getChartDatasetValues(getters, dataSets) {
       const datasetValues = [];
       for (const [dsIndex, ds] of Object.entries(dataSets)) {
-          if (getters.isColHidden(ds.dataRange.sheetId, ds.dataRange.zone.left)) {
-              continue;
-          }
           let label;
+          let hidden = getters.isColHidden(ds.dataRange.sheetId, ds.dataRange.zone.left);
           if (ds.labelCell) {
               const labelRange = ds.labelCell;
               const cell = labelRange
@@ -28752,9 +28815,9 @@ stores.inject(MyMetaStore, storeInstance);
               data.fill(1);
           }
           else if (data.every((cell) => cell === undefined || cell === null || !isNumber(cell.toString(), DEFAULT_LOCALE))) {
-              continue;
+              hidden = true;
           }
-          datasetValues.push({ data, label });
+          datasetValues.push({ data, label, hidden });
       }
       return datasetValues;
   }
@@ -28765,12 +28828,13 @@ stores.inject(MyMetaStore, storeInstance);
       const colors = getChartColorsGenerator(definition, dataSetsValues.length);
       const trendDatasets = [];
       for (const index in dataSetsValues) {
-          let { label, data } = dataSetsValues[index];
+          let { label, data, hidden } = dataSetsValues[index];
           label = definition.dataSets?.[index].label || label;
           const backgroundColor = colors.next();
           const dataset = {
               label,
               data,
+              hidden,
               borderColor: definition.background || BACKGROUND_CHART_COLOR,
               borderWidth: definition.stacked ? 1 : 0,
               backgroundColor,
@@ -28803,6 +28867,9 @@ stores.inject(MyMetaStore, storeInstance);
       const labelsWithSubTotals = [];
       let lastValue = 0;
       for (const dataSetsValue of dataSetsValues) {
+          if (dataSetsValue.hidden) {
+              continue;
+          }
           for (let i = 0; i < dataSetsValue.data.length; i++) {
               const data = dataSetsValue.data[i];
               labelsWithSubTotals.push(labels[i]);
@@ -28838,7 +28905,7 @@ stores.inject(MyMetaStore, storeInstance);
       const trendDatasets = [];
       const colors = getChartColorsGenerator(definition, dataSetsValues.length);
       for (let index = 0; index < dataSetsValues.length; index++) {
-          let { label, data } = dataSetsValues[index];
+          let { label, data, hidden } = dataSetsValues[index];
           label = definition.dataSets?.[index].label || label;
           const color = colors.next();
           if (axisType && ["linear", "time"].includes(axisType)) {
@@ -28848,6 +28915,7 @@ stores.inject(MyMetaStore, storeInstance);
           const dataset = {
               label,
               data,
+              hidden,
               tension: 0, // 0 -> render straight lines, which is much faster
               borderColor: color,
               backgroundColor: areaChart ? setColorAlpha(color, LINE_FILL_TRANSPARENCY) : color,
@@ -28880,11 +28948,13 @@ stores.inject(MyMetaStore, storeInstance);
       const dataSets = [];
       const dataSetsLength = Math.max(0, ...dataSetsValues.map((ds) => ds?.data?.length ?? 0));
       const backgroundColor = getPieColors(new ColorGenerator(dataSetsLength), dataSetsValues);
-      for (const { label, data } of dataSetsValues) {
+      for (const { label, data, hidden } of dataSetsValues) {
+          if (hidden)
+              continue;
           const dataset = {
               label,
               data,
-              borderColor: BACKGROUND_CHART_COLOR,
+              borderColor: definition.background || "#FFFFFF",
               backgroundColor,
               hoverOffset: 30,
           };
@@ -28898,7 +28968,7 @@ stores.inject(MyMetaStore, storeInstance);
       const colors = getChartColorsGenerator(definition, dataSetsValues.length);
       const trendDatasets = [];
       for (let index = 0; index < dataSetsValues.length; index++) {
-          let { label, data } = dataSetsValues[index];
+          let { label, data, hidden } = dataSetsValues[index];
           label = definition.dataSets?.[index].label || label;
           const design = definition.dataSets?.[index];
           const color = colors.next();
@@ -28906,6 +28976,7 @@ stores.inject(MyMetaStore, storeInstance);
           const dataset = {
               label: label,
               data,
+              hidden,
               borderColor: color,
               backgroundColor: color,
               yAxisID: definition.dataSets?.[index].yAxisId || "y",
@@ -28930,7 +29001,7 @@ stores.inject(MyMetaStore, storeInstance);
       const fill = definition.fillArea ?? false;
       const colors = getChartColorsGenerator(definition, dataSetsValues.length);
       for (let i = 0; i < dataSetsValues.length; i++) {
-          let { label, data } = dataSetsValues[i];
+          let { label, data, hidden } = dataSetsValues[i];
           if (definition.dataSets?.[i]?.label) {
               label = definition.dataSets[i].label;
           }
@@ -28938,6 +29009,7 @@ stores.inject(MyMetaStore, storeInstance);
           const dataset = {
               label,
               data,
+              hidden,
               borderColor,
               backgroundColor: borderColor,
           };
@@ -29083,6 +29155,11 @@ stores.inject(MyMetaStore, storeInstance);
                   hidden: false,
                   lineWidth: 2,
               })),
+              filter: (legendItem, data) => {
+                  return "datasetIndex" in legendItem
+                      ? !data.datasets[legendItem.datasetIndex].hidden
+                      : true;
+              },
           },
       };
   }
@@ -29144,6 +29221,11 @@ stores.inject(MyMetaStore, storeInstance);
                   }
                   return legendValues;
               },
+              filter: (legendItem, data) => {
+                  return "datasetIndex" in legendItem
+                      ? !data.datasets[legendItem.datasetIndex].hidden
+                      : true;
+              },
           },
           onClick: () => { }, // Disables click interaction with the waterfall chart legend items
       };
@@ -29227,6 +29309,11 @@ stores.inject(MyMetaStore, storeInstance);
                       ...legendLabelConfig,
                   };
               }),
+              filter: (legendItem, data) => {
+                  return "datasetIndex" in legendItem
+                      ? !data.datasets[legendItem.datasetIndex].hidden
+                      : true;
+              },
           },
       };
   }
@@ -32899,7 +32986,7 @@ stores.inject(MyMetaStore, storeInstance);
   const deleteSheet = {
       name: _t("Delete"),
       isVisible: (env) => {
-          return env.model.getters.getSheetIds().length > 1;
+          return env.model.getters.getVisibleSheetIds().length > 1;
       },
       execute: (env) => env.askConfirmation(_t("Are you sure you want to delete this sheet?"), () => {
           env.model.dispatch("DELETE_SHEET", { sheetId: env.model.getters.getActiveSheetId() });
@@ -32910,7 +32997,7 @@ stores.inject(MyMetaStore, storeInstance);
       name: _t("Duplicate"),
       execute: (env) => {
           const sheetIdFrom = env.model.getters.getActiveSheetId();
-          const sheetIdTo = env.model.uuidGenerator.uuidv4();
+          const sheetIdTo = env.model.uuidGenerator.smallUuid();
           env.model.dispatch("DUPLICATE_SHEET", {
               sheetId: sheetIdFrom,
               sheetIdTo,
@@ -33016,6 +33103,100 @@ stores.inject(MyMetaStore, storeInstance);
   function getOpenedMenus() {
       return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
   }
+  function getCurrentSelection(el) {
+      let { startElement, endElement, startSelectionOffset, endSelectionOffset } = getStartAndEndSelection(el);
+      let startSizeBefore = findSelectionIndex(el, startElement, startSelectionOffset);
+      let endSizeBefore = findSelectionIndex(el, endElement, endSelectionOffset);
+      return {
+          start: startSizeBefore,
+          end: endSizeBefore,
+      };
+  }
+  function getStartAndEndSelection(el) {
+      const selection = document.getSelection();
+      return {
+          startElement: selection.anchorNode || el,
+          startSelectionOffset: selection.anchorOffset,
+          endElement: selection.focusNode || el,
+          endSelectionOffset: selection.focusOffset,
+      };
+  }
+  /**
+   * Computes the text 'index' inside this.el based on the currently selected node and its offset.
+   * The selected node is either a Text node or an Element node.
+   *
+   * case 1 -Text node:
+   * the offset is the number of characters from the start of the node. We have to add this offset to the
+   * content length of all previous nodes.
+   *
+   * case 2 - Element node:
+   * the offset is the number of child nodes before the selected node. We have to add the content length of
+   * all the nodes prior to the selected node as well as the content of the child node before the offset.
+   *
+   * See the MDN documentation for more details.
+   * https://developer.mozilla.org/en-US/docs/Web/API/Range/startOffset
+   * https://developer.mozilla.org/en-US/docs/Web/API/Range/endOffset
+   *
+   */
+  function findSelectionIndex(el, nodeToFind, nodeOffset) {
+      let usedCharacters = 0;
+      let it = iterateChildren(el);
+      let current = it.next();
+      let isFirstParagraph = true;
+      while (!current.done && current.value !== nodeToFind) {
+          if (!current.value.hasChildNodes()) {
+              if (current.value.textContent) {
+                  usedCharacters += current.value.textContent.length;
+              }
+          }
+          // One new paragraph = one new line character, except for the first paragraph
+          if (current.value.nodeName === "P" ||
+              (current.value.nodeName === "DIV" && current.value !== el) // On paste, the HTML may contain <div> instead of <p>
+          ) {
+              if (isFirstParagraph) {
+                  isFirstParagraph = false;
+              }
+              else {
+                  usedCharacters++;
+              }
+          }
+          current = it.next();
+      }
+      if (current.value !== nodeToFind) {
+          /** This situation can happen if the code is called while the selection is not currently on the element.
+           * In this case, we return 0 because we don't know the size of the text before the selection.
+           *
+           * A known occurrence is triggered since the introduction of commit d4663158 (PR #2038).
+           */
+          return 0;
+      }
+      else {
+          if (!current.value.hasChildNodes()) {
+              usedCharacters += nodeOffset;
+          }
+          else {
+              const children = [...current.value.childNodes].slice(0, nodeOffset);
+              usedCharacters += children.reduce((acc, child, index) => {
+                  if (child.textContent !== null) {
+                      // need to account for paragraph nodes that implicitly add a new line
+                      // except for the last paragraph
+                      let chars = child.textContent.length;
+                      if (child.nodeName === "P" && index !== children.length - 1) {
+                          chars++;
+                      }
+                      return acc + chars;
+                  }
+                  else {
+                      return acc;
+                  }
+              }, 0);
+          }
+      }
+      if (nodeToFind.nodeName === "P" && !isFirstParagraph && nodeToFind.textContent === "") {
+          usedCharacters++;
+      }
+      return usedCharacters;
+  }
   const letterRegex = /^[a-zA-Z]$/;
   /**
    * Transform a keyboard event into a shortcut string that represent this event. The letters keys will be uppercased.
@@ -33613,20 +33794,21 @@ stores.inject(MyMetaStore, storeInstance);
       }
       // Only display legend for several datasets.
       const newLegendPos = dataSetZone.right === dataSetZone.left ? "none" : "top";
-      const labelRange = labelRangeXc ? getters.getRangeFromSheetXC(sheetId, labelRangeXc) : undefined;
-      if (canChartParseLabels(labelRange, getters)) {
-          return {
-              title: {},
-              dataSets,
-              labelsAsText: false,
-              stacked: false,
-              aggregated: false,
-              cumulative: false,
-              labelRange: labelRangeXc,
-              type: "line",
-              dataSetsHaveTitle,
-              legendPosition: newLegendPos,
-          };
+      const lineChartDefinition = {
+          title: {},
+          dataSets,
+          labelsAsText: false,
+          stacked: false,
+          aggregated: false,
+          cumulative: false,
+          labelRange: labelRangeXc,
+          type: "line",
+          dataSetsHaveTitle,
+          legendPosition: newLegendPos,
+      };
+      const chart = new LineChart(lineChartDefinition, sheetId, getters);
+      if (canChartParseLabels(lineChartDefinition, chart.dataSets, chart.labelRange, getters)) {
+          return lineChartDefinition;
       }
       const _dataSets = createDataSets(getters, dataSets, sheetId, dataSetsHaveTitle);
       if (singleColumn &&
@@ -34040,7 +34222,7 @@ stores.inject(MyMetaStore, storeInstance);
   //------------------------------------------------------------------------------
   const CREATE_CHART = (env) => {
       const getters = env.model.getters;
-      const id = env.model.uuidGenerator.uuidv4();
+      const id = env.model.uuidGenerator.smallUuid();
       const sheetId = getters.getActiveSheetId();
       if (getZoneArea(env.model.getters.getSelectedZone()) === 1) {
           env.model.selection.selectTableAroundSelection();
@@ -34063,8 +34245,8 @@ stores.inject(MyMetaStore, storeInstance);
   // Pivots
   //------------------------------------------------------------------------------
   const CREATE_PIVOT = (env) => {
-      const pivotId = env.model.uuidGenerator.uuidv4();
-      const newSheetId = env.model.uuidGenerator.uuidv4();
+      const pivotId = env.model.uuidGenerator.smallUuid();
+      const newSheetId = env.model.uuidGenerator.smallUuid();
       const result = env.model.dispatch("INSERT_NEW_PIVOT", { pivotId, newSheetId });
       if (result.isSuccessful) {
           env.openSidePanel("PivotSidePanel", { pivotId });
@@ -34123,7 +34305,7 @@ stores.inject(MyMetaStore, storeInstance);
   const CREATE_IMAGE = async (env) => {
       if (env.imageProvider) {
           const sheetId = env.model.getters.getActiveSheetId();
-          const figureId = env.model.uuidGenerator.uuidv4();
+          const figureId = env.model.uuidGenerator.smallUuid();
           const image = await requestImage(env);
           if (!image) {
               throw new Error("No image provider was given to the environment");
@@ -34676,7 +34858,7 @@ stores.inject(MyMetaStore, storeInstance);
               ranges,
               sheetId,
               rule: {
-                  id: env.model.uuidGenerator.uuidv4(),
+                  id: env.model.uuidGenerator.smallUuid(),
                   criterion: {
                       type: "isBoolean",
                       values: [],
@@ -34692,7 +34874,7 @@ stores.inject(MyMetaStore, storeInstance);
           const zones = env.model.getters.getSelectedZones();
           const sheetId = env.model.getters.getActiveSheetId();
           const ranges = zones.map((zone) => env.model.getters.getRangeDataFromZone(sheetId, zone));
-          const ruleID = env.model.uuidGenerator.uuidv4();
+          const ruleID = env.model.uuidGenerator.smallUuid();
           env.model.dispatch("ADD_DATA_VALIDATION_RULE", {
               ranges,
               sheetId,
@@ -34723,7 +34905,7 @@ stores.inject(MyMetaStore, storeInstance);
       execute: (env) => {
           const activeSheetId = env.model.getters.getActiveSheetId();
           const position = env.model.getters.getSheetIds().indexOf(activeSheetId) + 1;
-          const sheetId = env.model.uuidGenerator.uuidv4();
+          const sheetId = env.model.uuidGenerator.smallUuid();
           env.model.dispatch("CREATE_SHEET", { sheetId, position });
           env.model.dispatch("ACTIVATE_SHEET", { sheetIdFrom: activeSheetId, sheetIdTo: sheetId });
       },
@@ -38250,7 +38432,7 @@ stores.inject(MyMetaStore, storeInstance);
   .o-font-size-editor {
     height: calc(100% - 4px);
     input.o-font-size {
-      outline-color: ${SELECTION_BORDER_COLOR};
+      outline: none;
       height: 20px;
       width: 23px;
     }
@@ -39212,7 +39394,7 @@ stores.inject(MyMetaStore, storeInstance);
       get canTreatLabelsAsText() {
           const chart = this.env.model.getters.getChart(this.props.figureId);
           if (chart && chart instanceof LineChart) {
-              return canChartParseLabels(chart.labelRange, this.env.model.getters);
+              return canChartParseLabels(chart.getDefinition(), chart.dataSets, chart.labelRange, this.env.model.getters);
           }
           return false;
       }
@@ -39289,7 +39471,7 @@ stores.inject(MyMetaStore, storeInstance);
       get canTreatLabelsAsText() {
           const chart = this.env.model.getters.getChart(this.props.figureId);
           if (chart && chart instanceof ScatterChart) {
-              return canChartParseLabels(chart.labelRange, this.env.model.getters);
+              return canChartParseLabels(chart.getDefinition(), chart.dataSets, chart.labelRange, this.env.model.getters);
           }
           return false;
       }
@@ -39863,6 +40045,10 @@ stores.inject(MyMetaStore, storeInstance);
           if (currentStart === start && currentEnd === end) {
               return;
           }
+          if (selection.rangeCount === 0) {
+              const range = document.createRange();
+              selection.addRange(range);
+          }
           const currentRange = selection.getRangeAt(0);
           let range;
           if (this.el.contains(currentRange.startContainer)) {
@@ -39890,8 +40076,16 @@ stores.inject(MyMetaStore, storeInstance);
               }
               let startNode = this.findChildAtCharacterIndex(start);
               let endNode = this.findChildAtCharacterIndex(end);
-              range.setStart(startNode.node, startNode.offset);
-              range.setEnd(endNode.node, endNode.offset);
+              // setEnd (setStart) will result in a collapsed range if the end point is before the start point
+              // https://developer.mozilla.org/en-US/docs/Web/API/Range/setEnd
+              if (start <= end) {
+                  range.setStart(startNode.node, startNode.offset);
+                  range.setEnd(endNode.node, endNode.offset);
+              }
+              else {
+                  range.setStart(endNode.node, endNode.offset);
+                  range.setEnd(startNode.node, startNode.offset);
+              }
           }
       }
       /**
@@ -40025,7 +40219,7 @@ stores.inject(MyMetaStore, storeInstance);
           if (!focusedNode || !this.el.contains(focusedNode))
               return;
           const element = focusedNode instanceof HTMLElement ? focusedNode : focusedNode.parentElement;
-          element?.scrollIntoView({ block: "nearest" });
+          element?.scrollIntoView?.({ block: "nearest" });
       }
       /**
        * remove the current selection of the user
@@ -40045,100 +40239,7 @@ stores.inject(MyMetaStore, storeInstance);
        * finds the indexes of the current selection.
        * */
       getCurrentSelection() {
-          let { startElement, endElement, startSelectionOffset, endSelectionOffset } = this.getStartAndEndSelection();
-          let startSizeBefore = this.findSelectionIndex(startElement, startSelectionOffset);
-          let endSizeBefore = this.findSelectionIndex(endElement, endSelectionOffset);
-          return {
-              start: startSizeBefore,
-              end: endSizeBefore,
-          };
-      }
-      /**
-       * Computes the text 'index' inside this.el based on the currently selected node and its offset.
-       * The selected node is either a Text node or an Element node.
-       *
-       * case 1 -Text node:
-       * the offset is the number of characters from the start of the node. We have to add this offset to the
-       * content length of all previous nodes.
-       *
-       * case 2 - Element node:
-       * the offset is the number of child nodes before the selected node. We have to add the content length of
-       * all the bnodes prior to the selected node as well as the content of the child node before the offset.
-       *
-       * See the MDN documentation for more details.
-       * https://developer.mozilla.org/en-US/docs/Web/API/Range/startOffset
-       * https://developer.mozilla.org/en-US/docs/Web/API/Range/endOffset
-       *
-       */
-      findSelectionIndex(nodeToFind, nodeOffset) {
-          let usedCharacters = 0;
-          let it = iterateChildren(this.el);
-          let current = it.next();
-          let isFirstParagraph = true;
-          while (!current.done && current.value !== nodeToFind) {
-              if (!current.value.hasChildNodes()) {
-                  if (current.value.textContent) {
-                      usedCharacters += current.value.textContent.length;
-                  }
-              }
-              // One new paragraph = one new line character, except for the first paragraph
-              if (current.value.nodeName === "P" ||
-                  (current.value.nodeName === "DIV" && current.value !== this.el) // On paste, the HTML may contain <div> instead of <p>
-              ) {
-                  if (isFirstParagraph) {
-                      isFirstParagraph = false;
-                  }
-                  else {
-                      usedCharacters++;
-                  }
-              }
-              current = it.next();
-          }
-          if (current.value !== nodeToFind) {
-              /** This situation can happen if the code is called while the selection is not currently on the ContentEditableHelper.
-               * In this case, we return 0 because we don't know the size of the text before the selection.
-               *
-               * A known occurence is triggered since the introduction of commit d4663158 (PR #2038).
-               *
-               * FIXME: find a way to test eventhough the selection API is not available in jsDOM.
-               */
-              return 0;
-          }
-          else {
-              if (!current.value.hasChildNodes()) {
-                  usedCharacters += nodeOffset;
-              }
-              else {
-                  const children = [...current.value.childNodes].slice(0, nodeOffset);
-                  usedCharacters += children.reduce((acc, child, index) => {
-                      if (child.textContent !== null) {
-                          // need to account for paragraph nodes that implicitely add a new line
-                          // except for the last paragraph
-                          let chars = child.textContent.length;
-                          if (child.nodeName === "P" && index !== children.length - 1) {
-                              chars++;
-                          }
-                          return acc + chars;
-                      }
-                      else {
-                          return acc;
-                      }
-                  }, 0);
-              }
-          }
-          if (nodeToFind.nodeName === "P" && !isFirstParagraph && nodeToFind.textContent === "") {
-              usedCharacters++;
-          }
-          return usedCharacters;
-      }
-      getStartAndEndSelection() {
-          const selection = document.getSelection();
-          return {
-              startElement: selection.anchorNode || this.el,
-              startSelectionOffset: selection.anchorOffset,
-              endElement: selection.focusNode || this.el,
-              endSelectionOffset: selection.focusOffset,
-          };
+          return getCurrentSelection(this.el);
       }
       getText() {
           let text = "";
@@ -42067,7 +42168,7 @@ stores.inject(MyMetaStore, storeInstance);
           this.originalEditedCf = undefined;
       }
       addConditionalFormat() {
-          const cfId = this.env.model.uuidGenerator.uuidv4();
+          const cfId = this.env.model.uuidGenerator.smallUuid();
           this.env.model.dispatch("ADD_CONDITIONAL_FORMAT", {
               sheetId: this.activeSheetId,
               ranges: this.env.model.getters
@@ -43337,7 +43438,7 @@ stores.inject(MyMetaStore, storeInstance);
               .getSelectedZones()
               .map((zone) => zoneToXc(this.env.model.getters.getUnboundedZone(sheetId, zone)));
           return {
-              id: this.env.model.uuidGenerator.uuidv4(),
+              id: this.env.model.uuidGenerator.smallUuid(),
               criterion: { type: "textContains", values: [""] },
               ranges,
           };
@@ -44955,8 +45056,8 @@ stores.inject(MyMetaStore, storeInstance);
           return this.env.model.getters.getPivotDisplayName(this.props.pivotId);
       }
       duplicatePivot() {
-          const newPivotId = this.env.model.uuidGenerator.uuidv4();
-          const newSheetId = this.env.model.uuidGenerator.uuidv4();
+          const newPivotId = this.env.model.uuidGenerator.smallUuid();
+          const newSheetId = this.env.model.uuidGenerator.smallUuid();
           const result = this.env.model.dispatch("DUPLICATE_PIVOT_IN_NEW_SHEET", {
               pivotId: this.props.pivotId,
               newPivotId,
@@ -47581,7 +47682,7 @@ stores.inject(MyMetaStore, storeInstance);
           this.state.selectedTemplateName = templateName;
       }
       onConfirm() {
-          const tableStyleId = this.props.styleId || this.env.model.uuidGenerator.uuidv4();
+          const tableStyleId = this.props.styleId || this.env.model.uuidGenerator.smallUuid();
           this.env.model.dispatch("CREATE_TABLE_STYLE", {
               tableStyleId,
               tableStyleName: this.state.styleName,
@@ -53093,6 +53194,10 @@ stores.inject(MyMetaStore, storeInstance);
                   return this.checkValidations(cmd, this.checkCellOutOfSheet, this.checkUselessUpdateCell);
               case "CLEAR_CELL":
                   return this.checkValidations(cmd, this.checkCellOutOfSheet, this.checkUselessClearCell);
+              case "UPDATE_CELL_POSITION":
+                  return !cmd.cellId || this.cells[cmd.sheetId]?.[cmd.cellId]
+                      ? "Success" /* CommandResult.Success */
+                      : "InvalidCellId" /* CommandResult.InvalidCellId */;
               default:
                   return "Success" /* CommandResult.Success */;
           }
@@ -53137,6 +53242,9 @@ stores.inject(MyMetaStore, storeInstance);
               case "DELETE_CONTENT":
                   this.clearZones(cmd.sheetId, cmd.target);
                   break;
+              case "DELETE_SHEET": {
+                  this.history.update("cells", cmd.sheetId, undefined);
+              }
           }
       }
       clearZones(sheetId, zones) {
@@ -53927,6 +54035,9 @@ stores.inject(MyMetaStore, storeInstance);
       allowDispatch(cmd) {
           switch (cmd.type) {
               case "ADD_CONDITIONAL_FORMAT":
+                  if (cmd.ranges.some((rangeData) => !this.getters.tryGetSheet(rangeData._sheetId))) {
+                      return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+                  }
                   return this.checkValidations(cmd, this.checkCFRule, this.checkEmptyRange, this.checkCFHasChanged);
               case "CHANGE_CONDITIONAL_FORMAT_PRIORITY":
                   return this.checkValidPriorityChange(cmd.cfId, cmd.delta, cmd.sheetId);
@@ -54343,8 +54454,17 @@ stores.inject(MyMetaStore, storeInstance);
       allowDispatch(cmd) {
           switch (cmd.type) {
               case "ADD_DATA_VALIDATION_RULE":
+                  if (!this.getters.tryGetSheet(cmd.sheetId)) {
+                      return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+                  }
+                  if (cmd.ranges.some((rangeData) => !this.getters.tryGetSheet(rangeData._sheetId))) {
+                      return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+                  }
                   return this.checkValidations(cmd, this.chainValidations(this.checkEmptyRange, this.checkValidRange, this.checkCriterionTypeIsValid, this.checkCriterionHasValidNumberOfValues, this.checkCriterionValuesAreValid));
               case "REMOVE_DATA_VALIDATION_RULE":
+                  if (!this.getters.tryGetSheet(cmd.sheetId)) {
+                      return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+                  }
                   if (!this.rules[cmd.sheetId].find((rule) => rule.id === cmd.id)) {
                       return "UnknownDataValidationRule" /* CommandResult.UnknownDataValidationRule */;
                   }
@@ -54571,6 +54691,7 @@ stores.inject(MyMetaStore, storeInstance);
   class FigurePlugin extends CorePlugin {
       static getters = ["getFigures", "getFigure", "getFigureSheetId"];
       figures = {};
+      insertionOrders = []; // TODO use a list in master
       // ---------------------------------------------------------------------------
       // Command Handling
       // ---------------------------------------------------------------------------
@@ -54673,11 +54794,14 @@ stores.inject(MyMetaStore, storeInstance);
       }
       addFigure(figure, sheetId) {
           this.history.update("figures", sheetId, figure.id, figure);
+          this.history.update("insertionOrders", this.insertionOrders.length, figure.id);
       }
       deleteSheet(sheetId) {
+          this.history.update("insertionOrders", this.insertionOrders.filter((id) => !this.figures[sheetId]?.[id]));
           this.history.update("figures", sheetId, undefined);
       }
       removeFigure(id, sheetId) {
+          this.history.update("insertionOrders", this.insertionOrders.filter((figureId) => figureId !== id));
           this.history.update("figures", sheetId, id, undefined);
       }
       checkFigureExists(sheetId, figureId) {
@@ -54696,7 +54820,14 @@ stores.inject(MyMetaStore, storeInstance);
       // Getters
       // ---------------------------------------------------------------------------
       getFigures(sheetId) {
-          return Object.values(this.figures[sheetId] || {}).filter(isDefined);
+          const figures = [];
+          for (const figureId of this.insertionOrders) {
+              const figure = this.figures[sheetId]?.[figureId];
+              if (figure) {
+                  figures.push(figure);
+              }
+          }
+          return figures;
       }
       getFigure(sheetId, figureId) {
           return this.figures[sheetId]?.[figureId];
@@ -54709,11 +54840,9 @@ stores.inject(MyMetaStore, storeInstance);
       // ---------------------------------------------------------------------------
       import(data) {
           for (let sheet of data.sheets) {
-              const figures = {};
-              sheet.figures.forEach((figure) => {
-                  figures[figure.id] = figure;
-              });
-              this.figures[sheet.id] = figures;
+              for (const figure of sheet.figures) {
+                  this.addFigure(figure, sheet.id);
+              }
           }
       }
       export(data) {
@@ -56139,6 +56268,9 @@ stores.inject(MyMetaStore, storeInstance);
               case "CREATE_SHEET": {
                   return this.checkValidations(cmd, this.checkSheetName, this.checkSheetPosition);
               }
+              case "DUPLICATE_SHEET": {
+                  return this.sheets[cmd.sheetIdTo] ? "DuplicatedSheetId" /* CommandResult.DuplicatedSheetId */ : "Success" /* CommandResult.Success */;
+              }
               case "MOVE_SHEET":
                   try {
                       const currentIndex = this.orderedSheetIds.findIndex((id) => id === cmd.sheetId);
@@ -56155,7 +56287,7 @@ stores.inject(MyMetaStore, storeInstance);
                       ? "Success" /* CommandResult.Success */
                       : "InvalidColor" /* CommandResult.InvalidColor */;
               case "DELETE_SHEET":
-                  return this.orderedSheetIds.length > 1
+                  return this.getVisibleSheetIds().length > 1
                       ? "Success" /* CommandResult.Success */
                       : "NotEnoughSheets" /* CommandResult.NotEnoughSheets */;
               case "ADD_COLUMNS_ROWS":
@@ -56950,6 +57082,10 @@ stores.inject(MyMetaStore, storeInstance);
       checkZonesAreInSheet(cmd) {
           if (!("sheetId" in cmd))
               return "Success" /* CommandResult.Success */;
+          if ("ranges" in cmd &&
+              cmd.ranges.some((rangeData) => rangeData._sheetId !== "" && !this.getters.tryGetSheet(rangeData._sheetId))) {
+              return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+          }
           return this.checkZonesExistInSheet(cmd.sheetId, this.getCommandZones(cmd));
       }
   }
@@ -56958,6 +57094,7 @@ stores.inject(MyMetaStore, storeInstance);
   class TablePlugin extends CorePlugin {
       static getters = ["getCoreTable", "getCoreTables", "getCoreTableMatchingTopLeft"];
       tables = {};
+      insertionOrders = {};
       adaptRanges(applyChange, sheetId) {
           const sheetIds = sheetId ? [sheetId] : this.getters.getSheetIds();
           for (const sheetId of sheetIds) {
@@ -56969,6 +57106,9 @@ stores.inject(MyMetaStore, storeInstance);
       allowDispatch(cmd) {
           switch (cmd.type) {
               case "CREATE_TABLE":
+                  if (cmd.ranges.some((rangeData) => !this.getters.tryGetSheet(rangeData._sheetId) || rangeData._sheetId !== cmd.sheetId)) {
+                      return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+                  }
                   const zones = cmd.ranges.map((rangeData) => this.getters.getRangeFromRangeData(rangeData).zone);
                   if (!areZonesContinuous(zones)) {
                       return "NonContinuousTargets" /* CommandResult.NonContinuousTargets */;
@@ -56999,11 +57139,13 @@ stores.inject(MyMetaStore, storeInstance);
           switch (cmd.type) {
               case "CREATE_SHEET":
                   this.history.update("tables", cmd.sheetId, {});
+                  this.history.update("insertionOrders", cmd.sheetId, []);
                   break;
               case "DELETE_SHEET": {
                   const tables = { ...this.tables };
                   delete tables[cmd.sheetId];
                   this.history.update("tables", tables);
+                  this.history.update("insertionOrders", cmd.sheetId, undefined);
                   break;
               }
               case "DUPLICATE_SHEET": {
@@ -57015,6 +57157,9 @@ stores.inject(MyMetaStore, storeInstance);
                               : this.copyStaticTableForSheet(cmd.sheetIdTo, table);
                   }
                   this.history.update("tables", cmd.sheetIdTo, newTables);
+                  this.history.update("insertionOrders", cmd.sheetIdTo, [
+                      ...(this.insertionOrders[cmd.sheetId] ?? []),
+                  ]);
                   break;
               }
               case "CREATE_TABLE": {
@@ -57028,6 +57173,10 @@ stores.inject(MyMetaStore, storeInstance);
                       ? this.createDynamicTable(id, union, config)
                       : this.createStaticTable(id, cmd.tableType, union, config);
                   this.history.update("tables", cmd.sheetId, newTable.id, newTable);
+                  this.history.update("insertionOrders", cmd.sheetId, [
+                      ...(this.insertionOrders[cmd.sheetId] ?? []),
+                      newTable.id,
+                  ]);
                   break;
               }
               case "REMOVE_TABLE": {
@@ -57038,6 +57187,7 @@ stores.inject(MyMetaStore, storeInstance);
                       }
                   }
                   this.history.update("tables", cmd.sheetId, tables);
+                  this.history.update("insertionOrders", cmd.sheetId, this.insertionOrders[cmd.sheetId]?.filter((id) => id in tables));
                   break;
               }
               case "UPDATE_TABLE": {
@@ -57073,7 +57223,14 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       getCoreTables(sheetId) {
-          return this.tables[sheetId] ? Object.values(this.tables[sheetId]).filter(isDefined) : [];
+          const tables = [];
+          for (const tableId of this.insertionOrders[sheetId] || []) {
+              const table = this.tables[sheetId][tableId];
+              if (table) {
+                  tables.push(table);
+              }
+          }
+          return tables;
       }
       getCoreTable({ sheetId, col, row }) {
           return this.getCoreTables(sheetId).find((table) => isInside(col, row, table.range.zone));
@@ -57356,6 +57513,7 @@ stores.inject(MyMetaStore, storeInstance);
       // ---------------------------------------------------------------------------
       import(data) {
           for (const sheet of data.sheets) {
+              const tableIds = [];
               for (const tableData of sheet.tables || []) {
                   const uuid = `${nextTableId++}`;
                   const tableConfig = tableData.config || DEFAULT_TABLE_CONFIG;
@@ -57365,7 +57523,9 @@ stores.inject(MyMetaStore, storeInstance);
                       ? this.createDynamicTable(uuid, range, tableConfig)
                       : this.createStaticTable(uuid, tableType, range, tableConfig);
                   this.history.update("tables", sheet.id, table.id, table);
+                  tableIds.push(table.id);
               }
+              this.history.update("insertionOrders", sheet.id, tableIds);
           }
       }
       export(data) {
@@ -57405,7 +57565,10 @@ stores.inject(MyMetaStore, storeInstance);
       allowDispatch(cmd) {
           switch (cmd.type) {
               case "GROUP_HEADERS": {
-                  const { start, end } = cmd;
+                  const { start, end, sheetId } = cmd;
+                  if (!this.getters.tryGetSheet(sheetId)) {
+                      return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+                  }
                   if (!this.getters.doesHeadersExist(cmd.sheetId, cmd.dimension, [start, end])) {
                       return "InvalidHeaderGroupStartEnd" /* CommandResult.InvalidHeaderGroupStartEnd */;
                   }
@@ -57418,7 +57581,10 @@ stores.inject(MyMetaStore, storeInstance);
                   break;
               }
               case "UNGROUP_HEADERS": {
-                  const { start, end } = cmd;
+                  const { start, end, sheetId } = cmd;
+                  if (!this.getters.tryGetSheet(sheetId)) {
+                      return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+                  }
                   if (!this.getters.doesHeadersExist(cmd.sheetId, cmd.dimension, [start, end])) {
                       return "InvalidHeaderGroupStartEnd" /* CommandResult.InvalidHeaderGroupStartEnd */;
                   }
@@ -57429,6 +57595,9 @@ stores.inject(MyMetaStore, storeInstance);
               }
               case "UNFOLD_HEADER_GROUP":
               case "FOLD_HEADER_GROUP":
+                  if (!this.getters.tryGetSheet(cmd.sheetId)) {
+                      return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+                  }
                   const group = this.findGroupWithStartEnd(cmd.sheetId, cmd.dimension, cmd.start, cmd.end);
                   if (!group) {
                       return "UnknownHeaderGroup" /* CommandResult.UnknownHeaderGroup */;
@@ -57829,6 +57998,9 @@ stores.inject(MyMetaStore, storeInstance);
                   return this.checkDuplicatedMeasureIds(cmd.pivot);
               }
               case "UPDATE_PIVOT": {
+                  if (!(cmd.pivotId in this.pivots)) {
+                      return "PivotIdNotFound" /* CommandResult.PivotIdNotFound */;
+                  }
                   if (deepEquals(cmd.pivot, this.pivots[cmd.pivotId]?.definition)) {
                       return "NoChanges" /* CommandResult.NoChanges */;
                   }
@@ -57845,6 +58017,8 @@ stores.inject(MyMetaStore, storeInstance);
                       return "EmptyName" /* CommandResult.EmptyName */;
                   }
                   break;
+              case "REMOVE_PIVOT":
+              case "DUPLICATE_PIVOT":
               case "INSERT_PIVOT": {
                   if (!(cmd.pivotId in this.pivots)) {
                       return "PivotIdNotFound" /* CommandResult.PivotIdNotFound */;
@@ -57894,7 +58068,7 @@ stores.inject(MyMetaStore, storeInstance);
                   break;
               }
               case "UPDATE_PIVOT": {
-                  this.history.update("pivots", cmd.pivotId, "definition", cmd.pivot);
+                  this.history.update("pivots", cmd.pivotId, "definition", deepCopy(cmd.pivot));
                   this.compileCalculatedMeasures(cmd.pivot.measures);
                   break;
               }
@@ -57965,7 +58139,7 @@ stores.inject(MyMetaStore, storeInstance);
       // Private
       // -------------------------------------------------------------------------
       addPivot(pivotId, pivot, formulaId = this.nextFormulaId.toString()) {
-          this.history.update("pivots", pivotId, { definition: pivot, formulaId });
+          this.history.update("pivots", pivotId, { definition: deepCopy(pivot), formulaId });
           this.compileCalculatedMeasures(pivot.measures);
           this.history.update("formulaIds", formulaId, pivotId);
           this.history.update("nextFormulaId", this.nextFormulaId + 1);
@@ -59551,6 +59725,10 @@ stores.inject(MyMetaStore, storeInstance);
           this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
           this.compilationParams.evalContext.updateDependencies = this.updateDependencies.bind(this);
           this.compilationParams.evalContext.addDependencies = this.addDependencies.bind(this);
+          this.compilationParams.evalContext.lookupCaches = {
+              forwardSearch: new Map(),
+              reverseSearch: new Map(),
+          };
       }
       createEmptyPositionSet() {
           const sheetSizes = {};
@@ -62871,6 +63049,9 @@ stores.inject(MyMetaStore, storeInstance);
       };
   }
   function createSheetTransformation(toTransform, executed) {
+      if (toTransform.sheetId === executed.sheetId) {
+          toTransform = { ...toTransform, sheetId: `${toTransform.sheetId}~` };
+      }
       if (toTransform.name === executed.name) {
           return {
               ...toTransform,
@@ -63522,21 +63703,14 @@ stores.inject(MyMetaStore, storeInstance);
           if (!message)
               return;
           if (message.type === "REMOTE_REVISION") {
-              const revision = this.revisions.get(message.nextRevisionId);
+              let revision = this.revisions.get(message.nextRevisionId);
               if (revision.commands.length === 0) {
                   /**
-                   * The command is empty, we have to drop all the next local revisions
+                   * The command is empty, we have to rebase all the next local revisions
                    * to avoid issues with undo/redo
                    */
-                  this.revisions.drop(revision.id);
-                  const revisionIds = this.pendingMessages
-                      .filter((message) => message.type === "REMOTE_REVISION")
-                      .map((message) => message.nextRevisionId);
-                  this.trigger("pending-revisions-dropped", { revisionIds });
-                  this.waitingAck = false;
-                  this.waitingUndoRedoAck = false;
-                  this.pendingMessages = [];
-                  return;
+                  this.revisions.rebase(revision.id);
+                  revision = this.revisions.get(message.nextRevisionId);
               }
               message = {
                   ...message,
@@ -63561,7 +63735,6 @@ stores.inject(MyMetaStore, storeInstance);
           switch (message.type) {
               case "REMOTE_REVISION":
               case "REVISION_REDONE":
-              case "REVISION_UNDONE":
               case "SNAPSHOT_CREATED":
                   this.waitingAck = false;
                   this.pendingMessages = this.pendingMessages.filter((msg) => msg.nextRevisionId !== message.nextRevisionId);
@@ -63570,6 +63743,25 @@ stores.inject(MyMetaStore, storeInstance);
                   this.lastRevisionMessage = message;
                   this.sendPendingMessage();
                   break;
+              case "REVISION_UNDONE": {
+                  this.waitingAck = false;
+                  this.pendingMessages = this.pendingMessages.filter((msg) => msg.nextRevisionId !== message.nextRevisionId);
+                  const firstPendingRevisionId = this.pendingMessages.findIndex((message) => message.type === "REMOTE_REVISION");
+                  if (firstPendingRevisionId !== -1) {
+                      /**
+                       * Some revisions undergo transformations that may cause issues with
+                       * undo/redo if the transformation is destructive (we don't get back
+                       * the original command by transforming it with the inverse).
+                       * To prevent these problems, we must rebase all subsequent local
+                       * revisions.
+                       */
+                      this.revisions.rebase(this.pendingMessages[firstPendingRevisionId].nextRevisionId);
+                  }
+                  this.serverRevisionId = message.nextRevisionId;
+                  this.processedRevisions.add(message.nextRevisionId);
+                  this.sendPendingMessage();
+                  break;
+              }
           }
       }
       isAlreadyProcessed(message) {
@@ -64691,6 +64883,10 @@ stores.inject(MyMetaStore, storeInstance);
        */
       checkZonesAreInSheet(cmd) {
           const sheetId = "sheetId" in cmd ? cmd.sheetId : this.getters.tryGetActiveSheetId();
+          if ("ranges" in cmd &&
+              cmd.ranges.some((rangeData) => !this.getters.tryGetSheet(rangeData._sheetId))) {
+              return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
+          }
           const zones = this.getters.getCommandZones(cmd);
           if (!sheetId && zones.length > 0) {
               return "NoActiveSheet" /* CommandResult.NoActiveSheet */;
@@ -65040,23 +65236,23 @@ stores.inject(MyMetaStore, storeInstance);
   function repeatCreateChartCommand(getters, cmd) {
       return {
           ...repeatSheetDependantCommand(getters, cmd),
-          id: uuidGenerator.uuidv4(),
+          id: uuidGenerator.smallUuid(),
       };
   }
   function repeatCreateImageCommand(getters, cmd) {
       return {
           ...repeatSheetDependantCommand(getters, cmd),
-          figureId: uuidGenerator.uuidv4(),
+          figureId: uuidGenerator.smallUuid(),
       };
   }
   function repeatCreateFigureCommand(getters, cmd) {
       const newCmd = repeatSheetDependantCommand(getters, cmd);
-      newCmd.figure.id = uuidGenerator.uuidv4();
+      newCmd.figure.id = uuidGenerator.smallUuid();
       return newCmd;
   }
   function repeatCreateSheetCommand(getters, cmd) {
       const newCmd = deepCopy(cmd);
-      newCmd.sheetId = uuidGenerator.uuidv4();
+      newCmd.sheetId = uuidGenerator.smallUuid();
       const sheetName = cmd.name || getters.getSheet(getters.getActiveSheetId()).name;
       // Extract the prefix of the sheet name (everything before the number at the end of the name)
       const namePrefix = sheetName.match(/(.+?)\d*$/)?.[1] || sheetName;
@@ -65245,7 +65441,6 @@ stores.inject(MyMetaStore, storeInstance);
           super(config);
           this.session = config.session;
           this.session.on("new-local-state-update", this, this.onNewLocalStateUpdate);
-          this.session.on("pending-revisions-dropped", this, ({ revisionIds }) => this.drop(revisionIds));
           this.session.on("snapshot", this, () => {
               this.undoStack = [];
               this.redoStack = [];
@@ -65315,10 +65510,6 @@ stores.inject(MyMetaStore, storeInstance);
           const lastNonRedoRevision = this.getPossibleRevisionToRepeat();
           return canRepeatRevision(lastNonRedoRevision);
       }
-      drop(revisionIds) {
-          this.undoStack = this.undoStack.filter((id) => !revisionIds.includes(id));
-          this.redoStack = [];
-      }
       onNewLocalStateUpdate({ id }) {
           this.undoStack.push(id);
           this.redoStack = [];
@@ -66519,23 +66710,7 @@ stores.inject(MyMetaStore, storeInstance);
                           gridSelection: deepCopy(gridSelection),
                       };
                   }
-                  if (!this.getters.tryGetSheet(this.getters.getActiveSheetId())) {
-                      const currentSheetIds = this.getters.getVisibleSheetIds();
-                      this.activeSheet = this.getters.getSheet(currentSheetIds[0]);
-                      if (this.activeSheet.id in this.sheetsData) {
-                          const { anchor } = this.clipSelection(this.activeSheet.id, this.sheetsData[this.activeSheet.id].gridSelection);
-                          this.selectCell(anchor.cell.col, anchor.cell.row);
-                      }
-                      else {
-                          this.selectCell(0, 0);
-                      }
-                      const { col, row } = this.gridSelection.anchor.cell;
-                      this.moveClient({
-                          sheetId: this.getters.getActiveSheetId(),
-                          col,
-                          row,
-                      });
-                  }
+                  this.fallbackToVisibleSheet();
                   const sheetId = this.getters.getActiveSheetId();
                   this.gridSelection.zones = this.gridSelection.zones.map((z) => this.getters.expandZone(sheetId, z));
                   this.gridSelection.anchor.zone = this.getters.expandZone(sheetId, this.gridSelection.anchor.zone);
@@ -66545,6 +66720,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       finalize() {
+          this.fallbackToVisibleSheet();
           /** Any change to the selection has to be  reflected in the selection processor. */
           this.selection.resetDefaultAnchor(this, deepCopy(this.gridSelection.anchor));
       }
@@ -66855,6 +67031,25 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return "Success" /* CommandResult.Success */;
       }
+      fallbackToVisibleSheet() {
+          if (!this.getters.tryGetSheet(this.getters.getActiveSheetId())) {
+              const currentSheetIds = this.getters.getVisibleSheetIds();
+              this.activeSheet = this.getters.getSheet(currentSheetIds[0]);
+              if (this.activeSheet.id in this.sheetsData) {
+                  const { anchor } = this.clipSelection(this.activeSheet.id, this.sheetsData[this.activeSheet.id].gridSelection);
+                  this.selectCell(anchor.cell.col, anchor.cell.row);
+              }
+              else {
+                  this.selectCell(0, 0);
+              }
+              const { col, row } = this.gridSelection.anchor.cell;
+              this.moveClient({
+                  sheetId: this.getters.getActiveSheetId(),
+                  col,
+                  row,
+              });
+          }
+      }
       //-------------------------------------------
       // Helpers for extensions
       // ------------------------------------------
@@ -68018,7 +68213,9 @@ stores.inject(MyMetaStore, storeInstance);
               case "UNGROUP_HEADERS":
               case "GROUP_HEADERS":
               case "CREATE_SHEET":
-                  this.headerPositions[cmd.sheetId] = this.computeHeaderPositionsOfSheet(cmd.sheetId);
+                  if (this.getters.tryGetSheet(cmd.sheetId)) {
+                      this.headerPositions[cmd.sheetId] = this.computeHeaderPositionsOfSheet(cmd.sheetId);
+                  }
                   break;
               case "DUPLICATE_SHEET":
                   this.headerPositions[cmd.sheetIdTo] = deepCopy(this.headerPositions[cmd.sheetId]);
@@ -68026,12 +68223,14 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       finalize() {
-          if (this.isDirty) {
-              for (const sheetId of this.getters.getSheetIds()) {
+          for (const sheetId of this.getters.getSheetIds()) {
+              // sheets can be created without this plugin being aware of it
+              // in concurrent situations.
+              if (this.isDirty || !this.headerPositions[sheetId]) {
                   this.headerPositions[sheetId] = this.computeHeaderPositionsOfSheet(sheetId);
               }
-              this.isDirty = false;
           }
+          this.isDirty = false;
       }
       /**
        * Returns the size, start and end coordinates of a column on an unfolded sheet
@@ -68855,7 +69054,7 @@ stores.inject(MyMetaStore, storeInstance);
       clickAddSheet(ev) {
           const activeSheetId = this.env.model.getters.getActiveSheetId();
           const position = this.env.model.getters.getSheetIds().findIndex((sheetId) => sheetId === activeSheetId) + 1;
-          const sheetId = this.env.model.uuidGenerator.uuidv4();
+          const sheetId = this.env.model.uuidGenerator.smallUuid();
           const name = this.env.model.getters.getNextSheetName(_t("Sheet"));
           this.env.model.dispatch("CREATE_SHEET", { sheetId, position, name });
           this.env.model.dispatch("ACTIVATE_SHEET", { sheetIdFrom: activeSheetId, sheetIdTo: sheetId });
@@ -69870,6 +70069,10 @@ stores.inject(MyMetaStore, storeInstance);
 </svg>
 `;
   css /* scss */ `
+  .o-topbar-composer-container {
+    height: ${TOPBAR_TOOLBAR_HEIGHT}px;
+  }
+
   .o-topbar-composer {
     height: fit-content;
     margin-top: -1px;
@@ -71143,7 +71346,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       /**
        * Drop the operation and all following operations in every
-       * branch
+       * branches
        */
       drop(operationId) {
           for (const branch of this.branches) {
@@ -71448,9 +71651,16 @@ stores.inject(MyMetaStore, storeInstance);
           this.fastForward();
           this.insert(redoId, this.buildEmpty(redoId), insertAfter);
       }
-      drop(operationId) {
+      rebase(operationId) {
+          const operation = this.get(operationId);
+          const execution = [...this.tree.execution(this.HEAD_BRANCH).startAfter(operationId)];
           this.revertBefore(operationId);
+          const baseId = this.HEAD_OPERATION.id;
           this.tree.drop(operationId);
+          this.insert(operationId, operation, baseId);
+          for (const { operation } of execution) {
+              this.insert(operation.id, operation.data, this.HEAD_OPERATION.id);
+          }
       }
       /**
        * Revert the state as it was *before* the given operation was executed.
@@ -74561,6 +74771,11 @@ stores.inject(MyMetaStore, storeInstance);
               dispatch: (command) => {
                   const result = this.checkDispatchAllowed(command);
                   if (!result.isSuccessful) {
+                      // core views plugins need to be invalidated
+                      this.dispatchToHandlers(this.coreHandlers, {
+                          type: "UNDO",
+                          commands: [command],
+                      });
                       return;
                   }
                   this.isReplayingCommand = true;
@@ -74588,7 +74803,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       setupConfig(config) {
           const client = config.client || {
-              id: this.uuidGenerator.uuidv4(),
+              id: this.uuidGenerator.smallUuid(),
               name: _t("Anonymous").toString(),
           };
           const transportService = config.transportService || new LocalTransportService();
@@ -75111,9 +75326,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.1.7";
-  __info__.date = "2025-02-10T09:00:28.556Z";
-  __info__.hash = "338d8a1";
+  __info__.version = "18.1.9";
+  __info__.date = "2025-02-25T05:59:45.472Z";
+  __info__.hash = "6789c1c";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);