@odoo/o-spreadsheet 16.1.31 → 16.1.36

package/dist/o-spreadsheet.cjs.js

@@ -207,7 +207,7 @@ const TOPBAR_HEIGHT = 63;
 const BOTTOMBAR_HEIGHT = 36;
 const DEFAULT_CELL_WIDTH = 96;
 const DEFAULT_CELL_HEIGHT = 23;
-const SCROLLBAR_WIDTH$1 = 15;
+const SCROLLBAR_WIDTH = 15;
 const AUTOFILL_EDGE_LENGTH = 8;
 const ICON_EDGE_LENGTH = 18;
 const UNHIDE_ICON_EDGE_LENGTH = 14;
@@ -913,7 +913,7 @@ function isBoolean(str) {
 function isDateTime(str) {
     return parseDateTime(str) !== null;
 }
-const MARKDOWN_LINK_REGEX = /^\[([^\[]+)\]\((.+)\)$/;
+const MARKDOWN_LINK_REGEX = /^\[(.+)\]\((.+)\)$/;
 //link must start with http or https
 //https://stackoverflow.com/a/3809435/4760614
 const WEB_LINK_REGEX = /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)$/;
@@ -1676,6 +1676,9 @@ function parseFormat(formatString) {
 function formatValue(value, format) {
     switch (typeof value) {
         case "string":
+            if (value.includes('\\"')) {
+                return value.replace(/\\"/g, '"');
+            }
             return value;
         case "boolean":
             return value ? "TRUE" : "FALSE";
@@ -2005,27 +2008,30 @@ function detectFormat(content) {
 }
 function createLargeNumberFormat(format, magnitude, postFix) {
     const internalFormat = parseFormat(format || "#,##0");
-    const largeNumberFormat = internalFormat
-        .map((formatPart) => {
-        if (formatPart.type === "NUMBER") {
-            return [
-                {
-                    ...formatPart,
-                    format: {
-                        ...formatPart.format,
-                        magnitude,
-                        decimalPart: undefined,
-                    },
-                },
-                {
-                    type: "STRING",
-                    format: postFix,
-                },
-            ];
+    const largeNumberFormat = [];
+    for (let i = 0; i < internalFormat.length; i++) {
+        const formatPart = internalFormat[i];
+        if (formatPart.type !== "NUMBER") {
+            largeNumberFormat.push(formatPart);
+            continue;
         }
-        return formatPart;
-    })
-        .flat();
+        largeNumberFormat.push({
+            ...formatPart,
+            format: {
+                ...formatPart.format,
+                magnitude,
+                decimalPart: undefined,
+            },
+        });
+        largeNumberFormat.push({
+            type: "STRING",
+            format: postFix,
+        });
+        const nextFormatPart = internalFormat[i + 1];
+        if ((nextFormatPart === null || nextFormatPart === void 0 ? void 0 : nextFormatPart.type) === "STRING" && ["k", "m", "b"].includes(nextFormatPart.format)) {
+            i++;
+        }
+    }
     return convertInternalFormatToFormat(largeNumberFormat);
 }
 function changeDecimalPlaces(format, step) {
@@ -3670,64 +3676,65 @@ exports.CommandResult = void 0;
     CommandResult[CommandResult["InvalidFigureId"] = 28] = "InvalidFigureId";
     CommandResult[CommandResult["InputAlreadyFocused"] = 29] = "InputAlreadyFocused";
     CommandResult[CommandResult["MaximumRangesReached"] = 30] = "MaximumRangesReached";
-    CommandResult[CommandResult["InvalidChartDefinition"] = 31] = "InvalidChartDefinition";
-    CommandResult[CommandResult["InvalidDataSet"] = 32] = "InvalidDataSet";
-    CommandResult[CommandResult["InvalidLabelRange"] = 33] = "InvalidLabelRange";
-    CommandResult[CommandResult["InvalidScorecardKeyValue"] = 34] = "InvalidScorecardKeyValue";
-    CommandResult[CommandResult["InvalidScorecardBaseline"] = 35] = "InvalidScorecardBaseline";
-    CommandResult[CommandResult["InvalidGaugeDataRange"] = 36] = "InvalidGaugeDataRange";
-    CommandResult[CommandResult["EmptyGaugeRangeMin"] = 37] = "EmptyGaugeRangeMin";
-    CommandResult[CommandResult["GaugeRangeMinNaN"] = 38] = "GaugeRangeMinNaN";
-    CommandResult[CommandResult["EmptyGaugeRangeMax"] = 39] = "EmptyGaugeRangeMax";
-    CommandResult[CommandResult["GaugeRangeMaxNaN"] = 40] = "GaugeRangeMaxNaN";
-    CommandResult[CommandResult["GaugeRangeMinBiggerThanRangeMax"] = 41] = "GaugeRangeMinBiggerThanRangeMax";
-    CommandResult[CommandResult["GaugeLowerInflectionPointNaN"] = 42] = "GaugeLowerInflectionPointNaN";
-    CommandResult[CommandResult["GaugeUpperInflectionPointNaN"] = 43] = "GaugeUpperInflectionPointNaN";
-    CommandResult[CommandResult["GaugeLowerBiggerThanUpper"] = 44] = "GaugeLowerBiggerThanUpper";
-    CommandResult[CommandResult["InvalidAutofillSelection"] = 45] = "InvalidAutofillSelection";
-    CommandResult[CommandResult["WrongComposerSelection"] = 46] = "WrongComposerSelection";
-    CommandResult[CommandResult["MinBiggerThanMax"] = 47] = "MinBiggerThanMax";
-    CommandResult[CommandResult["LowerBiggerThanUpper"] = 48] = "LowerBiggerThanUpper";
-    CommandResult[CommandResult["MidBiggerThanMax"] = 49] = "MidBiggerThanMax";
-    CommandResult[CommandResult["MinBiggerThanMid"] = 50] = "MinBiggerThanMid";
-    CommandResult[CommandResult["FirstArgMissing"] = 51] = "FirstArgMissing";
-    CommandResult[CommandResult["SecondArgMissing"] = 52] = "SecondArgMissing";
-    CommandResult[CommandResult["MinNaN"] = 53] = "MinNaN";
-    CommandResult[CommandResult["MidNaN"] = 54] = "MidNaN";
-    CommandResult[CommandResult["MaxNaN"] = 55] = "MaxNaN";
-    CommandResult[CommandResult["ValueUpperInflectionNaN"] = 56] = "ValueUpperInflectionNaN";
-    CommandResult[CommandResult["ValueLowerInflectionNaN"] = 57] = "ValueLowerInflectionNaN";
-    CommandResult[CommandResult["MinInvalidFormula"] = 58] = "MinInvalidFormula";
-    CommandResult[CommandResult["MidInvalidFormula"] = 59] = "MidInvalidFormula";
-    CommandResult[CommandResult["MaxInvalidFormula"] = 60] = "MaxInvalidFormula";
-    CommandResult[CommandResult["ValueUpperInvalidFormula"] = 61] = "ValueUpperInvalidFormula";
-    CommandResult[CommandResult["ValueLowerInvalidFormula"] = 62] = "ValueLowerInvalidFormula";
-    CommandResult[CommandResult["InvalidSortZone"] = 63] = "InvalidSortZone";
-    CommandResult[CommandResult["WaitingSessionConfirmation"] = 64] = "WaitingSessionConfirmation";
-    CommandResult[CommandResult["MergeOverlap"] = 65] = "MergeOverlap";
-    CommandResult[CommandResult["TooManyHiddenElements"] = 66] = "TooManyHiddenElements";
-    CommandResult[CommandResult["Readonly"] = 67] = "Readonly";
-    CommandResult[CommandResult["InvalidViewportSize"] = 68] = "InvalidViewportSize";
-    CommandResult[CommandResult["InvalidScrollingDirection"] = 69] = "InvalidScrollingDirection";
-    CommandResult[CommandResult["FigureDoesNotExist"] = 70] = "FigureDoesNotExist";
-    CommandResult[CommandResult["InvalidConditionalFormatId"] = 71] = "InvalidConditionalFormatId";
-    CommandResult[CommandResult["InvalidCellPopover"] = 72] = "InvalidCellPopover";
-    CommandResult[CommandResult["EmptyTarget"] = 73] = "EmptyTarget";
-    CommandResult[CommandResult["InvalidFreezeQuantity"] = 74] = "InvalidFreezeQuantity";
-    CommandResult[CommandResult["FrozenPaneOverlap"] = 75] = "FrozenPaneOverlap";
-    CommandResult[CommandResult["ValuesNotChanged"] = 76] = "ValuesNotChanged";
-    CommandResult[CommandResult["InvalidFilterZone"] = 77] = "InvalidFilterZone";
-    CommandResult[CommandResult["FilterOverlap"] = 78] = "FilterOverlap";
-    CommandResult[CommandResult["FilterNotFound"] = 79] = "FilterNotFound";
-    CommandResult[CommandResult["MergeInFilter"] = 80] = "MergeInFilter";
-    CommandResult[CommandResult["NonContinuousTargets"] = 81] = "NonContinuousTargets";
-    CommandResult[CommandResult["DuplicatedFigureId"] = 82] = "DuplicatedFigureId";
-    CommandResult[CommandResult["InvalidSelectionStep"] = 83] = "InvalidSelectionStep";
-    CommandResult[CommandResult["DuplicatedChartId"] = 84] = "DuplicatedChartId";
-    CommandResult[CommandResult["ChartDoesNotExist"] = 85] = "ChartDoesNotExist";
-    CommandResult[CommandResult["InvalidHeaderIndex"] = 86] = "InvalidHeaderIndex";
-    CommandResult[CommandResult["InvalidQuantity"] = 87] = "InvalidQuantity";
-    CommandResult[CommandResult["NoChanges"] = 88] = "NoChanges";
+    CommandResult[CommandResult["InvalidInputId"] = 31] = "InvalidInputId";
+    CommandResult[CommandResult["InvalidChartDefinition"] = 32] = "InvalidChartDefinition";
+    CommandResult[CommandResult["InvalidDataSet"] = 33] = "InvalidDataSet";
+    CommandResult[CommandResult["InvalidLabelRange"] = 34] = "InvalidLabelRange";
+    CommandResult[CommandResult["InvalidScorecardKeyValue"] = 35] = "InvalidScorecardKeyValue";
+    CommandResult[CommandResult["InvalidScorecardBaseline"] = 36] = "InvalidScorecardBaseline";
+    CommandResult[CommandResult["InvalidGaugeDataRange"] = 37] = "InvalidGaugeDataRange";
+    CommandResult[CommandResult["EmptyGaugeRangeMin"] = 38] = "EmptyGaugeRangeMin";
+    CommandResult[CommandResult["GaugeRangeMinNaN"] = 39] = "GaugeRangeMinNaN";
+    CommandResult[CommandResult["EmptyGaugeRangeMax"] = 40] = "EmptyGaugeRangeMax";
+    CommandResult[CommandResult["GaugeRangeMaxNaN"] = 41] = "GaugeRangeMaxNaN";
+    CommandResult[CommandResult["GaugeRangeMinBiggerThanRangeMax"] = 42] = "GaugeRangeMinBiggerThanRangeMax";
+    CommandResult[CommandResult["GaugeLowerInflectionPointNaN"] = 43] = "GaugeLowerInflectionPointNaN";
+    CommandResult[CommandResult["GaugeUpperInflectionPointNaN"] = 44] = "GaugeUpperInflectionPointNaN";
+    CommandResult[CommandResult["GaugeLowerBiggerThanUpper"] = 45] = "GaugeLowerBiggerThanUpper";
+    CommandResult[CommandResult["InvalidAutofillSelection"] = 46] = "InvalidAutofillSelection";
+    CommandResult[CommandResult["WrongComposerSelection"] = 47] = "WrongComposerSelection";
+    CommandResult[CommandResult["MinBiggerThanMax"] = 48] = "MinBiggerThanMax";
+    CommandResult[CommandResult["LowerBiggerThanUpper"] = 49] = "LowerBiggerThanUpper";
+    CommandResult[CommandResult["MidBiggerThanMax"] = 50] = "MidBiggerThanMax";
+    CommandResult[CommandResult["MinBiggerThanMid"] = 51] = "MinBiggerThanMid";
+    CommandResult[CommandResult["FirstArgMissing"] = 52] = "FirstArgMissing";
+    CommandResult[CommandResult["SecondArgMissing"] = 53] = "SecondArgMissing";
+    CommandResult[CommandResult["MinNaN"] = 54] = "MinNaN";
+    CommandResult[CommandResult["MidNaN"] = 55] = "MidNaN";
+    CommandResult[CommandResult["MaxNaN"] = 56] = "MaxNaN";
+    CommandResult[CommandResult["ValueUpperInflectionNaN"] = 57] = "ValueUpperInflectionNaN";
+    CommandResult[CommandResult["ValueLowerInflectionNaN"] = 58] = "ValueLowerInflectionNaN";
+    CommandResult[CommandResult["MinInvalidFormula"] = 59] = "MinInvalidFormula";
+    CommandResult[CommandResult["MidInvalidFormula"] = 60] = "MidInvalidFormula";
+    CommandResult[CommandResult["MaxInvalidFormula"] = 61] = "MaxInvalidFormula";
+    CommandResult[CommandResult["ValueUpperInvalidFormula"] = 62] = "ValueUpperInvalidFormula";
+    CommandResult[CommandResult["ValueLowerInvalidFormula"] = 63] = "ValueLowerInvalidFormula";
+    CommandResult[CommandResult["InvalidSortZone"] = 64] = "InvalidSortZone";
+    CommandResult[CommandResult["WaitingSessionConfirmation"] = 65] = "WaitingSessionConfirmation";
+    CommandResult[CommandResult["MergeOverlap"] = 66] = "MergeOverlap";
+    CommandResult[CommandResult["TooManyHiddenElements"] = 67] = "TooManyHiddenElements";
+    CommandResult[CommandResult["Readonly"] = 68] = "Readonly";
+    CommandResult[CommandResult["InvalidViewportSize"] = 69] = "InvalidViewportSize";
+    CommandResult[CommandResult["InvalidScrollingDirection"] = 70] = "InvalidScrollingDirection";
+    CommandResult[CommandResult["FigureDoesNotExist"] = 71] = "FigureDoesNotExist";
+    CommandResult[CommandResult["InvalidConditionalFormatId"] = 72] = "InvalidConditionalFormatId";
+    CommandResult[CommandResult["InvalidCellPopover"] = 73] = "InvalidCellPopover";
+    CommandResult[CommandResult["EmptyTarget"] = 74] = "EmptyTarget";
+    CommandResult[CommandResult["InvalidFreezeQuantity"] = 75] = "InvalidFreezeQuantity";
+    CommandResult[CommandResult["FrozenPaneOverlap"] = 76] = "FrozenPaneOverlap";
+    CommandResult[CommandResult["ValuesNotChanged"] = 77] = "ValuesNotChanged";
+    CommandResult[CommandResult["InvalidFilterZone"] = 78] = "InvalidFilterZone";
+    CommandResult[CommandResult["FilterOverlap"] = 79] = "FilterOverlap";
+    CommandResult[CommandResult["FilterNotFound"] = 80] = "FilterNotFound";
+    CommandResult[CommandResult["MergeInFilter"] = 81] = "MergeInFilter";
+    CommandResult[CommandResult["NonContinuousTargets"] = 82] = "NonContinuousTargets";
+    CommandResult[CommandResult["DuplicatedFigureId"] = 83] = "DuplicatedFigureId";
+    CommandResult[CommandResult["InvalidSelectionStep"] = 84] = "InvalidSelectionStep";
+    CommandResult[CommandResult["DuplicatedChartId"] = 85] = "DuplicatedChartId";
+    CommandResult[CommandResult["ChartDoesNotExist"] = 86] = "ChartDoesNotExist";
+    CommandResult[CommandResult["InvalidHeaderIndex"] = 87] = "InvalidHeaderIndex";
+    CommandResult[CommandResult["InvalidQuantity"] = 88] = "InvalidQuantity";
+    CommandResult[CommandResult["NoChanges"] = 89] = "NoChanges";
 })(exports.CommandResult || (exports.CommandResult = {}));
 
 function isMatrix(x) {
@@ -3874,14 +3881,8 @@ function createDataSets(getters, dataSetsString, sheetId, dataSetsHaveTitle) {
                     : undefined));
             }
         }
-        else if (zone.left === zone.right && zone.top === zone.bottom) {
-            // A single cell. If it's only the title, the dataset is not added.
-            if (!dataSetsHaveTitle) {
-                dataSets.push(createDataSet(getters, dataSetSheetId, zone, undefined));
-            }
-        }
         else {
-            /* 1 row or 1 column */
+            /* 1 cell, 1 row or 1 column */
             dataSets.push(createDataSet(getters, dataSetSheetId, zone, dataSetsHaveTitle
                 ? {
                     top: zone.top,
@@ -3931,8 +3932,10 @@ function toExcelDataset(getters, ds) {
     }
     const dataRange = ds.dataRange.clone({ zone: dataZone });
     return {
-        label: ds.labelCell ? getters.getRangeString(ds.labelCell, "forceSheetReference") : undefined,
-        range: getters.getRangeString(dataRange, "forceSheetReference"),
+        label: ds.labelCell
+            ? getters.getRangeString(ds.labelCell, "forceSheetReference", true)
+            : undefined,
+        range: getters.getRangeString(dataRange, "forceSheetReference", true),
     };
 }
 /**
@@ -4001,11 +4004,11 @@ function checkDataset(definition) {
     if (definition.dataSets) {
         const invalidRanges = definition.dataSets.find((range) => !rangeReference.test(range)) !== undefined;
         if (invalidRanges) {
-            return 32 /* CommandResult.InvalidDataSet */;
+            return 33 /* CommandResult.InvalidDataSet */;
         }
         const zones = definition.dataSets.map(toUnboundedZone);
         if (zones.some((zone) => zone.top !== zone.bottom && isFullRow(zone))) {
-            return 32 /* CommandResult.InvalidDataSet */;
+            return 33 /* CommandResult.InvalidDataSet */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -4014,7 +4017,7 @@ function checkLabelRange(definition) {
     if (definition.labelRange) {
         const invalidLabels = !rangeReference.test(definition.labelRange || "");
         if (invalidLabels) {
-            return 33 /* CommandResult.InvalidLabelRange */;
+            return 34 /* CommandResult.InvalidLabelRange */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -4087,22 +4090,22 @@ function getChartPositionAtCenterOfViewport(getters, chartSize) {
 const CfTerms = {
     Errors: {
         [25 /* CommandResult.InvalidRange */]: _lt("The range is invalid"),
-        [51 /* CommandResult.FirstArgMissing */]: _lt("The argument is missing. Please provide a value"),
-        [52 /* CommandResult.SecondArgMissing */]: _lt("The second argument is missing. Please provide a value"),
-        [53 /* CommandResult.MinNaN */]: _lt("The minpoint must be a number"),
-        [54 /* CommandResult.MidNaN */]: _lt("The midpoint must be a number"),
-        [55 /* CommandResult.MaxNaN */]: _lt("The maxpoint must be a number"),
-        [56 /* CommandResult.ValueUpperInflectionNaN */]: _lt("The first value must be a number"),
-        [57 /* CommandResult.ValueLowerInflectionNaN */]: _lt("The second value must be a number"),
-        [47 /* CommandResult.MinBiggerThanMax */]: _lt("Minimum must be smaller then Maximum"),
-        [50 /* CommandResult.MinBiggerThanMid */]: _lt("Minimum must be smaller then Midpoint"),
-        [49 /* CommandResult.MidBiggerThanMax */]: _lt("Midpoint must be smaller then Maximum"),
-        [48 /* CommandResult.LowerBiggerThanUpper */]: _lt("Lower inflection point must be smaller than upper inflection point"),
-        [58 /* CommandResult.MinInvalidFormula */]: _lt("Invalid Minpoint formula"),
-        [60 /* CommandResult.MaxInvalidFormula */]: _lt("Invalid Maxpoint formula"),
-        [59 /* CommandResult.MidInvalidFormula */]: _lt("Invalid Midpoint formula"),
-        [61 /* CommandResult.ValueUpperInvalidFormula */]: _lt("Invalid upper inflection point formula"),
-        [62 /* CommandResult.ValueLowerInvalidFormula */]: _lt("Invalid lower inflection point formula"),
+        [52 /* CommandResult.FirstArgMissing */]: _lt("The argument is missing. Please provide a value"),
+        [53 /* CommandResult.SecondArgMissing */]: _lt("The second argument is missing. Please provide a value"),
+        [54 /* CommandResult.MinNaN */]: _lt("The minpoint must be a number"),
+        [55 /* CommandResult.MidNaN */]: _lt("The midpoint must be a number"),
+        [56 /* CommandResult.MaxNaN */]: _lt("The maxpoint must be a number"),
+        [57 /* CommandResult.ValueUpperInflectionNaN */]: _lt("The first value must be a number"),
+        [58 /* CommandResult.ValueLowerInflectionNaN */]: _lt("The second value must be a number"),
+        [48 /* CommandResult.MinBiggerThanMax */]: _lt("Minimum must be smaller then Maximum"),
+        [51 /* CommandResult.MinBiggerThanMid */]: _lt("Minimum must be smaller then Midpoint"),
+        [50 /* CommandResult.MidBiggerThanMax */]: _lt("Midpoint must be smaller then Maximum"),
+        [49 /* CommandResult.LowerBiggerThanUpper */]: _lt("Lower inflection point must be smaller than upper inflection point"),
+        [59 /* CommandResult.MinInvalidFormula */]: _lt("Invalid Minpoint formula"),
+        [61 /* CommandResult.MaxInvalidFormula */]: _lt("Invalid Maxpoint formula"),
+        [60 /* CommandResult.MidInvalidFormula */]: _lt("Invalid Midpoint formula"),
+        [62 /* CommandResult.ValueUpperInvalidFormula */]: _lt("Invalid upper inflection point formula"),
+        [63 /* CommandResult.ValueLowerInvalidFormula */]: _lt("Invalid lower inflection point formula"),
         [24 /* CommandResult.EmptyRange */]: _lt("A range needs to be defined"),
         Unexpected: _lt("The rule is invalid for an unknown reason"),
     },
@@ -4130,20 +4133,20 @@ const ChartTerms = {
     Errors: {
         Unexpected: _lt("The chart definition is invalid for an unknown reason"),
         // BASIC CHART ERRORS (LINE | BAR | PIE)
-        [32 /* CommandResult.InvalidDataSet */]: _lt("The dataset is invalid"),
-        [33 /* CommandResult.InvalidLabelRange */]: _lt("Labels are invalid"),
+        [33 /* CommandResult.InvalidDataSet */]: _lt("The dataset is invalid"),
+        [34 /* CommandResult.InvalidLabelRange */]: _lt("Labels are invalid"),
         // SCORECARD CHART ERRORS
-        [34 /* CommandResult.InvalidScorecardKeyValue */]: _lt("The key value is invalid"),
-        [35 /* CommandResult.InvalidScorecardBaseline */]: _lt("The baseline value is invalid"),
+        [35 /* CommandResult.InvalidScorecardKeyValue */]: _lt("The key value is invalid"),
+        [36 /* CommandResult.InvalidScorecardBaseline */]: _lt("The baseline value is invalid"),
         // GAUGE CHART ERRORS
-        [36 /* CommandResult.InvalidGaugeDataRange */]: _lt("The data range is invalid"),
-        [37 /* CommandResult.EmptyGaugeRangeMin */]: _lt("A minimum range limit value is needed"),
-        [38 /* CommandResult.GaugeRangeMinNaN */]: _lt("The minimum range limit value must be a number"),
-        [39 /* CommandResult.EmptyGaugeRangeMax */]: _lt("A maximum range limit value is needed"),
-        [40 /* CommandResult.GaugeRangeMaxNaN */]: _lt("The maximum range limit value must be a number"),
-        [41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */]: _lt("Minimum range limit must be smaller than maximum range limit"),
-        [42 /* CommandResult.GaugeLowerInflectionPointNaN */]: _lt("The lower inflection point value must be a number"),
-        [43 /* CommandResult.GaugeUpperInflectionPointNaN */]: _lt("The upper inflection point value must be a number"),
+        [37 /* CommandResult.InvalidGaugeDataRange */]: _lt("The data range is invalid"),
+        [38 /* CommandResult.EmptyGaugeRangeMin */]: _lt("A minimum range limit value is needed"),
+        [39 /* CommandResult.GaugeRangeMinNaN */]: _lt("The minimum range limit value must be a number"),
+        [40 /* CommandResult.EmptyGaugeRangeMax */]: _lt("A maximum range limit value is needed"),
+        [41 /* CommandResult.GaugeRangeMaxNaN */]: _lt("The maximum range limit value must be a number"),
+        [42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */]: _lt("Minimum range limit must be smaller than maximum range limit"),
+        [43 /* CommandResult.GaugeLowerInflectionPointNaN */]: _lt("The lower inflection point value must be a number"),
+        [44 /* CommandResult.GaugeUpperInflectionPointNaN */]: _lt("The upper inflection point value must be a number"),
     },
 };
 const NumberFormatTerms = {
@@ -4429,6 +4432,9 @@ class BarChart extends AbstractChart {
             .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
         return {
             ...this.getDefinition(),
+            labelRange: this.labelRange
+                ? this.getters.getRangeString(this.labelRange, this.sheetId, true)
+                : undefined,
             backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
             fontColor: toXlsxHexColor(chartFontColor(this.background)),
             dataSets,
@@ -4515,7 +4521,7 @@ function createBarChartRuntime(chart, getters) {
 
 function isDataRangeValid(definition) {
     return definition.dataRange && !rangeReference.test(definition.dataRange)
-        ? 36 /* CommandResult.InvalidGaugeDataRange */
+        ? 37 /* CommandResult.InvalidGaugeDataRange */
         : 0 /* CommandResult.Success */;
 }
 function checkRangeLimits(check, batchValidations) {
@@ -4547,7 +4553,7 @@ function checkInflectionPointsValue(check, batchValidations) {
 function checkRangeMinBiggerThanRangeMax(definition) {
     if (definition.sectionRule) {
         if (Number(definition.sectionRule.rangeMin) >= Number(definition.sectionRule.rangeMax)) {
-            return 41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */;
+            return 42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -4556,9 +4562,9 @@ function checkEmpty(value, valueName) {
     if (value === "") {
         switch (valueName) {
             case "rangeMin":
-                return 37 /* CommandResult.EmptyGaugeRangeMin */;
+                return 38 /* CommandResult.EmptyGaugeRangeMin */;
             case "rangeMax":
-                return 39 /* CommandResult.EmptyGaugeRangeMax */;
+                return 40 /* CommandResult.EmptyGaugeRangeMax */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -4567,13 +4573,13 @@ function checkNaN(value, valueName) {
     if (isNaN(value)) {
         switch (valueName) {
             case "rangeMin":
-                return 38 /* CommandResult.GaugeRangeMinNaN */;
+                return 39 /* CommandResult.GaugeRangeMinNaN */;
             case "rangeMax":
-                return 40 /* CommandResult.GaugeRangeMaxNaN */;
+                return 41 /* CommandResult.GaugeRangeMaxNaN */;
             case "lowerInflectionPointValue":
-                return 42 /* CommandResult.GaugeLowerInflectionPointNaN */;
+                return 43 /* CommandResult.GaugeLowerInflectionPointNaN */;
             case "upperInflectionPointValue":
-                return 43 /* CommandResult.GaugeUpperInflectionPointNaN */;
+                return 44 /* CommandResult.GaugeUpperInflectionPointNaN */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -4987,6 +4993,9 @@ class LineChart extends AbstractChart {
             .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
         return {
             ...this.getDefinition(),
+            labelRange: this.labelRange
+                ? this.getters.getRangeString(this.labelRange, this.sheetId, true)
+                : undefined,
             backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
             fontColor: toXlsxHexColor(chartFontColor(this.background)),
             dataSets,
@@ -5250,6 +5259,9 @@ class PieChart extends AbstractChart {
             .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
         return {
             ...this.getDefinition(),
+            labelRange: this.labelRange
+                ? this.getters.getRangeString(this.labelRange, this.sheetId, true)
+                : undefined,
             backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
             fontColor: toXlsxHexColor(chartFontColor(this.background)),
             verticalAxisPosition: "left",
@@ -5324,12 +5336,12 @@ function createPieChartRuntime(chart, getters) {
 
 function checkKeyValue(definition) {
     return definition.keyValue && !rangeReference.test(definition.keyValue)
-        ? 34 /* CommandResult.InvalidScorecardKeyValue */
+        ? 35 /* CommandResult.InvalidScorecardKeyValue */
         : 0 /* CommandResult.Success */;
 }
 function checkBaseline(definition) {
     return definition.baseline && !rangeReference.test(definition.baseline)
-        ? 35 /* CommandResult.InvalidScorecardBaseline */
+        ? 36 /* CommandResult.InvalidScorecardBaseline */
         : 0 /* CommandResult.Success */;
 }
 class ScorecardChart extends AbstractChart {
@@ -6371,7 +6383,7 @@ function handlePasteResult(env, result) {
         else if (result.reasons.includes(22 /* CommandResult.WrongFigurePasteOption */)) {
             env.raiseError(PasteInteractiveContent.wrongFigurePasteOption);
         }
-        else if (result.reasons.includes(75 /* CommandResult.FrozenPaneOverlap */)) {
+        else if (result.reasons.includes(76 /* CommandResult.FrozenPaneOverlap */)) {
             env.raiseError(PasteInteractiveContent.frozenPaneOverlap);
         }
     }
@@ -6658,7 +6670,7 @@ function interactiveSortSelection(env, sheetId, anchor, zone, sortDirection) {
             });
         }
     }
-    if (result.isCancelledBecause(63 /* CommandResult.InvalidSortZone */)) {
+    if (result.isCancelledBecause(64 /* CommandResult.InvalidSortZone */)) {
         const { col, row } = anchor;
         env.model.selection.selectZone({ cell: { col, row }, zone });
         env.raiseError(_lt("Cannot sort. To sort, select only cells or only merges that have the same size."));
@@ -6672,13 +6684,13 @@ const AddFilterInteractiveContent = {
 };
 function interactiveAddFilter(env, sheetId, target) {
     const result = env.model.dispatch("CREATE_FILTER_TABLE", { target, sheetId });
-    if (result.isCancelledBecause(78 /* CommandResult.FilterOverlap */)) {
+    if (result.isCancelledBecause(79 /* CommandResult.FilterOverlap */)) {
         env.raiseError(AddFilterInteractiveContent.filterOverlap);
     }
-    else if (result.isCancelledBecause(80 /* CommandResult.MergeInFilter */)) {
+    else if (result.isCancelledBecause(81 /* CommandResult.MergeInFilter */)) {
         env.raiseError(AddFilterInteractiveContent.mergeInFilter);
     }
-    else if (result.isCancelledBecause(81 /* CommandResult.NonContinuousTargets */)) {
+    else if (result.isCancelledBecause(82 /* CommandResult.NonContinuousTargets */)) {
         env.raiseError(AddFilterInteractiveContent.nonContinuousTargets);
     }
 }
@@ -7255,6 +7267,12 @@ const INSERT_LINK = (env) => {
     let { col, row } = env.model.getters.getActivePosition();
     env.model.dispatch("OPEN_CELL_POPOVER", { col, row, popoverType: "LinkEditor" });
 };
+const INSERT_LINK_NAME = (env) => {
+    const sheetId = env.model.getters.getActiveSheetId();
+    const { col, row } = env.model.getters.getActivePosition();
+    const cell = env.model.getters.getEvaluatedCell({ sheetId, col, row });
+    return cell && cell.link ? _lt("Edit link") : _lt("Insert link");
+};
 //------------------------------------------------------------------------------
 // Filters action
 //------------------------------------------------------------------------------
@@ -7392,7 +7410,7 @@ cellMenuRegistry
     action: DELETE_CELL_SHIFT_LEFT,
 })
     .add("insert_link", {
-    name: _lt("Insert link"),
+    name: INSERT_LINK_NAME,
     separator: true,
     sequence: 150,
     action: INSERT_LINK,
@@ -16551,9 +16569,6 @@ class EditionPlugin extends UIPlugin {
                 break;
         }
     }
-    unsubscribe() {
-        this.mode = "inactive";
-    }
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
@@ -16629,7 +16644,7 @@ class EditionPlugin extends UIPlugin {
     validateSelection(length, start, end) {
         return start >= 0 && start <= length && end >= 0 && end <= length
             ? 0 /* CommandResult.Success */
-            : 46 /* CommandResult.WrongComposerSelection */;
+            : 47 /* CommandResult.WrongComposerSelection */;
     }
     onColumnsRemoved(cmd) {
         if (cmd.elements.includes(this.col) && this.mode !== "inactive") {
@@ -16943,9 +16958,10 @@ class EditionPlugin extends UIPlugin {
      */
     getReferencedRanges() {
         const editionSheetId = this.getters.getEditionSheet();
-        return this.currentTokens
+        const referenceRanges = this.currentTokens
             .filter((token) => token.type === "REFERENCE")
             .map((token) => this.getters.getRangeFromSheetXC(editionSheetId, token.value));
+        return referenceRanges.filter((range) => !range.invalidSheetName && !range.invalidXc);
     }
     /**
      * Function used to determine when composer selection can start.
@@ -17445,13 +17461,12 @@ class Composer extends owl.Component {
     setup() {
         owl.onMounted(() => {
             const el = this.composerRef.el;
+            if (this.props.isDefaultFocus) {
+                this.env.focusableElement.setFocusableElement(el);
+            }
             this.contentHelper.updateEl(el);
             this.processContent();
         });
-        owl.onWillUnmount(() => {
-            var _a, _b;
-            (_b = (_a = this.props).onComposerUnmounted) === null || _b === void 0 ? void 0 : _b.call(_a);
-        });
         owl.onPatched(() => {
             if (!this.isKeyStillDown) {
                 this.processContent();
@@ -17462,7 +17477,8 @@ class Composer extends owl.Component {
     // Handlers
     // ---------------------------------------------------------------------------
     processArrowKeys(ev) {
-        if (this.env.model.getters.isSelectingForComposer()) {
+        if (this.env.model.getters.isSelectingForComposer() ||
+            this.env.model.getters.getEditionMode() === "inactive") {
             this.functionDescriptionState.showDescription = false;
             // Prevent the default content editable behavior which moves the cursor
             ev.preventDefault();
@@ -17503,21 +17519,23 @@ class Composer extends owl.Component {
         var _a;
         ev.preventDefault();
         ev.stopPropagation();
-        if (this.autoCompleteState.showProvider) {
-            const autoCompleteValue = (_a = this.autoCompleteState.values[this.autoCompleteState.selectedIndex]) === null || _a === void 0 ? void 0 : _a.text;
-            if (autoCompleteValue) {
-                this.autoComplete(autoCompleteValue);
-                return;
+        if (this.env.model.getters.getEditionMode() !== "inactive") {
+            if (this.autoCompleteState.showProvider) {
+                const autoCompleteValue = (_a = this.autoCompleteState.values[this.autoCompleteState.selectedIndex]) === null || _a === void 0 ? void 0 : _a.text;
+                if (autoCompleteValue) {
+                    this.autoComplete(autoCompleteValue);
+                    return;
+                }
             }
-        }
-        else {
-            // when completing with tab, if there is no value to complete, the active cell will be moved to the right.
-            // we can't let the model think that it is for a ref selection.
-            // todo: check if this can be removed someday
-            this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
+            else {
+                // when completing with tab, if there is no value to complete, the active cell will be moved to the right.
+                // we can't let the model think that it is for a ref selection.
+                // todo: check if this can be removed someday
+                this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
+            }
+            this.env.model.dispatch("STOP_EDITION");
         }
         const direction = ev.shiftKey ? "left" : "right";
-        this.env.model.dispatch("STOP_EDITION");
         this.env.model.selection.moveAnchorCell(direction, 1);
     }
     processEnterKey(ev) {
@@ -17550,6 +17568,9 @@ class Composer extends owl.Component {
         this.compositionActive = false;
     }
     onKeydown(ev) {
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            return;
+        }
         let handler = this.keyMapping[ev.key];
         if (handler) {
             handler.call(this, ev);
@@ -17560,23 +17581,46 @@ class Composer extends owl.Component {
         }
     }
     updateCursorIfNeeded() {
-        if (!this.env.model.getters.isSelectingForComposer()) {
+        const moveCursor = !this.env.model.getters.isSelectingForComposer() &&
+            !(this.env.model.getters.getEditionMode() === "inactive");
+        if (moveCursor) {
             const { start, end } = this.contentHelper.getCurrentSelection();
             this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
             this.isKeyStillDown = true;
         }
     }
+    onPaste(ev) {
+        if (this.env.model.getters.getEditionMode() !== "inactive") {
+            ev.stopPropagation();
+        }
+    }
     /*
      * Triggered automatically by the content-editable between the keydown and key up
      * */
-    onInput() {
-        if (this.props.focus === "inactive" || !this.shouldProcessInputEvents) {
+    onInput(ev) {
+        var _a, _b;
+        if (!this.shouldProcessInputEvents) {
             return;
         }
+        if (ev.inputType === "insertFromPaste" &&
+            this.env.model.getters.getEditionMode() === "inactive") {
+            return;
+        }
+        ev.stopPropagation();
+        let content;
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            content = ev.data || "";
+        }
+        else {
+            const el = this.composerRef.el;
+            content = el.childNodes.length ? el.textContent : "";
+        }
+        if (this.props.focus === "inactive") {
+            return (_b = (_a = this.props).onComposerCellFocused) === null || _b === void 0 ? void 0 : _b.call(_a, content);
+        }
         this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
-        const el = this.composerRef.el;
         this.env.model.dispatch("SET_CURRENT_CONTENT", {
-            content: el.childNodes.length ? el.textContent : "",
+            content,
             selection: this.contentHelper.getCurrentSelection(),
         });
     }
@@ -17636,9 +17680,8 @@ class Composer extends owl.Component {
         }
         const newSelection = this.contentHelper.getCurrentSelection();
         this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
-        if (this.props.focus === "inactive") {
-            this.props.onComposerContentFocused(newSelection);
-        }
+        this.props.onComposerContentFocused();
+        if (this.props.focus === "inactive") ;
         this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", newSelection);
         this.processTokenAtCursor();
     }
@@ -17655,6 +17698,7 @@ class Composer extends owl.Component {
         this.contentHelper.removeAll(); // removes the content of the composer, to be added just after
         this.shouldProcessInputEvents = false;
         if (this.props.focus !== "inactive") {
+            this.contentHelper.el.focus();
             this.contentHelper.selectRange(0, 0); // move the cursor inside the composer at 0 0.
         }
         const content = this.getContent();
@@ -17821,18 +17865,18 @@ Composer.template = "o-spreadsheet-Composer";
 Composer.components = { TextValueProvider, FunctionDescriptionProvider };
 Composer.defaultProps = {
     inputStyle: "",
+    isDefaultFocus: false,
 };
 Composer.props = {
     inputStyle: { type: String, optional: true },
     rect: { type: Object, optional: true },
     delimitation: { type: Object, optional: true },
     focus: { validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value) },
-    onComposerUnmounted: { type: Function, optional: true },
+    onComposerCellFocused: { type: Function, optional: true },
     onComposerContentFocused: Function,
+    isDefaultFocus: { type: Boolean, optional: true },
 };
 
-const SCROLLBAR_WIDTH = 14;
-const SCROLLBAR_HIGHT = 15;
 const COMPOSER_BORDER_WIDTH = 3 * 0.4 * window.devicePixelRatio || 1;
 css /* scss */ `
   div.o-grid-composer {
@@ -17847,35 +17891,52 @@ css /* scss */ `
  * It also applies the style of the cell to the composer input.
  */
 class GridComposer extends owl.Component {
+    constructor() {
+        super(...arguments);
+        this.rect = undefined;
+        this.isEditing = false;
+    }
+    get defaultRect() {
+        return { x: 0, y: 0, width: 0, height: 0 };
+    }
     setup() {
-        this.gridComposerRef = owl.useRef("gridComposer");
-        this.composerState = owl.useState({
-            rect: undefined,
-            delimitation: undefined,
-        });
-        const { sheetId, col, row } = this.env.model.getters.getActivePosition();
-        this.zone = this.env.model.getters.expandZone(sheetId, positionToZone({ col, row }));
-        this.rect = this.env.model.getters.getVisibleRect(this.zone);
-        owl.onMounted(() => {
-            const el = this.gridComposerRef.el;
-            //TODO Should be more correct to have a props that give the parent's clientHeight and clientWidth
-            const maxHeight = el.parentElement.clientHeight - this.rect.y - SCROLLBAR_HIGHT;
-            el.style.maxHeight = (maxHeight + "px");
-            const maxWidth = el.parentElement.clientWidth - this.rect.x - SCROLLBAR_WIDTH;
-            el.style.maxWidth = (maxWidth + "px");
-            this.composerState.rect = {
-                x: this.rect.x,
-                y: this.rect.y,
-                width: el.clientWidth,
-                height: el.clientHeight,
-            };
-            this.composerState.delimitation = {
-                width: el.parentElement.clientWidth,
-                height: el.parentElement.clientHeight,
-            };
+        owl.onWillUpdateProps(() => {
+            const isEditing = this.env.model.getters.getEditionMode() !== "inactive";
+            if (this.isEditing !== isEditing) {
+                this.isEditing = isEditing;
+                if (!isEditing) {
+                    this.rect = undefined;
+                    this.env.focusableElement.focus();
+                    return;
+                }
+                const position = this.env.model.getters.getActivePosition();
+                const zone = this.env.model.getters.expandZone(position.sheetId, positionToZone(position));
+                this.rect = this.env.model.getters.getVisibleRect(zone);
+            }
         });
     }
+    get composerProps() {
+        const { width, height } = this.env.model.getters.getSheetViewDimensionWithHeaders();
+        return {
+            rect: this.rect && { ...this.rect },
+            delimitation: {
+                width,
+                height,
+            },
+            inputStyle: this.composerStyle,
+            focus: this.props.focus,
+            isDefaultFocus: true,
+            onComposerContentFocused: this.props.onComposerContentFocused,
+            onComposerCellFocused: this.props.onComposerCellFocused,
+        };
+    }
     get containerStyle() {
+        if (this.env.model.getters.getEditionMode() === "inactive" || !this.rect) {
+            return `
+        position: absolute;
+        z-index: -1000;
+      `;
+        }
         const isFormula = this.env.model.getters.getCurrentContent().startsWith("=");
         const cell = this.env.model.getters.getActiveCell();
         const position = this.env.model.getters.getActivePosition();
@@ -17895,12 +17956,18 @@ class GridComposer extends owl.Component {
         if (!isFormula) {
             textAlign = style.align || cell.defaultAlign;
         }
+        const sheetDimensions = this.env.model.getters.getSheetViewDimensionWithHeaders();
+        const maxWidth = sheetDimensions.width - this.rect.x;
+        const maxHeight = sheetDimensions.height - this.rect.y;
         return `
       left: ${left - 1}px;
       top: ${top}px;
       min-width: ${width + 2}px;
       min-height: ${height + 1}px;
 
+      max-width: ${maxWidth}px;
+      max-height: ${maxHeight}px;
+
       background: ${background};
       color: ${color};
 
@@ -17924,8 +17991,8 @@ GridComposer.template = "o-spreadsheet-GridComposer";
 GridComposer.components = { Composer };
 GridComposer.props = {
     focus: { validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value) },
-    onComposerUnmounted: Function,
     onComposerContentFocused: Function,
+    onComposerCellFocused: Function,
 };
 
 const CSS$2 = css /* scss */ `
@@ -19383,7 +19450,7 @@ function interactiveFreezeColumnsRows(env, dimension, base) {
     const sheetId = env.model.getters.getActiveSheetId();
     const cmd = dimension === "COL" ? "FREEZE_COLUMNS" : "FREEZE_ROWS";
     const result = env.model.dispatch(cmd, { sheetId, quantity: base });
-    if (result.isCancelledBecause(65 /* CommandResult.MergeOverlap */)) {
+    if (result.isCancelledBecause(66 /* CommandResult.MergeOverlap */)) {
         env.raiseError(MergeErrorMessage);
     }
 }
@@ -20098,11 +20165,11 @@ class LineBarPieConfigPanel extends owl.Component {
     }
     get isDatasetInvalid() {
         var _a;
-        return !!((_a = this.state.datasetDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(32 /* CommandResult.InvalidDataSet */));
+        return !!((_a = this.state.datasetDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(33 /* CommandResult.InvalidDataSet */));
     }
     get isLabelInvalid() {
         var _a;
-        return !!((_a = this.state.labelsDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(33 /* CommandResult.InvalidLabelRange */));
+        return !!((_a = this.state.labelsDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(34 /* CommandResult.InvalidLabelRange */));
     }
     onUpdateDataSetsHaveTitle(ev) {
         this.props.updateChart(this.props.figureId, {
@@ -20475,7 +20542,7 @@ class GaugeChartConfigPanel extends owl.Component {
     }
     get isDataRangeInvalid() {
         var _a;
-        return !!((_a = this.state.dataRangeDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(36 /* CommandResult.InvalidGaugeDataRange */));
+        return !!((_a = this.state.dataRangeDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(37 /* CommandResult.InvalidGaugeDataRange */));
     }
     onDataRangeChanged(ranges) {
         this.dataRange = ranges[0];
@@ -20567,28 +20634,28 @@ class GaugeChartDesignPanel extends owl.Component {
     }
     isRangeMinInvalid() {
         var _a, _b, _c;
-        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(37 /* CommandResult.EmptyGaugeRangeMin */)) ||
-            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(38 /* CommandResult.GaugeRangeMinNaN */)) ||
-            ((_c = this.state.sectionRuleDispatchResult) === null || _c === void 0 ? void 0 : _c.isCancelledBecause(41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */)));
+        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(38 /* CommandResult.EmptyGaugeRangeMin */)) ||
+            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(39 /* CommandResult.GaugeRangeMinNaN */)) ||
+            ((_c = this.state.sectionRuleDispatchResult) === null || _c === void 0 ? void 0 : _c.isCancelledBecause(42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */)));
     }
     isRangeMaxInvalid() {
         var _a, _b, _c;
-        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(39 /* CommandResult.EmptyGaugeRangeMax */)) ||
-            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(40 /* CommandResult.GaugeRangeMaxNaN */)) ||
-            ((_c = this.state.sectionRuleDispatchResult) === null || _c === void 0 ? void 0 : _c.isCancelledBecause(41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */)));
+        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(40 /* CommandResult.EmptyGaugeRangeMax */)) ||
+            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(41 /* CommandResult.GaugeRangeMaxNaN */)) ||
+            ((_c = this.state.sectionRuleDispatchResult) === null || _c === void 0 ? void 0 : _c.isCancelledBecause(42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */)));
     }
     // ---------------------------------------------------------------------------
     // COLOR_SECTION_TEMPLATE
     // ---------------------------------------------------------------------------
     get isLowerInflectionPointInvalid() {
         var _a, _b;
-        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(42 /* CommandResult.GaugeLowerInflectionPointNaN */)) ||
-            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(44 /* CommandResult.GaugeLowerBiggerThanUpper */)));
+        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(43 /* CommandResult.GaugeLowerInflectionPointNaN */)) ||
+            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(45 /* CommandResult.GaugeLowerBiggerThanUpper */)));
     }
     get isUpperInflectionPointInvalid() {
         var _a, _b;
-        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(43 /* CommandResult.GaugeUpperInflectionPointNaN */)) ||
-            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(44 /* CommandResult.GaugeLowerBiggerThanUpper */)));
+        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(44 /* CommandResult.GaugeUpperInflectionPointNaN */)) ||
+            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(45 /* CommandResult.GaugeLowerBiggerThanUpper */)));
     }
     updateInflectionPointValue(attr, ev) {
         const sectionRule = deepCopy(this.props.definition.sectionRule);
@@ -20701,11 +20768,11 @@ class ScorecardChartConfigPanel extends owl.Component {
     }
     get isKeyValueInvalid() {
         var _a;
-        return !!((_a = this.state.keyValueDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(34 /* CommandResult.InvalidScorecardKeyValue */));
+        return !!((_a = this.state.keyValueDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(35 /* CommandResult.InvalidScorecardKeyValue */));
     }
     get isBaselineInvalid() {
         var _a;
-        return !!((_a = this.state.keyValueDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(35 /* CommandResult.InvalidScorecardBaseline */));
+        return !!((_a = this.state.keyValueDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(36 /* CommandResult.InvalidScorecardBaseline */));
     }
     onKeyValueRangeChanged(ranges) {
         this.keyValue = ranges[0];
@@ -21561,11 +21628,11 @@ class ConditionalFormattingPanel extends owl.Component {
      ****************************************************************************/
     get isValue1Invalid() {
         var _a;
-        return !!((_a = this.state.errors) === null || _a === void 0 ? void 0 : _a.includes(51 /* CommandResult.FirstArgMissing */));
+        return !!((_a = this.state.errors) === null || _a === void 0 ? void 0 : _a.includes(52 /* CommandResult.FirstArgMissing */));
     }
     get isValue2Invalid() {
         var _a;
-        return !!((_a = this.state.errors) === null || _a === void 0 ? void 0 : _a.includes(52 /* CommandResult.SecondArgMissing */));
+        return !!((_a = this.state.errors) === null || _a === void 0 ? void 0 : _a.includes(53 /* CommandResult.SecondArgMissing */));
     }
     toggleStyle(tool) {
         const style = this.state.rules.cellIs.style;
@@ -21582,17 +21649,17 @@ class ConditionalFormattingPanel extends owl.Component {
     isValueInvalid(threshold) {
         switch (threshold) {
             case "minimum":
-                return (this.state.errors.includes(58 /* CommandResult.MinInvalidFormula */) ||
-                    this.state.errors.includes(50 /* CommandResult.MinBiggerThanMid */) ||
-                    this.state.errors.includes(47 /* CommandResult.MinBiggerThanMax */) ||
-                    this.state.errors.includes(53 /* CommandResult.MinNaN */));
+                return (this.state.errors.includes(59 /* CommandResult.MinInvalidFormula */) ||
+                    this.state.errors.includes(51 /* CommandResult.MinBiggerThanMid */) ||
+                    this.state.errors.includes(48 /* CommandResult.MinBiggerThanMax */) ||
+                    this.state.errors.includes(54 /* CommandResult.MinNaN */));
             case "midpoint":
-                return (this.state.errors.includes(59 /* CommandResult.MidInvalidFormula */) ||
-                    this.state.errors.includes(54 /* CommandResult.MidNaN */) ||
-                    this.state.errors.includes(49 /* CommandResult.MidBiggerThanMax */));
+                return (this.state.errors.includes(60 /* CommandResult.MidInvalidFormula */) ||
+                    this.state.errors.includes(55 /* CommandResult.MidNaN */) ||
+                    this.state.errors.includes(50 /* CommandResult.MidBiggerThanMax */));
             case "maximum":
-                return (this.state.errors.includes(60 /* CommandResult.MaxInvalidFormula */) ||
-                    this.state.errors.includes(55 /* CommandResult.MaxNaN */));
+                return (this.state.errors.includes(61 /* CommandResult.MaxInvalidFormula */) ||
+                    this.state.errors.includes(56 /* CommandResult.MaxNaN */));
             default:
                 return false;
         }
@@ -21641,13 +21708,13 @@ class ConditionalFormattingPanel extends owl.Component {
     isInflectionPointInvalid(inflectionPoint) {
         switch (inflectionPoint) {
             case "lowerInflectionPoint":
-                return (this.state.errors.includes(57 /* CommandResult.ValueLowerInflectionNaN */) ||
-                    this.state.errors.includes(62 /* CommandResult.ValueLowerInvalidFormula */) ||
-                    this.state.errors.includes(48 /* CommandResult.LowerBiggerThanUpper */));
+                return (this.state.errors.includes(58 /* CommandResult.ValueLowerInflectionNaN */) ||
+                    this.state.errors.includes(63 /* CommandResult.ValueLowerInvalidFormula */) ||
+                    this.state.errors.includes(49 /* CommandResult.LowerBiggerThanUpper */));
             case "upperInflectionPoint":
-                return (this.state.errors.includes(56 /* CommandResult.ValueUpperInflectionNaN */) ||
-                    this.state.errors.includes(61 /* CommandResult.ValueUpperInvalidFormula */) ||
-                    this.state.errors.includes(48 /* CommandResult.LowerBiggerThanUpper */));
+                return (this.state.errors.includes(57 /* CommandResult.ValueUpperInflectionNaN */) ||
+                    this.state.errors.includes(62 /* CommandResult.ValueUpperInvalidFormula */) ||
+                    this.state.errors.includes(49 /* CommandResult.LowerBiggerThanUpper */));
             default:
                 return true;
         }
@@ -22687,7 +22754,6 @@ class GridOverlay extends owl.Component {
         this.props.onCellDoubleClicked(col, row);
     }
     onContextMenu(ev) {
-        ev.preventDefault();
         const [col, row] = this.getCartesianCoordinates(ev);
         this.props.onCellRightClicked(col, row, { x: ev.clientX, y: ev.clientY });
     }
@@ -23621,8 +23687,8 @@ css /* scss */ `
     &.corner {
       right: 0px;
       bottom: 0px;
-      height: ${SCROLLBAR_WIDTH$1}px;
-      width: ${SCROLLBAR_WIDTH$1}px;
+      height: ${SCROLLBAR_WIDTH}px;
+      width: ${SCROLLBAR_WIDTH}px;
       border-top: 1px solid #e2e3e3;
       border-left: 1px solid #e2e3e3;
     }
@@ -23695,7 +23761,7 @@ class HorizontalScrollBar extends owl.Component {
         return {
             left: `${this.props.leftOffset + x}px`,
             bottom: "0px",
-            height: `${SCROLLBAR_WIDTH$1}px`,
+            height: `${SCROLLBAR_WIDTH}px`,
             right: `0px`,
         };
     }
@@ -23740,7 +23806,7 @@ class VerticalScrollBar extends owl.Component {
         return {
             top: `${this.props.topOffset + y}px`,
             right: "0px",
-            width: `${SCROLLBAR_WIDTH$1}px`,
+            width: `${SCROLLBAR_WIDTH}px`,
             bottom: `0px`,
         };
     }
@@ -23914,17 +23980,16 @@ class Grid extends owl.Component {
             menuItems: [],
         });
         this.gridRef = owl.useRef("grid");
-        this.hiddenInput = owl.useRef("hiddenInput");
         this.canvasPosition = useAbsoluteBoundingRect(this.gridRef);
         this.hoveredCell = owl.useState({ col: undefined, row: undefined });
         owl.useChildSubEnv({ getPopoverContainerRect: () => this.getGridRect() });
         owl.useExternalListener(document.body, "cut", this.copy.bind(this, true));
         owl.useExternalListener(document.body, "copy", this.copy.bind(this, false));
         owl.useExternalListener(document.body, "paste", this.paste);
-        owl.onMounted(() => this.focus());
-        this.props.exposeFocus(() => this.focus());
+        owl.onMounted(() => this.focusDefaultElement());
+        this.props.exposeFocus(() => this.focusDefaultElement());
         useGridDrawing("canvas", this.env.model, () => this.env.model.getters.getSheetViewDimensionWithHeaders());
-        owl.useEffect(() => this.focus(), () => [this.env.model.getters.getActiveSheetId()]);
+        owl.useEffect(() => this.focusDefaultElement(), () => [this.env.model.getters.getActiveSheetId()]);
         this.onMouseWheel = useWheelHandler((deltaX, deltaY) => {
             this.moveCanvas(deltaX, deltaY);
             this.hoveredCell.col = undefined;
@@ -23939,21 +24004,20 @@ class Grid extends owl.Component {
         return `
       top: ${HEADER_HEIGHT}px;
       left: ${HEADER_WIDTH}px;
-      height: calc(100% - ${HEADER_HEIGHT + SCROLLBAR_WIDTH$1}px);
-      width: calc(100% - ${HEADER_WIDTH + SCROLLBAR_WIDTH$1}px);
+      height: calc(100% - ${HEADER_HEIGHT + SCROLLBAR_WIDTH}px);
+      width: calc(100% - ${HEADER_WIDTH + SCROLLBAR_WIDTH}px);
     `;
     }
     onClosePopover() {
         if (this.env.model.getters.hasOpenedPopover()) {
             this.closeOpenedPopover();
         }
-        this.focus();
+        this.focusDefaultElement();
     }
-    focus() {
-        var _a;
+    focusDefaultElement() {
         if (!this.env.model.getters.getSelectedFigureId() &&
             this.env.model.getters.getEditionMode() === "inactive") {
-            (_a = this.hiddenInput.el) === null || _a === void 0 ? void 0 : _a.focus();
+            this.env.focusableElement.focus();
         }
     }
     get gridEl() {
@@ -24098,19 +24162,6 @@ class Grid extends owl.Component {
             return;
         }
     }
-    onInput(ev) {
-        // the user meant to paste in the sheet, not open the composer with the pasted content
-        if (!ev.isComposing && ev.inputType === "insertFromPaste") {
-            return;
-        }
-        if (ev.data) {
-            // if the user types a character on the grid, it means he wants to start composing the selected cell with that
-            // character
-            ev.preventDefault();
-            ev.stopPropagation();
-            this.props.onGridComposerCellFocused(ev.data);
-        }
-    }
     // ---------------------------------------------------------------------------
     // Context Menu
     // ---------------------------------------------------------------------------
@@ -24207,7 +24258,7 @@ class Grid extends owl.Component {
     }
     closeMenu() {
         this.menuState.isOpen = false;
-        this.focus();
+        this.focusDefaultElement();
     }
 }
 Grid.template = "o-spreadsheet-Grid";
@@ -27520,7 +27571,7 @@ function normalizeV9(formula) {
  * a breaking change is made in the way the state is handled, and an upgrade
  * function should be defined
  */
-const CURRENT_VERSION = 12;
+const CURRENT_VERSION = 12.5;
 const INITIAL_SHEET_ID = "Sheet1";
 /**
  * This function tries to load anything that could look like a valid
@@ -27786,6 +27837,31 @@ const MIGRATIONS = [
             return data;
         },
     },
+    {
+        description: "Fix datafilter duplication",
+        from: 12,
+        to: 12.5,
+        applyMigration(data) {
+            for (let sheet of data.sheets || []) {
+                let knownDataFilterZones = [];
+                for (let filterTable of sheet.filterTables || []) {
+                    const zone = toZone(filterTable.range);
+                    // See commit message for the details
+                    const intersectZoneIndex = knownDataFilterZones.findIndex((knownZone) => overlap(knownZone, zone));
+                    if (intersectZoneIndex !== -1) {
+                        knownDataFilterZones[intersectZoneIndex] = zone;
+                    }
+                    else {
+                        knownDataFilterZones.push(zone);
+                    }
+                }
+                sheet.filterTables = knownDataFilterZones.map((zone) => ({
+                    range: zoneToXc(zone),
+                }));
+            }
+            return data;
+        },
+    },
 ];
 /**
  * This function is used to repair faulty data independently of the migration.
@@ -28443,7 +28519,7 @@ class BordersPlugin extends CorePlugin {
         const currentBorder = this.getCellBorder(cmd);
         const areAllNewBordersUndefined = !((_a = cmd.border) === null || _a === void 0 ? void 0 : _a.bottom) && !((_b = cmd.border) === null || _b === void 0 ? void 0 : _b.left) && !((_c = cmd.border) === null || _c === void 0 ? void 0 : _c.right) && !((_d = cmd.border) === null || _d === void 0 ? void 0 : _d.top);
         if ((!currentBorder && areAllNewBordersUndefined) || deepEquals(currentBorder, cmd.border)) {
-            return 88 /* CommandResult.NoChanges */;
+            return 89 /* CommandResult.NoChanges */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -28550,9 +28626,9 @@ class CellPlugin extends CorePlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "UPDATE_CELL":
-                return this.checkCellOutOfSheet(cmd);
+                return this.checkValidations(cmd, this.checkCellOutOfSheet, this.checkUselessUpdateCell);
             case "CLEAR_CELL":
-                return this.checkValidations(cmd, this.chainValidations(this.checkCellOutOfSheet, this.checkUselessClearCell));
+                return this.checkValidations(cmd, this.checkCellOutOfSheet, this.checkUselessClearCell);
             default:
                 return 0 /* CommandResult.Success */;
         }
@@ -28718,13 +28794,13 @@ class CellPlugin extends CorePlugin {
     /*
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
-    buildFormulaContent(sheetId, cell, dependencies) {
+    buildFormulaContent(sheetId, cell, dependencies, useFixedZone = false) {
         const ranges = dependencies || cell.dependencies;
         let rangeIndex = 0;
         return concat(cell.compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
                 const range = ranges[rangeIndex++];
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, useFixedZone);
             }
             return token.value;
         }));
@@ -28965,9 +29041,21 @@ class CellPlugin extends CorePlugin {
     checkUselessClearCell(cmd) {
         const cell = this.getters.getCell(cmd);
         if (!cell)
-            return 88 /* CommandResult.NoChanges */;
+            return 89 /* CommandResult.NoChanges */;
         if (!cell.content && !cell.style && !cell.format) {
-            return 88 /* CommandResult.NoChanges */;
+            return 89 /* CommandResult.NoChanges */;
+        }
+        return 0 /* CommandResult.Success */;
+    }
+    checkUselessUpdateCell(cmd) {
+        const cell = this.getters.getCell(cmd);
+        const hasContent = "content" in cmd || "formula" in cmd;
+        const hasStyle = "style" in cmd;
+        const hasFormat = "format" in cmd;
+        if ((!hasContent || (cell === null || cell === void 0 ? void 0 : cell.content) === cmd.content) &&
+            (!hasStyle || deepEquals(cell === null || cell === void 0 ? void 0 : cell.style, cmd.style)) &&
+            (!hasFormat || (cell === null || cell === void 0 ? void 0 : cell.format) === cmd.format)) {
+            return 89 /* CommandResult.NoChanges */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29176,13 +29264,13 @@ class ChartPlugin extends CorePlugin {
     }
     checkChartDuplicate(cmd) {
         return this.getters.getFigureSheetId(cmd.id)
-            ? 84 /* CommandResult.DuplicatedChartId */
+            ? 85 /* CommandResult.DuplicatedChartId */
             : 0 /* CommandResult.Success */;
     }
     checkChartExists(cmd) {
         return this.getters.getFigureSheetId(cmd.id)
             ? 0 /* CommandResult.Success */
-            : 85 /* CommandResult.ChartDoesNotExist */;
+            : 86 /* CommandResult.ChartDoesNotExist */;
     }
 }
 ChartPlugin.getters = [
@@ -29297,7 +29385,13 @@ class ConditionalFormatPlugin extends CorePlugin {
         }
     }
     exportForExcel(data) {
-        this.export(data);
+        if (data.sheets) {
+            for (let sheet of data.sheets) {
+                if (this.cfRules[sheet.id]) {
+                    sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                }
+            }
+        }
     }
     // ---------------------------------------------------------------------------
     // Getters
@@ -29347,11 +29441,11 @@ class ConditionalFormatPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
-    mapToConditionalFormat(sheetId, cf) {
+    mapToConditionalFormat(sheetId, cf, options = { useFixedReference: false }) {
         return {
             ...cf,
             ranges: cf.ranges.map((range) => {
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, options.useFixedReference);
             }),
         };
     }
@@ -29384,10 +29478,10 @@ class ConditionalFormatPlugin extends CorePlugin {
             return 27 /* CommandResult.InvalidSheetId */;
         const ruleIndex = this.cfRules[sheetId].findIndex((cf) => cf.id === cfId);
         if (ruleIndex === -1)
-            return 71 /* CommandResult.InvalidConditionalFormatId */;
+            return 72 /* CommandResult.InvalidConditionalFormatId */;
         const cfIndex2 = direction === "up" ? ruleIndex - 1 : ruleIndex + 1;
         if (cfIndex2 < 0 || cfIndex2 >= this.cfRules[sheetId].length) {
-            return 71 /* CommandResult.InvalidConditionalFormatId */;
+            return 72 /* CommandResult.InvalidConditionalFormatId */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29428,10 +29522,10 @@ class ConditionalFormatPlugin extends CorePlugin {
                 const errors = [];
                 const isEmpty = (value) => value === undefined || value === "";
                 if (expectedNumber >= 1 && isEmpty(rule.values[0])) {
-                    errors.push(51 /* CommandResult.FirstArgMissing */);
+                    errors.push(52 /* CommandResult.FirstArgMissing */);
                 }
                 if (expectedNumber >= 2 && isEmpty(rule.values[1])) {
-                    errors.push(52 /* CommandResult.SecondArgMissing */);
+                    errors.push(53 /* CommandResult.SecondArgMissing */);
                 }
                 return errors.length ? errors : 0 /* CommandResult.Success */;
             }
@@ -29443,15 +29537,15 @@ class ConditionalFormatPlugin extends CorePlugin {
             (threshold.value === "" || isNaN(threshold.value))) {
             switch (thresholdName) {
                 case "min":
-                    return 53 /* CommandResult.MinNaN */;
+                    return 54 /* CommandResult.MinNaN */;
                 case "max":
-                    return 55 /* CommandResult.MaxNaN */;
+                    return 56 /* CommandResult.MaxNaN */;
                 case "mid":
-                    return 54 /* CommandResult.MidNaN */;
+                    return 55 /* CommandResult.MidNaN */;
                 case "upperInflectionPoint":
-                    return 56 /* CommandResult.ValueUpperInflectionNaN */;
+                    return 57 /* CommandResult.ValueUpperInflectionNaN */;
                 case "lowerInflectionPoint":
-                    return 57 /* CommandResult.ValueLowerInflectionNaN */;
+                    return 58 /* CommandResult.ValueLowerInflectionNaN */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -29465,15 +29559,15 @@ class ConditionalFormatPlugin extends CorePlugin {
         catch (error) {
             switch (thresholdName) {
                 case "min":
-                    return 58 /* CommandResult.MinInvalidFormula */;
+                    return 59 /* CommandResult.MinInvalidFormula */;
                 case "max":
-                    return 60 /* CommandResult.MaxInvalidFormula */;
+                    return 61 /* CommandResult.MaxInvalidFormula */;
                 case "mid":
-                    return 59 /* CommandResult.MidInvalidFormula */;
+                    return 60 /* CommandResult.MidInvalidFormula */;
                 case "upperInflectionPoint":
-                    return 61 /* CommandResult.ValueUpperInvalidFormula */;
+                    return 62 /* CommandResult.ValueUpperInvalidFormula */;
                 case "lowerInflectionPoint":
-                    return 62 /* CommandResult.ValueLowerInvalidFormula */;
+                    return 63 /* CommandResult.ValueLowerInvalidFormula */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -29490,7 +29584,7 @@ class ConditionalFormatPlugin extends CorePlugin {
         if (["number", "percentage", "percentile"].includes(rule.lowerInflectionPoint.type) &&
             rule.lowerInflectionPoint.type === rule.upperInflectionPoint.type &&
             Number(minValue) > Number(maxValue)) {
-            return 48 /* CommandResult.LowerBiggerThanUpper */;
+            return 49 /* CommandResult.LowerBiggerThanUpper */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29500,7 +29594,7 @@ class ConditionalFormatPlugin extends CorePlugin {
         if (["number", "percentage", "percentile"].includes(rule.minimum.type) &&
             rule.minimum.type === rule.maximum.type &&
             stringToNumber(minValue) >= stringToNumber(maxValue)) {
-            return 47 /* CommandResult.MinBiggerThanMax */;
+            return 48 /* CommandResult.MinBiggerThanMax */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29512,7 +29606,7 @@ class ConditionalFormatPlugin extends CorePlugin {
             ["number", "percentage", "percentile"].includes(rule.midpoint.type) &&
             rule.midpoint.type === rule.maximum.type &&
             stringToNumber(midValue) >= stringToNumber(maxValue)) {
-            return 49 /* CommandResult.MidBiggerThanMax */;
+            return 50 /* CommandResult.MidBiggerThanMax */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29524,7 +29618,7 @@ class ConditionalFormatPlugin extends CorePlugin {
             ["number", "percentage", "percentile"].includes(rule.midpoint.type) &&
             rule.minimum.type === rule.midpoint.type &&
             stringToNumber(minValue) >= stringToNumber(midValue)) {
-            return 50 /* CommandResult.MinBiggerThanMid */;
+            return 51 /* CommandResult.MinBiggerThanMid */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29625,13 +29719,13 @@ class FigurePlugin extends CorePlugin {
     checkFigureExists(sheetId, figureId) {
         var _a;
         if (((_a = this.figures[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) === undefined) {
-            return 70 /* CommandResult.FigureDoesNotExist */;
+            return 71 /* CommandResult.FigureDoesNotExist */;
         }
         return 0 /* CommandResult.Success */;
     }
     checkFigureDuplicate(figureId) {
         if (Object.values(this.figures).find((sheet) => sheet === null || sheet === void 0 ? void 0 : sheet[figureId])) {
-            return 82 /* CommandResult.DuplicatedFigureId */;
+            return 83 /* CommandResult.DuplicatedFigureId */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29733,12 +29827,12 @@ class FiltersPlugin extends CorePlugin {
         switch (cmd.type) {
             case "CREATE_FILTER_TABLE":
                 if (!areZonesContinuous(...cmd.target)) {
-                    return 81 /* CommandResult.NonContinuousTargets */;
+                    return 82 /* CommandResult.NonContinuousTargets */;
                 }
                 const zone = union(...cmd.target);
                 const checkFilterOverlap = () => {
                     if (this.getFilterTables(cmd.sheetId).some((filter) => overlap(filter.zone, zone))) {
-                        return 78 /* CommandResult.FilterOverlap */;
+                        return 79 /* CommandResult.FilterOverlap */;
                     }
                     return 0 /* CommandResult.Success */;
                 };
@@ -29746,7 +29840,7 @@ class FiltersPlugin extends CorePlugin {
                     const mergesInTarget = this.getters.getMergesInZone(cmd.sheetId, zone);
                     for (let merge of mergesInTarget) {
                         if (overlap(zone, merge)) {
-                            return 80 /* CommandResult.MergeInFilter */;
+                            return 81 /* CommandResult.MergeInFilter */;
                         }
                     }
                     return 0 /* CommandResult.Success */;
@@ -29756,7 +29850,7 @@ class FiltersPlugin extends CorePlugin {
                 for (let merge of cmd.target) {
                     for (let filterTable of this.getFilterTables(cmd.sheetId)) {
                         if (overlap(filterTable.zone, merge)) {
-                            return 80 /* CommandResult.MergeInFilter */;
+                            return 81 /* CommandResult.MergeInFilter */;
                         }
                     }
                 }
@@ -30256,10 +30350,10 @@ class HeaderVisibilityPlugin extends CorePlugin {
                     : this.getters.getNumberRows(cmd.sheetId);
                 const hiddenElements = new Set((hiddenGroup || []).flat().concat(cmd.elements));
                 if (hiddenElements.size >= elements) {
-                    return 66 /* CommandResult.TooManyHiddenElements */;
+                    return 67 /* CommandResult.TooManyHiddenElements */;
                 }
                 else if (Math.min(...cmd.elements) < 0 || Math.max(...cmd.elements) > elements) {
-                    return 86 /* CommandResult.InvalidHeaderIndex */;
+                    return 87 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else {
                     return 0 /* CommandResult.Success */;
@@ -30785,7 +30879,7 @@ class MergePlugin extends CorePlugin {
         for (const zone of target) {
             for (const zone2 of target) {
                 if (zone !== zone2 && overlap(zone, zone2)) {
-                    return 65 /* CommandResult.MergeOverlap */;
+                    return 66 /* CommandResult.MergeOverlap */;
                 }
             }
         }
@@ -30799,7 +30893,7 @@ class MergePlugin extends CorePlugin {
         for (const zone of target) {
             if ((zone.left < xSplit && zone.right >= xSplit) ||
                 (zone.top < ySplit && zone.bottom >= ySplit)) {
-                return 75 /* CommandResult.FrozenPaneOverlap */;
+                return 76 /* CommandResult.FrozenPaneOverlap */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -31262,8 +31356,9 @@ class RangeAdapter {
      *
      * @param range the range (received from getRangeFromXC or getRangeFromZone)
      * @param forSheetId the id of the sheet where the range string is supposed to be used.
+     * @param [useFixedZone=false] if true, the range will be returned with fixed row and column
      */
-    getRangeString(range, forSheetId) {
+    getRangeString(range, forSheetId, useFixedZone = false) {
         if (!range) {
             return INCORRECT_RANGE_STRING;
         }
@@ -31290,7 +31385,7 @@ class RangeAdapter {
         if (prefixSheet && !sheetName) {
             return INCORRECT_RANGE_STRING;
         }
-        let rangeString = this.getRangePartString(rangeImpl, 0);
+        let rangeString = this.getRangePartString(rangeImpl, 0, useFixedZone);
         if (rangeImpl.parts && rangeImpl.parts.length === 2) {
             // this if converts A2:A2 into A2 except if any part of the original range had fixed row or column (with $)
             if (rangeImpl.zone.top !== rangeImpl.zone.bottom ||
@@ -31300,7 +31395,7 @@ class RangeAdapter {
                 rangeImpl.parts[1].rowFixed ||
                 rangeImpl.parts[1].colFixed) {
                 rangeString += ":";
-                rangeString += this.getRangePartString(rangeImpl, 1);
+                rangeString += this.getRangePartString(rangeImpl, 1, useFixedZone);
             }
         }
         return `${prefixSheet ? sheetName + "!" : ""}${rangeString}`;
@@ -31330,13 +31425,14 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part) {
-        const colFixed = range.parts && range.parts[part].colFixed ? "$" : "";
+    getRangePartString(range, part, useFixedZone = false) {
+        var _a, _b;
+        const colFixed = range.parts && ((_a = range.parts[part]) === null || _a === void 0 ? void 0 : _a.colFixed) ? "$" : "";
         const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
-        const rowFixed = range.parts && range.parts[part].rowFixed ? "$" : "";
+        const rowFixed = range.parts && ((_b = range.parts[part]) === null || _b === void 0 ? void 0 : _b.rowFixed) ? "$" : "";
         const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
         let str = "";
-        if (range.isFullCol) {
+        if (range.isFullCol && !useFixedZone) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -31344,7 +31440,7 @@ class RangeAdapter {
                 str = colFixed + col;
             }
         }
-        else if (range.isFullRow) {
+        else if (range.isFullRow && !useFixedZone) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -31432,10 +31528,10 @@ class SheetPlugin extends CorePlugin {
                     ? this.getNumberCols(cmd.sheetId)
                     : this.getNumberRows(cmd.sheetId);
                 if (cmd.base < 0 || cmd.base >= elements) {
-                    return 86 /* CommandResult.InvalidHeaderIndex */;
+                    return 87 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else if (cmd.quantity <= 0) {
-                    return 87 /* CommandResult.InvalidQuantity */;
+                    return 88 /* CommandResult.InvalidQuantity */;
                 }
                 return 0 /* CommandResult.Success */;
             case "REMOVE_COLUMNS_ROWS": {
@@ -31443,7 +31539,7 @@ class SheetPlugin extends CorePlugin {
                     ? this.getNumberCols(cmd.sheetId)
                     : this.getNumberRows(cmd.sheetId);
                 if (Math.min(...cmd.elements) < 0 || Math.max(...cmd.elements) > elements) {
-                    return 86 /* CommandResult.InvalidHeaderIndex */;
+                    return 87 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else if (this.checkElementsIncludeAllNonFrozenHeaders(cmd.sheetId, cmd.dimension, cmd.elements)) {
                     return 8 /* CommandResult.NotEnoughElements */;
@@ -31887,18 +31983,18 @@ class SheetPlugin extends CorePlugin {
     checkRowFreezeQuantity(cmd) {
         return cmd.quantity >= 1 && cmd.quantity < this.getNumberRows(cmd.sheetId)
             ? 0 /* CommandResult.Success */
-            : 74 /* CommandResult.InvalidFreezeQuantity */;
+            : 75 /* CommandResult.InvalidFreezeQuantity */;
     }
     checkColFreezeQuantity(cmd) {
         return cmd.quantity >= 1 && cmd.quantity < this.getNumberCols(cmd.sheetId)
             ? 0 /* CommandResult.Success */
-            : 74 /* CommandResult.InvalidFreezeQuantity */;
+            : 75 /* CommandResult.InvalidFreezeQuantity */;
     }
     checkRowFreezeOverlapMerge(cmd) {
         const merges = this.getters.getMerges(cmd.sheetId);
         for (let merge of merges) {
             if (merge.top < cmd.quantity && cmd.quantity <= merge.bottom) {
-                return 65 /* CommandResult.MergeOverlap */;
+                return 66 /* CommandResult.MergeOverlap */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -31907,7 +32003,7 @@ class SheetPlugin extends CorePlugin {
         const merges = this.getters.getMerges(cmd.sheetId);
         for (let merge of merges) {
             if (merge.left < cmd.quantity && cmd.quantity <= merge.right) {
-                return 65 /* CommandResult.MergeOverlap */;
+                return 66 /* CommandResult.MergeOverlap */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -32644,10 +32740,8 @@ class EvaluationPlugin extends UIPlugin {
          * that are actually present in the grid.
          */
         function range(range) {
+            assertRangeValid(range);
             const sheetId = range.sheetId;
-            if (!isZoneValid(range.zone)) {
-                throw new InvalidReferenceError();
-            }
             // Performance issue: Avoid fetching data on positions that are out of the spreadsheet
             // e.g. A1:ZZZ9999 in a sheet with 10 cols and 10 rows should ignore everything past J10 and return a 10x10 array
             const sheetZone = getters.getSheetZone(sheetId);
@@ -32682,23 +32776,26 @@ class EvaluationPlugin extends UIPlugin {
          *        The `compute` of the formula's function must process it completely
          */
         function refFn(range, isMeta, functionName, paramNumber) {
+            assertRangeValid(range);
             if (isMeta) {
                 // Use zoneToXc of zone instead of getRangeString to avoid sending unbounded ranges
                 return { value: zoneToXc(range.zone) };
             }
-            if (!isZoneValid(range.zone)) {
-                throw new InvalidReferenceError();
-            }
             // if the formula definition could have accepted a range, we would pass through the _range function and not here
             if (range.zone.bottom !== range.zone.top || range.zone.left !== range.zone.right) {
                 throw new Error(paramNumber
                     ? _lt("Function %s expects the parameter %s to be a single value or a single cell reference, not a range.", functionName.toString(), paramNumber.toString())
                     : _lt("Function %s expects its parameters to be single values or single cell references, not ranges.", functionName.toString()));
             }
+            return readCell(range);
+        }
+        function assertRangeValid(range) {
+            if (!isZoneValid(range.zone)) {
+                throw new InvalidReferenceError();
+            }
             if (range.invalidSheetName) {
                 throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
             }
-            return readCell(range);
         }
         return [refFn, range, evalContext];
     }
@@ -32718,6 +32815,10 @@ class EvaluationPlugin extends UIPlugin {
                     if (cell.format !== evaluatedCell.format) {
                         exportedCellData.computedFormat = evaluatedCell.format;
                     }
+                    // if there is a formula but no dependencies (maybe because the cell is in error), no need to recompute the formula text
+                    if (cell.isFormula && cell.dependencies.length) {
+                        exportedCellData.content = this.getters.buildFormulaContent(sheet.id, cell, cell.dependencies, true);
+                    }
                 }
             }
         }
@@ -33197,7 +33298,7 @@ class FilterEvaluationPlugin extends UIPlugin {
         switch (cmd.type) {
             case "UPDATE_FILTER":
                 if (!this.getters.getFilterId(cmd)) {
-                    return 79 /* CommandResult.FilterNotFound */;
+                    return 80 /* CommandResult.FilterNotFound */;
                 }
                 break;
         }
@@ -34143,7 +34244,7 @@ class SheetViewPlugin extends UIPlugin {
     }
     checkPositiveDimension(cmd) {
         if (cmd.width < 0 || cmd.height < 0) {
-            return 68 /* CommandResult.InvalidViewportSize */;
+            return 69 /* CommandResult.InvalidViewportSize */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -34153,7 +34254,7 @@ class SheetViewPlugin extends UIPlugin {
             cmd.gridOffsetY === this.gridOffsetY &&
             cmd.width === width &&
             cmd.height === height) {
-            return 76 /* CommandResult.ValuesNotChanged */;
+            return 77 /* CommandResult.ValuesNotChanged */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -34161,7 +34262,7 @@ class SheetViewPlugin extends UIPlugin {
         const pane = this.getMainInternalViewport(this.getters.getActiveSheetId());
         if ((!pane.canScrollHorizontally && offsetX > 0) ||
             (!pane.canScrollVertically && offsetY > 0)) {
-            return 69 /* CommandResult.InvalidScrollingDirection */;
+            return 70 /* CommandResult.InvalidScrollingDirection */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -34417,7 +34518,7 @@ class AutofillPlugin extends UIPlugin {
                 if (this.lastCellSelected.col !== undefined && this.lastCellSelected.row !== undefined) {
                     return 0 /* CommandResult.Success */;
                 }
-                return 45 /* CommandResult.InvalidAutofillSelection */;
+                return 46 /* CommandResult.InvalidAutofillSelection */;
             case "AUTOFILL_AUTO":
                 const zone = this.getters.getSelectedZone();
                 return zone.top === zone.bottom
@@ -34578,8 +34679,7 @@ class AutofillPlugin extends UIPlugin {
         let row = zone.bottom;
         if (col > 0) {
             let leftPosition = { sheetId, col: col - 1, row };
-            while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
-                ((_a = this.getters.getCell(leftPosition)) === null || _a === void 0 ? void 0 : _a.content)) {
+            while ((_a = this.getters.getCell(leftPosition)) === null || _a === void 0 ? void 0 : _a.content) {
                 row += 1;
                 leftPosition = { sheetId, col: col - 1, row };
             }
@@ -34588,8 +34688,7 @@ class AutofillPlugin extends UIPlugin {
             col = zone.right;
             if (col <= this.getters.getNumberCols(sheetId)) {
                 let rightPosition = { sheetId, col: col + 1, row };
-                while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
-                    ((_b = this.getters.getCell(rightPosition)) === null || _b === void 0 ? void 0 : _b.content)) {
+                while ((_b = this.getters.getCell(rightPosition)) === null || _b === void 0 ? void 0 : _b.content) {
                     row += 1;
                     rightPosition = { sheetId, col: col + 1, row };
                 }
@@ -35019,7 +35118,7 @@ class CellPopoverPlugin extends UIPlugin {
                     cellPopoverRegistry.get(cmd.popoverType);
                 }
                 catch (error) {
-                    return 72 /* CommandResult.InvalidCellPopover */;
+                    return 73 /* CommandResult.InvalidCellPopover */;
                 }
                 return 0 /* CommandResult.Success */;
             default:
@@ -36222,21 +36321,6 @@ class SelectionInputPlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
-    allowDispatch(cmd) {
-        switch (cmd.type) {
-            case "ADD_EMPTY_RANGE":
-                if (this.inputHasSingleRange && this.ranges.length === 1) {
-                    return 30 /* CommandResult.MaximumRangesReached */;
-                }
-                break;
-            case "CHANGE_RANGE":
-                if (this.inputHasSingleRange && cmd.value.split(",").length > 1) {
-                    return 30 /* CommandResult.MaximumRangesReached */;
-                }
-                break;
-        }
-        return 0 /* CommandResult.Success */;
-    }
     handleEvent(event) {
         const xc = zoneToXc(event.anchor.zone);
         const inputSheetId = this.activeSheet;
@@ -36296,9 +36380,6 @@ class SelectionInputPlugin extends UIPlugin {
             }
         }
     }
-    unsubscribe() {
-        this.unfocus();
-    }
     // ---------------------------------------------------------------------------
     // Getters || only callable by the parent
     // ---------------------------------------------------------------------------
@@ -36448,6 +36529,15 @@ class SelectionInputsManagerPlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     allowDispatch(cmd) {
         var _a, _b;
+        switch (cmd.type) {
+            case "FOCUS_RANGE":
+            case "CHANGE_RANGE":
+            case "ADD_EMPTY_RANGE":
+            case "REMOVE_RANGE":
+                if (!this.inputs[cmd.id]) {
+                    return 31 /* CommandResult.InvalidInputId */;
+                }
+        }
         switch (cmd.type) {
             case "FOCUS_RANGE":
                 const index = (_a = this.currentInput) === null || _a === void 0 ? void 0 : _a.getIndex(cmd.rangeId);
@@ -36455,9 +36545,19 @@ class SelectionInputsManagerPlugin extends UIPlugin {
                     return 29 /* CommandResult.InputAlreadyFocused */;
                 }
                 break;
-        }
-        if (this.currentInput) {
-            return this.currentInput.allowDispatch(cmd);
+            case "ADD_EMPTY_RANGE":
+                const input = this.inputs[cmd.id];
+                if (input.inputHasSingleRange && input.ranges.length === 1) {
+                    return 30 /* CommandResult.MaximumRangesReached */;
+                }
+                break;
+            case "CHANGE_RANGE": {
+                const input = this.inputs[cmd.id];
+                if (input.inputHasSingleRange && cmd.value.split(",").length > 1) {
+                    return 30 /* CommandResult.MaximumRangesReached */;
+                }
+                break;
+            }
         }
         return 0 /* CommandResult.Success */;
     }
@@ -36486,9 +36586,9 @@ class SelectionInputsManagerPlugin extends UIPlugin {
                 break;
             case "FOCUS_RANGE":
             case "CHANGE_RANGE":
-                if (cmd.id !== this.focusedInputId) {
-                    const input = this.inputs[cmd.id];
-                    const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                const input = this.inputs[cmd.id];
+                const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                if (range) {
                     const sheetId = this.getters.getActiveSheetId();
                     const zone = this.getters.getRangeFromSheetXC(sheetId, (range === null || range === void 0 ? void 0 : range.xc) || "A1").zone;
                     this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
@@ -36498,9 +36598,6 @@ class SelectionInputsManagerPlugin extends UIPlugin {
         }
         (_a = this.currentInput) === null || _a === void 0 ? void 0 : _a.handle(cmd);
     }
-    unsubscribe() {
-        this.unfocus();
-    }
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
@@ -37440,7 +37537,7 @@ class SortPlugin extends UIPlugin {
         /*Test the presence of single cells*/
         const singleCells = positions(zone).some(({ col, row }) => !this.getters.isInMerge({ sheetId, col, row }));
         if (singleCells) {
-            return 63 /* CommandResult.InvalidSortZone */;
+            return 64 /* CommandResult.InvalidSortZone */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -37459,7 +37556,7 @@ class SortPlugin extends UIPlugin {
             ];
             return widthCurrent === widthFirst && heightCurrent === heightFirst;
         })) {
-            return 63 /* CommandResult.InvalidSortZone */;
+            return 64 /* CommandResult.InvalidSortZone */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -38087,7 +38184,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
         for (const zone of this.getPasteZones(target)) {
             if ((zone.left < xSplit && zone.right >= xSplit) ||
                 (zone.top < ySplit && zone.bottom >= ySplit)) {
-                return 75 /* CommandResult.FrozenPaneOverlap */;
+                return 76 /* CommandResult.FrozenPaneOverlap */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -38475,7 +38572,7 @@ class ClipboardFigureState {
     }
     isPasteAllowed(target, option) {
         if (target.length === 0) {
-            return 73 /* CommandResult.EmptyTarget */;
+            return 74 /* CommandResult.EmptyTarget */;
         }
         if ((option === null || option === void 0 ? void 0 : option.pasteOption) !== undefined) {
             return 22 /* CommandResult.WrongFigurePasteOption */;
@@ -39386,7 +39483,7 @@ class GridSelectionPlugin extends UIPlugin {
         const headers = [cmd.base, ...cmd.elements];
         const maxHeaderValue = isCol ? this.getters.getNumberCols(id) : this.getters.getNumberRows(id);
         if (headers.some((h) => h < 0 || h >= maxHeaderValue)) {
-            return 86 /* CommandResult.InvalidHeaderIndex */;
+            return 87 /* CommandResult.InvalidHeaderIndex */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -39571,6 +39668,19 @@ class ImageProvider {
     }
 }
 
+class FocusableElement {
+    constructor() {
+        this.focusableElement = undefined;
+    }
+    setFocusableElement(element) {
+        this.focusableElement = element;
+    }
+    focus() {
+        var _a;
+        (_a = this.focusableElement) === null || _a === void 0 ? void 0 : _a.focus();
+    }
+}
+
 // -----------------------------------------------------------------------------
 // SpreadSheet
 // -----------------------------------------------------------------------------
@@ -40194,7 +40304,7 @@ const AddMergeInteractiveContent = {
 };
 function interactiveAddMerge(env, sheetId, target) {
     const result = env.model.dispatch("ADD_MERGE", { sheetId, target });
-    if (result.isCancelledBecause(80 /* CommandResult.MergeInFilter */)) {
+    if (result.isCancelledBecause(81 /* CommandResult.MergeInFilter */)) {
         env.raiseError(AddMergeInteractiveContent.MergeInFilter);
     }
     else if (result.isCancelledBecause(3 /* CommandResult.MergeIsDestructive */)) {
@@ -40814,8 +40924,8 @@ css /* scss */ `
       &.corner {
         right: 0px;
         bottom: 0px;
-        height: ${SCROLLBAR_WIDTH$1}px;
-        width: ${SCROLLBAR_WIDTH$1}px;
+        height: ${SCROLLBAR_WIDTH}px;
+        width: ${SCROLLBAR_WIDTH}px;
         border-top: 1px solid #e2e3e3;
         border-left: 1px solid #e2e3e3;
       }
@@ -40862,6 +40972,7 @@ class Spreadsheet extends owl.Component {
             toggleSidePanel: this.toggleSidePanel.bind(this),
             _t: Spreadsheet._t,
             clipboard: this.env.clipboard || instantiateClipboard(),
+            focusableElement: new FocusableElement(),
         });
         owl.useExternalListener(window, "resize", () => this.render(true));
         owl.useExternalListener(window, "beforeunload", this.unbindModelEvents.bind(this));
@@ -40960,17 +41071,18 @@ class Spreadsheet extends owl.Component {
         this.model.dispatch("UNFOCUS_SELECTION_INPUT");
         this.composer.topBarFocus = "contentFocus";
         this.composer.gridFocusMode = "inactive";
-        this.setComposerContent({ selection } || {});
+        this.setComposerContent({ selection });
     }
-    onGridComposerContentFocused() {
+    onGridComposerContentFocused(selection) {
         if (this.model.getters.isReadonly()) {
             return;
         }
         this.model.dispatch("UNFOCUS_SELECTION_INPUT");
         this.composer.topBarFocus = "inactive";
         this.composer.gridFocusMode = "contentFocus";
-        this.setComposerContent({});
+        this.setComposerContent({ selection });
     }
+    // TODO: either both are defined or none of them. change those args to an object
     onGridComposerCellFocused(content, selection) {
         if (this.model.getters.isReadonly()) {
             return;
@@ -41951,18 +42063,17 @@ class EventStream {
         if (this.observers.find((sub) => sub.owner === owner)) {
             throw new Error("You are already subscribed forever");
         }
-        if ((_a = this.mainSubscription) === null || _a === void 0 ? void 0 : _a.owner) {
+        if (((_a = this.mainSubscription) === null || _a === void 0 ? void 0 : _a.owner) && this.mainSubscription.owner !== owner) {
             (_c = (_b = this.mainSubscription.callbacks).release) === null || _c === void 0 ? void 0 : _c.call(_b);
         }
         this.mainSubscription = { owner, callbacks };
     }
     release(owner) {
-        var _a, _b, _c, _d;
+        var _a;
         if (((_a = this.mainSubscription) === null || _a === void 0 ? void 0 : _a.owner) !== owner ||
             this.observers.find((sub) => sub.owner === owner)) {
             return;
         }
-        (_d = (_b = this.mainSubscription) === null || _b === void 0 ? void 0 : (_c = _b.callbacks).release) === null || _d === void 0 ? void 0 : _d.call(_c);
         this.mainSubscription = this.defaultSubscription;
     }
     /**
@@ -42069,7 +42180,7 @@ class SelectionStreamProcessor {
      */
     moveAnchorCell(direction, step = 1) {
         if (step !== "end" && step <= 0) {
-            return new DispatchResult(83 /* CommandResult.InvalidSelectionStep */);
+            return new DispatchResult(84 /* CommandResult.InvalidSelectionStep */);
         }
         const { col, row } = this.getNextAvailablePosition(direction, step);
         return this.selectCell(col, row);
@@ -42115,7 +42226,7 @@ class SelectionStreamProcessor {
      */
     resizeAnchorZone(direction, step = 1) {
         if (step !== "end" && step <= 0) {
-            return new DispatchResult(83 /* CommandResult.InvalidSelectionStep */);
+            return new DispatchResult(84 /* CommandResult.InvalidSelectionStep */);
         }
         const sheetId = this.getters.getActiveSheetId();
         const anchor = this.anchor;
@@ -42430,11 +42541,10 @@ class SelectionStreamProcessor {
      * next cluster if the given cell is outside a cluster or at the border of a cluster in the given direction.
      */
     getEndOfCluster(startPosition, dim, dir) {
-        const sheet = this.getters.getActiveSheet();
         let currentPosition = startPosition;
         // If both the current cell and the next cell are not empty, we want to go to the end of the cluster
         const nextCellPosition = this.getNextCellPosition(startPosition, dim, dir);
-        let mode = !this.isCellEmpty(currentPosition, sheet.id) && !this.isCellEmpty(nextCellPosition, sheet.id)
+        let mode = !this.isEvaluatedCellEmpty(currentPosition) && !this.isEvaluatedCellEmpty(nextCellPosition)
             ? "endOfCluster"
             : "nextCluster";
         while (true) {
@@ -42444,7 +42554,7 @@ class SelectionStreamProcessor {
                 currentPosition.row === nextCellPosition.row) {
                 break;
             }
-            const isNextCellEmpty = this.isCellEmpty(nextCellPosition, sheet.id);
+            const isNextCellEmpty = this.isEvaluatedCellEmpty(nextCellPosition);
             if (mode === "endOfCluster" && isNextCellEmpty) {
                 break;
             }
@@ -42458,14 +42568,25 @@ class SelectionStreamProcessor {
         return dim === "cols" ? currentPosition.col : currentPosition.row;
     }
     /**
-     * Check if a cell is empty or undefined in the model. If the cell is part of a merge,
-     * check if the merge containing the cell is empty.
+     * Check if a cell evaluated value is empty. If the cell is part of a merge,
+     * the check applies to the main cell of the merge.
      */
-    isCellEmpty({ col, row }, sheetId = this.getters.getActiveSheetId()) {
+    isEvaluatedCellEmpty({ col, row }) {
+        const sheetId = this.getters.getActiveSheetId();
         const position = this.getters.getMainCellPosition({ sheetId, col, row });
         const cell = this.getters.getEvaluatedCell(position);
         return cell.type === CellValueType.empty;
     }
+    /**
+     * Checks if a cell is empty (i.e. does not have a content). If the cell is part of a merge,
+     * the check applies to the main cell of the merge.
+     */
+    isCellEmpty({ col, row }) {
+        var _a;
+        const sheetId = this.getters.getActiveSheetId();
+        const position = this.getters.getMainCellPosition({ sheetId, col, row });
+        return !((_a = this.getters.getCell(position)) === null || _a === void 0 ? void 0 : _a.content);
+    }
     /** Computes the next cell position in the given direction by crossing through merges and skipping hidden cells.
      *
      * This has the same behaviour as getNextAvailablePosition() for certain arguments, but use this method instead
@@ -42944,12 +43065,7 @@ function addFormula(cell) {
             attrs.push(["t", "str"]);
             cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
         }
-        node = escapeXml /*xml*/ `
-      <f>
-        ${XlsxFormula}
-      </f>
-      ${cycle}
-    `;
+        node = escapeXml /*xml*/ `<f> ${XlsxFormula} </f> ${cycle}`;
         return { attrs, node };
     }
     else {
@@ -43690,11 +43806,10 @@ function addRows(construct, data, sheet) {
                     ({ attrs: additionalAttrs, node: cellNode } = addContent(cell.content, construct.sharedStrings, isTableHeader));
                 }
                 attributes.push(...additionalAttrs);
-                cellNodes.push(escapeXml /*xml*/ `
-          <c ${formatAttributes(attributes)}>
-            ${cellNode}
-          </c>
-        `);
+                // prettier-ignore
+                cellNodes.push(escapeXml /*xml*/ `<c ${formatAttributes(attributes)}>
+  ${cellNode}
+</c>`);
             }
         }
         if (cellNodes.length || row.size !== DEFAULT_CELL_HEIGHT || row.isHidden) {
@@ -44075,10 +44190,10 @@ class Model extends EventBus {
             const command = { ...payload, type };
             let status = this.status;
             if (this.getters.isReadonly() && !canExecuteInReadonly(command)) {
-                return new DispatchResult(67 /* CommandResult.Readonly */);
+                return new DispatchResult(68 /* CommandResult.Readonly */);
             }
             if (!this.session.canApplyOptimisticUpdate()) {
-                return new DispatchResult(64 /* CommandResult.WaitingSessionConfirmation */);
+                return new DispatchResult(65 /* CommandResult.WaitingSessionConfirmation */);
             }
             switch (status) {
                 case 0 /* Status.Ready */:
@@ -44451,7 +44566,7 @@ const SPREADSHEET_DIMENSIONS = {
     BOTTOMBAR_HEIGHT,
     DEFAULT_CELL_WIDTH,
     DEFAULT_CELL_HEIGHT,
-    SCROLLBAR_WIDTH: SCROLLBAR_WIDTH$1,
+    SCROLLBAR_WIDTH,
 };
 const registries = {
     autofillModifiersRegistry,
@@ -44566,6 +44681,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.1.31';
-__info__.date = '2024-01-12T13:42:11.001Z';
-__info__.hash = 'f51befa';
+__info__.version = '16.1.36';
+__info__.date = '2024-02-16T14:16:11.082Z';
+__info__.hash = 'ad5301c';