@odoo/o-spreadsheet 18.4.0-alpha.6 → 18.4.0-alpha.8

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.4.0-alpha.6
- * @date 2025-05-30T08:44:33.216Z
- * @hash eecf7e4
+ * @version 18.4.0-alpha.8
+ * @date 2025-06-12T09:53:48.133Z
+ * @hash 9b7a8d0
  */
 
 'use strict';
@@ -132,7 +132,7 @@ class Registry {
 
 const CANVAS_SHIFT = 0.5;
 // Colors
-const HIGHLIGHT_COLOR = "#37A850";
+const HIGHLIGHT_COLOR = "#017E84";
 const BACKGROUND_GRAY_COLOR = "#f5f5f5";
 const BACKGROUND_HEADER_COLOR = "#F8F9FA";
 const BACKGROUND_HEADER_SELECTED_COLOR = "#E8EAED";
@@ -145,7 +145,7 @@ const CELL_BORDER_COLOR = "#E2E3E3";
 const BACKGROUND_CHART_COLOR = "#FFFFFF";
 const DISABLED_TEXT_COLOR = "#CACACA";
 const DEFAULT_COLOR_SCALE_MIDPOINT_COLOR = 0xb6d7a8;
-const LINK_COLOR = "#017E84";
+const LINK_COLOR = HIGHLIGHT_COLOR;
 const FILTERS_COLOR = "#188038";
 const SEPARATOR_COLOR = "#E0E2E4";
 const ICONS_COLOR = "#4A4F59";
@@ -174,7 +174,7 @@ const BUTTON_HOVER_BG = GRAY_300;
 const BUTTON_HOVER_TEXT_COLOR = "#111827";
 const BUTTON_ACTIVE_BG = "#e6f2f3";
 const BUTTON_ACTIVE_TEXT_COLOR = "#111827";
-const ACTION_COLOR = "#017E84";
+const ACTION_COLOR = HIGHLIGHT_COLOR;
 const ACTION_COLOR_HOVER = "#01585c";
 const ALERT_WARNING_BG = "#FBEBCC";
 const ALERT_WARNING_BORDER = "#F8E2B3";
@@ -281,8 +281,10 @@ const MIN_ROW_HEIGHT = 10;
 const MIN_COL_WIDTH = 5;
 const HEADER_HEIGHT = 26;
 const HEADER_WIDTH = 48;
-const TOPBAR_TOOLBAR_HEIGHT = 34;
-const BOTTOMBAR_HEIGHT = 36;
+const DESKTOP_TOPBAR_TOOLBAR_HEIGHT = 34;
+const MOBILE_TOPBAR_TOOLBAR_HEIGHT = 44;
+const DESKTOP_BOTTOMBAR_HEIGHT = 36;
+const MOBILE_BOTTOMBAR_HEIGHT = 44;
 const DEFAULT_CELL_WIDTH = 96;
 const DEFAULT_CELL_HEIGHT = 23;
 const SCROLLBAR_WIDTH = 15;
@@ -303,7 +305,8 @@ const MOBILE_WIDTH_BREAKPOINT = 768;
 // Menus
 const MENU_WIDTH = 250;
 const MENU_VERTICAL_PADDING = 6;
-const MENU_ITEM_HEIGHT = 26;
+const DESKTOP_MENU_ITEM_HEIGHT = 26;
+const MOBILE_MENU_ITEM_HEIGHT = 35;
 const MENU_ITEM_PADDING_HORIZONTAL = 11;
 const MENU_ITEM_PADDING_VERTICAL = 4;
 const MENU_SEPARATOR_BORDER_WIDTH = 1;
@@ -401,6 +404,7 @@ const PIVOT_TABLE_CONFIG = {
     automaticAutofill: false,
 };
 const PIVOT_INDENT = 15;
+const PIVOT_COLLAPSE_ICON_SIZE = 12;
 const DEFAULT_CURRENCY = {
     symbol: "$",
     position: "before",
@@ -1564,6 +1568,19 @@ class AlternatingColorGenerator extends ColorGenerator {
         this.palette = getAlternatingColorsPalette(paletteSize).filter((c) => !preferredColors.includes(c));
     }
 }
+class AlternatingColorMap {
+    availableColors;
+    colors = {};
+    constructor(paletteSize = 12) {
+        this.availableColors = new AlternatingColorGenerator(paletteSize);
+    }
+    get(id) {
+        if (!this.colors[id]) {
+            this.colors[id] = this.availableColors.next();
+        }
+        return this.colors[id];
+    }
+}
 /**
  * Returns a function that maps a value to a color using a color scale defined by the given
  * color/threshold values pairs.
@@ -5003,7 +5020,9 @@ function isTextFormat(format) {
 }
 
 function evaluateLiteral(literalCell, localeFormat) {
-    const value = isTextFormat(localeFormat.format) ? literalCell.content : literalCell.parsedValue;
+    const value = isTextFormat(localeFormat.format) && literalCell.parsedValue !== null
+        ? literalCell.content
+        : literalCell.parsedValue;
     const functionResult = { value, format: localeFormat.format };
     return createEvaluatedCell(functionResult, localeFormat.locale);
 }
@@ -5052,6 +5071,9 @@ function _createEvaluatedCell(functionResult, locale, cell) {
     if (isEvaluationError(value)) {
         return errorCell(value, message);
     }
+    if (value === null) {
+        return emptyCell(format);
+    }
     if (isTextFormat(format)) {
         // TO DO:
         // with the next line, the value of the cell is transformed depending on the format.
@@ -5059,9 +5081,6 @@ function _createEvaluatedCell(functionResult, locale, cell) {
         // to interpret the value as a number.
         return textCell(toString(value), format, formattedValue);
     }
-    if (value === null) {
-        return emptyCell(format);
-    }
     if (typeof value === "number") {
         if (isDateTimeFormat(format || "")) {
             return dateTimeCell(value, format, formattedValue);
@@ -19349,8 +19368,9 @@ const PIVOT = {
         arg("include_total (boolean, default=TRUE)", _t("Whether to include total/sub-totals or not.")),
         arg("include_column_titles (boolean, default=TRUE)", _t("Whether to include the column titles or not.")),
         arg("column_count (number, optional)", _t("number of columns")),
+        arg("include_measure_titles (boolean, default=TRUE)", _t("Whether to include the measure titles row or not.")),
     ],
-    compute: function (pivotFormulaId, rowCount = { value: 10000 }, includeTotal = { value: true }, includeColumnHeaders = { value: true }, columnCount = { value: Number.MAX_VALUE }) {
+    compute: function (pivotFormulaId, rowCount = { value: 10000 }, includeTotal = { value: true }, includeColumnHeaders = { value: true }, columnCount = { value: Number.MAX_VALUE }, includeMeasureTitles = { value: true }) {
         const _pivotFormulaId = toString(pivotFormulaId);
         const _rowCount = toNumber(rowCount, this.locale);
         if (_rowCount < 0) {
@@ -19360,8 +19380,11 @@ const PIVOT = {
         if (_columnCount < 0) {
             return new EvaluationError(_t("The number of columns must be positive."));
         }
-        const _includeColumnHeaders = toBoolean(includeColumnHeaders);
-        const _includedTotal = toBoolean(includeTotal);
+        const visibilityOptions = {
+            displayColumnHeaders: toBoolean(includeColumnHeaders),
+            displayTotals: toBoolean(includeTotal),
+            displayMeasuresRow: toBoolean(includeMeasureTitles),
+        };
         const pivotId = getPivotId(_pivotFormulaId, this.getters);
         const pivot = this.getters.getPivot(pivotId);
         const coreDefinition = this.getters.getPivotCoreDefinition(pivotId);
@@ -19372,9 +19395,15 @@ const PIVOT = {
             return error;
         }
         const table = pivot.getCollapsedTableStructure();
-        const cells = table.getPivotCells(_includedTotal, _includeColumnHeaders);
-        const headerRows = _includeColumnHeaders ? table.columns.length : 0;
-        const pivotTitle = this.getters.getPivotDisplayName(pivotId);
+        const cells = table.getPivotCells(visibilityOptions);
+        let headerRows = 0;
+        if (visibilityOptions.displayColumnHeaders) {
+            headerRows = table.columns.length - 1;
+        }
+        if (visibilityOptions.displayMeasuresRow) {
+            headerRows++;
+        }
+        const pivotTitle = this.getters.getPivotName(pivotId);
         const tableHeight = Math.min(headerRows + _rowCount, cells[0].length);
         if (tableHeight === 0) {
             return [[{ value: pivotTitle }]];
@@ -19402,7 +19431,7 @@ const PIVOT = {
                 }
             }
         }
-        if (_includeColumnHeaders) {
+        if (visibilityOptions.displayColumnHeaders || visibilityOptions.displayMeasuresRow) {
             result[0][0] = { value: pivotTitle };
         }
         return result;
@@ -20558,7 +20587,7 @@ const TEXT = {
     description: _t("Converts a number to text according to a specified format."),
     args: [
         arg("number (number)", _t("The number, date or time to format.")),
-        arg("format (string)", _t("The pattern by which to format the number, enclosed in quotation marks.")),
+        arg("format (string)", _t('The case-sensitive format of the result, enclosed in quotation marks. Examples: "0.00" rounded to 2 decimal places, "hh:mm:ss" for hour:minutes:seconds.')),
     ],
     compute: function (number, format) {
         const _number = toNumber(number, this.locale);
@@ -21665,8 +21694,6 @@ function drawLineOrBarOrRadarChartValues(chart, options, ctx) {
             if (isNaN(value)) {
                 continue;
             }
-            const axisId = chart.config.type === "radar" ? dataset.rAxisID : dataset.yAxisID;
-            const displayValue = options.callback(Number(value), axisId);
             const point = dataset.data[i];
             const xPosition = point.x;
             let yPosition = 0;
@@ -21690,7 +21717,8 @@ function drawLineOrBarOrRadarChartValues(chart, options, ctx) {
             textsPositions[xPosition].push(yPosition);
             ctx.fillStyle = point.options.backgroundColor;
             ctx.strokeStyle = options.background || "#ffffff";
-            drawTextWithBackground(displayValue, xPosition, yPosition, ctx);
+            const valueToDisplay = options.callback(Number(value), dataset, i);
+            drawTextWithBackground(valueToDisplay, xPosition, yPosition, ctx);
         }
     }
 }
@@ -21707,7 +21735,7 @@ function drawHorizontalBarChartValues(chart, options, ctx) {
             if (isNaN(value)) {
                 continue;
             }
-            const displayValue = options.callback(value, dataset.xAxisID);
+            const displayValue = options.callback(value, dataset, i);
             const point = dataset.data[i];
             const yPosition = point.y;
             let xPosition = value < 0 ? point.x + point.width / 2 : point.x - point.width / 2;
@@ -21742,10 +21770,22 @@ function drawPieChartValues(chart, options, ctx) {
             const midAngle = (startAngle + endAngle) / 2;
             const midRadius = (innerRadius + outerRadius) / 2;
             const x = bar.x + midRadius * Math.cos(midAngle);
-            const y = bar.y + midRadius * Math.sin(midAngle) + 7;
+            const y = bar.y + midRadius * Math.sin(midAngle);
+            const displayValue = options.callback(value, dataset, i);
+            const textHeight = 12; // ChartJS default
+            const textWidth = computeTextWidth(ctx, displayValue, { fontSize: textHeight }, "px");
+            const radius = outerRadius - innerRadius;
+            // Check if the text fits in the slice. Not perfect, but good enough heuristic.
+            if (textWidth >= radius || radius < textHeight) {
+                continue;
+            }
+            const sliceAngle = endAngle - startAngle;
+            const midWidth = 2 * midRadius * Math.tan(sliceAngle / 2);
+            if (sliceAngle < Math.PI / 2 && (textWidth >= midWidth || midWidth < textHeight)) {
+                continue;
+            }
             ctx.fillStyle = chartFontColor(options.background);
             ctx.strokeStyle = options.background || "#ffffff";
-            const displayValue = options.callback(value, "y");
             drawTextWithBackground(displayValue, x, y, ctx);
         }
     }
@@ -23492,7 +23532,7 @@ function isMacOS() {
  * On Mac, this is the "meta" or "command" key.
  */
 function isCtrlKey(ev) {
-    return isMacOS() ? ev.metaKey : ev.ctrlKey;
+    return isMacOS() || isIOS() ? ev.metaKey : ev.ctrlKey;
 }
 /**
  * @param {MouseEvent} ev - The mouse event.
@@ -23531,6 +23571,23 @@ function downloadFile(dataUrl, fileName) {
 function isBrowserFirefox() {
     return /Firefox/i.test(navigator.userAgent);
 }
+// Mobile detection
+function maxTouchPoints() {
+    return navigator.maxTouchPoints || 1;
+}
+function isAndroid() {
+    return /Android/i.test(navigator.userAgent);
+}
+function isIOS() {
+    return (/(iPad|iPhone|iPod)/i.test(navigator.userAgent) ||
+        (navigator.platform === "MacIntel" && maxTouchPoints() > 1));
+}
+function isOtherMobileOS() {
+    return /(webOS|BlackBerry|Windows Phone)/i.test(navigator.userAgent);
+}
+function isMobileOS() {
+    return isAndroid() || isIOS() || isOtherMobileOS();
+}
 
 /**
  * Convert a JS color hexadecimal to an excel compatible color.
@@ -25051,14 +25108,14 @@ function getPieChartLegend(definition, args) {
         ...getLegendDisplayOptions(definition),
         labels: {
             usePointStyle: true,
-            generateLabels: (c) => c.data.labels?.map((label, index) => ({
+            generateLabels: (c) => (c.data.labels?.map((label, index) => ({
                 text: truncateLabel(String(label)),
                 strokeStyle: colors[index],
                 fillStyle: colors[index],
                 pointStyle: "rect",
                 lineWidth: 2,
                 fontColor,
-            })) || [],
+            })) || []).filter((label) => label.text),
             filter: (legendItem, data) => {
                 return "datasetIndex" in legendItem
                     ? !data.datasets[legendItem.datasetIndex].hidden
@@ -25218,7 +25275,8 @@ function getCustomLegendLabels(fontColor, legendLabelConfig) {
         labels: {
             color: fontColor,
             usePointStyle: true,
-            generateLabels: (chart) => chart.data.datasets.map((dataset, index) => {
+            generateLabels: (chart) => chart.data.datasets
+                .map((dataset, index) => {
                 if (isTrendLineAxis(dataset["xAxisID"])) {
                     return {
                         text: truncateLabel(dataset.label),
@@ -25240,7 +25298,8 @@ function getCustomLegendLabels(fontColor, legendLabelConfig) {
                     datasetIndex: index,
                     ...legendLabelConfig,
                 };
-            }),
+            })
+                .filter((label) => label.text),
             filter: (legendItem, data) => {
                 return "datasetIndex" in legendItem
                     ? !data.datasets[legendItem.datasetIndex].hidden
@@ -25594,7 +25653,10 @@ function getChartShowValues(definition, args) {
         horizontal: "horizontal" in definition && definition.horizontal,
         showValues: "showValues" in definition ? !!definition.showValues : false,
         background: definition.background,
-        callback: formatChartDatasetValue(axisFormats, locale),
+        callback: (value, dataset) => {
+            const axisId = getDatasetAxisId(definition, dataset);
+            return formatChartDatasetValue(axisFormats, locale)(value, axisId);
+        },
     };
 }
 function getSunburstShowValues(definition, args) {
@@ -25612,6 +25674,45 @@ function getSunburstShowValues(definition, args) {
         },
     };
 }
+function getPyramidChartShowValues(definition, args) {
+    const { axisFormats, locale } = args;
+    return {
+        horizontal: true,
+        showValues: "showValues" in definition ? !!definition.showValues : false,
+        background: definition.background,
+        callback: (value, dataset) => {
+            value = Math.abs(Number(value));
+            return formatChartDatasetValue(axisFormats, locale)(value, dataset.xAxisID || "x");
+        },
+    };
+}
+function getWaterfallChartShowValues(definition, args) {
+    const { axisFormats, locale, dataSetsValues } = args;
+    const subtotalIndexes = dataSetsValues.reduce((subtotalIndexes, ds) => {
+        subtotalIndexes.push((subtotalIndexes.at(-1) || -1) + ds.data.length + 1);
+        return subtotalIndexes;
+    }, []);
+    return {
+        showValues: "showValues" in definition ? !!definition.showValues : false,
+        background: definition.background,
+        callback: (value, dataset, index) => {
+            const raw = dataset._dataset.data[index];
+            const delta = raw[1] - raw[0];
+            let sign = delta >= 0 ? "+" : "";
+            if (definition.showSubTotals && subtotalIndexes.includes(index) && sign === "+") {
+                sign = "";
+            }
+            return `${sign}${formatChartDatasetValue(axisFormats, locale)(delta, dataset.yAxisID)}`;
+        },
+    };
+}
+function getDatasetAxisId(definition, dataset) {
+    if (dataset.rAxisID) {
+        return dataset.rAxisID;
+    }
+    const axisId = "horizontal" in definition && definition.horizontal ? dataset.xAxisID : dataset.yAxisID;
+    return axisId || "y";
+}
 
 function getChartTitle(definition) {
     const chartTitle = definition.title;
@@ -26014,6 +26115,7 @@ var CHART_RUNTIME_HELPERS = /*#__PURE__*/Object.freeze({
   getPieChartTooltip: getPieChartTooltip,
   getPyramidChartData: getPyramidChartData,
   getPyramidChartScales: getPyramidChartScales,
+  getPyramidChartShowValues: getPyramidChartShowValues,
   getPyramidChartTooltip: getPyramidChartTooltip,
   getRadarChartData: getRadarChartData,
   getRadarChartDatasets: getRadarChartDatasets,
@@ -26034,6 +26136,7 @@ var CHART_RUNTIME_HELPERS = /*#__PURE__*/Object.freeze({
   getTrendDatasetForLineChart: getTrendDatasetForLineChart,
   getWaterfallChartLegend: getWaterfallChartLegend,
   getWaterfallChartScales: getWaterfallChartScales,
+  getWaterfallChartShowValues: getWaterfallChartShowValues,
   getWaterfallChartTooltip: getWaterfallChartTooltip,
   getWaterfallDatasetAndLabels: getWaterfallDatasetAndLabels,
   makeDatasetsCumulative: makeDatasetsCumulative
@@ -27346,7 +27449,7 @@ function createPyramidChartRuntime(chart, getters) {
                 title: getChartTitle(definition),
                 legend: getBarChartLegend(definition),
                 tooltip: getPyramidChartTooltip(definition, chartData),
-                chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                chartShowValuesPlugin: getPyramidChartShowValues(definition, chartData),
             },
         },
     };
@@ -28094,7 +28197,7 @@ function createWaterfallChartRuntime(chart, getters) {
                 title: getChartTitle(definition),
                 legend: getWaterfallChartLegend(definition),
                 tooltip: getWaterfallChartTooltip(definition, chartData),
-                chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                chartShowValuesPlugin: getWaterfallChartShowValues(definition, chartData),
                 waterfallLinesPlugin: { showConnectorLines: definition.showConnectorLines },
             },
         },
@@ -28886,6 +28989,7 @@ function getChartMenuActions(figureId, onFigureDeleted, env) {
                 env.openSidePanel("ChartPanel");
             },
             icon: "o-spreadsheet-Icon.EDIT",
+            isEnabled: (env) => !env.isSmall,
         },
         getCopyMenuItem(figureId, env),
         getCutMenuItem(figureId, env),
@@ -29100,6 +29204,147 @@ function useTimeOut() {
     };
 }
 
+//------------------------------------------------------------------------------
+// Context Menu Component
+//------------------------------------------------------------------------------
+css /* scss */ `
+  .o-menu {
+    background-color: white;
+    user-select: none;
+
+    .o-menu-item {
+      height: ${DESKTOP_MENU_ITEM_HEIGHT}px;
+      padding: ${MENU_ITEM_PADDING_VERTICAL}px ${MENU_ITEM_PADDING_HORIZONTAL}px;
+      cursor: pointer;
+      user-select: none;
+
+      .o-menu-item-name {
+        min-width: 40%;
+      }
+
+      .o-menu-item-icon {
+        display: inline-block;
+        margin: 0px 8px 0px 0px;
+        width: ${DESKTOP_MENU_ITEM_HEIGHT - 2 * MENU_ITEM_PADDING_VERTICAL}px;
+        line-height: ${DESKTOP_MENU_ITEM_HEIGHT - 2 * MENU_ITEM_PADDING_VERTICAL}px;
+      }
+
+      &:not(.disabled) {
+        &:hover,
+        &.o-menu-item-active {
+          background-color: ${BUTTON_ACTIVE_BG};
+          color: ${BUTTON_ACTIVE_TEXT_COLOR};
+        }
+        .o-menu-item-description {
+          color: grey;
+        }
+        .o-menu-item-icon {
+          .o-icon {
+            color: ${ICONS_COLOR};
+          }
+        }
+      }
+      &.disabled {
+        color: ${DISABLED_TEXT_COLOR};
+        cursor: not-allowed;
+      }
+    }
+  }
+
+  .o-spreadsheet-mobile {
+    .o-menu-item {
+      height: ${MOBILE_MENU_ITEM_HEIGHT}px;
+    }
+  }
+`;
+class Menu extends owl.Component {
+    static template = "o-spreadsheet-Menu";
+    static props = {
+        menuItems: Array,
+        onClose: Function,
+        onClickMenu: { type: Function, optional: true },
+        onMouseEnter: { type: Function, optional: true },
+        onMouseOver: { type: Function, optional: true },
+        onMouseLeave: { type: Function, optional: true },
+        width: { type: Number, optional: true },
+        isActive: { type: Function, optional: true },
+        onScroll: { type: Function, optional: true },
+    };
+    static components = {};
+    static defaultProps = {};
+    hoveredMenu = undefined;
+    setup() {
+        owl.onWillUnmount(() => {
+            this.hoveredMenu?.onStopHover?.(this.env);
+        });
+    }
+    get menuItemsAndSeparators() {
+        const menuItemsAndSeparators = [];
+        for (let i = 0; i < this.props.menuItems.length; i++) {
+            const menuItem = this.props.menuItems[i];
+            if (menuItem.isVisible(this.env)) {
+                menuItemsAndSeparators.push(menuItem);
+            }
+            if (menuItem.separator &&
+                i !== this.props.menuItems.length - 1 && // no separator at the end
+                menuItemsAndSeparators[menuItemsAndSeparators.length - 1] !== "separator" // no double separator
+            ) {
+                menuItemsAndSeparators.push("separator");
+            }
+        }
+        if (menuItemsAndSeparators[menuItemsAndSeparators.length - 1] === "separator") {
+            menuItemsAndSeparators.pop();
+        }
+        if (menuItemsAndSeparators.length === 1 && menuItemsAndSeparators[0] === "separator") {
+            return [];
+        }
+        return menuItemsAndSeparators;
+    }
+    get childrenHaveIcon() {
+        return this.props.menuItems.some((menuItem) => !!this.getIconName(menuItem));
+    }
+    getIconName(menu) {
+        if (menu.icon(this.env)) {
+            return menu.icon(this.env);
+        }
+        if (menu.isActive?.(this.env)) {
+            return "o-spreadsheet-Icon.CHECK";
+        }
+        return "";
+    }
+    getColor(menu) {
+        return cssPropertiesToCss({ color: menu.textColor });
+    }
+    getIconColor(menu) {
+        return cssPropertiesToCss({ color: menu.iconColor });
+    }
+    getName(menu) {
+        return menu.name(this.env);
+    }
+    isRoot(menu) {
+        return !menu.execute;
+    }
+    isEnabled(menu) {
+        if (menu.isEnabled(this.env)) {
+            return this.env.model.getters.isReadonly() ? menu.isReadonlyAllowed : true;
+        }
+        return false;
+    }
+    get menuStyle() {
+        return this.props.width ? cssPropertiesToCss({ width: this.props.width + "px" }) : "";
+    }
+    onMouseEnter(menu, ev) {
+        this.hoveredMenu = menu;
+        menu.onStartHover?.(this.env);
+        this.props.onMouseEnter?.(menu, ev);
+    }
+    onMouseLeave(menu, ev) {
+        this.hoveredMenu = undefined;
+        menu.onStopHover?.(this.env);
+        this.props.onMouseLeave?.(menu, ev);
+    }
+}
+
 /**
  * Compute the intersection of two rectangles. Returns nothing if the two rectangles don't overlap
  */
@@ -29128,6 +29373,9 @@ function zoneToRect(zone) {
         height: zone.bottom - zone.top,
     };
 }
+function isPointInsideRect(x, y, rect) {
+    return x >= rect.x && x <= rect.x + rect.width && y >= rect.y && y <= rect.y + rect.height;
+}
 
 /**
  * Return the o-spreadsheet element position relative
@@ -29425,57 +29673,17 @@ class TopRightPopoverContext extends PopoverPositionContext {
 }
 
 //------------------------------------------------------------------------------
-// Context Menu Component
+// Context MenuPopover Component
 //------------------------------------------------------------------------------
 css /* scss */ `
-  .o-menu {
-    background-color: white;
+  .o-menu-wrapper {
     padding: ${MENU_VERTICAL_PADDING}px 0px;
-    width: ${MENU_WIDTH}px;
-    user-select: none;
-
-    .o-menu-item {
-      height: ${MENU_ITEM_HEIGHT}px;
-      padding: ${MENU_ITEM_PADDING_VERTICAL}px ${MENU_ITEM_PADDING_HORIZONTAL}px;
-      cursor: pointer;
-      user-select: none;
-
-      .o-menu-item-name {
-        min-width: 40%;
-      }
-
-      .o-menu-item-icon {
-        display: inline-block;
-        margin: 0px 8px 0px 0px;
-        width: ${MENU_ITEM_HEIGHT - 2 * MENU_ITEM_PADDING_VERTICAL}px;
-        line-height: ${MENU_ITEM_HEIGHT - 2 * MENU_ITEM_PADDING_VERTICAL}px;
-      }
-
-      &:not(.disabled) {
-        &:hover,
-        &.o-menu-item-active {
-          background-color: ${BUTTON_ACTIVE_BG};
-          color: ${BUTTON_ACTIVE_TEXT_COLOR};
-        }
-        .o-menu-item-description {
-          color: grey;
-        }
-        .o-menu-item-icon {
-          .o-icon {
-            color: ${ICONS_COLOR};
-          }
-        }
-      }
-      &.disabled {
-        color: ${DISABLED_TEXT_COLOR};
-        cursor: not-allowed;
-      }
-    }
+    background-color: white;
   }
 `;
 const TIMEOUT_DELAY = 250;
-class Menu extends owl.Component {
-    static template = "o-spreadsheet-Menu";
+class MenuPopover extends owl.Component {
+    static template = "o-spreadsheet-Menu-Popover";
     static props = {
         anchorRect: Object,
         popoverPositioning: { type: String, optional: true },
@@ -29488,7 +29696,7 @@ class Menu extends owl.Component {
         onMouseOver: { type: Function, optional: true },
         width: { type: Number, optional: true },
     };
-    static components = { Menu, Popover };
+    static components = { MenuPopover, Menu, Popover };
     static defaultProps = {
         depth: 1,
         popoverPositioning: "top-right",
@@ -29515,27 +29723,18 @@ class Menu extends owl.Component {
             this.hoveredMenu?.onStopHover?.(this.env);
         });
     }
-    get menuItemsAndSeparators() {
-        const menuItemsAndSeparators = [];
-        for (let i = 0; i < this.props.menuItems.length; i++) {
-            const menuItem = this.props.menuItems[i];
-            if (menuItem.isVisible(this.env)) {
-                menuItemsAndSeparators.push(menuItem);
-            }
-            if (menuItem.separator &&
-                i !== this.props.menuItems.length - 1 && // no separator at the end
-                menuItemsAndSeparators[menuItemsAndSeparators.length - 1] !== "separator" // no double separator
-            ) {
-                menuItemsAndSeparators.push("separator");
-            }
-        }
-        if (menuItemsAndSeparators[menuItemsAndSeparators.length - 1] === "separator") {
-            menuItemsAndSeparators.pop();
-        }
-        if (menuItemsAndSeparators.length === 1 && menuItemsAndSeparators[0] === "separator") {
-            return [];
-        }
-        return menuItemsAndSeparators;
+    get menuProps() {
+        return {
+            menuItems: this.props.menuItems,
+            onClose: this.close.bind(this),
+            // @ts-ignore
+            onClickMenu: this.onClickMenu.bind(this),
+            onMouseOver: this.onMouseOver.bind(this),
+            onMouseLeave: this.onMouseLeave.bind(this),
+            width: this.props.width || MENU_WIDTH,
+            isActive: this.isActive.bind(this),
+            onScroll: this.onScroll.bind(this),
+        };
     }
     get subMenuAnchorRect() {
         const anchorRect = Object.assign({}, this.subMenu.anchorRect);
@@ -29549,12 +29748,13 @@ class Menu extends owl.Component {
                 x: this.props.anchorRect.x,
                 y: this.props.anchorRect.y,
                 width: isRoot ? this.props.anchorRect.width : this.props.width || MENU_WIDTH,
-                height: isRoot ? this.props.anchorRect.height : MENU_ITEM_HEIGHT,
+                height: isRoot ? this.props.anchorRect.height : DESKTOP_MENU_ITEM_HEIGHT,
             },
             positioning: this.props.popoverPositioning,
             verticalOffset: isRoot ? 0 : MENU_VERTICAL_PADDING,
             onPopoverHidden: () => this.closeSubMenu(),
             onPopoverMoved: () => this.closeSubMenu(),
+            maxHeight: this.props.maxHeight,
         };
     }
     get childrenHaveIcon() {
@@ -29624,7 +29824,7 @@ class Menu extends owl.Component {
             x: getRefBoundingRect(this.menuRef).x,
             y: y - (this.subMenu.scrollOffset || 0),
             width: this.props.width || MENU_WIDTH,
-            height: MENU_ITEM_HEIGHT,
+            height: DESKTOP_MENU_ITEM_HEIGHT,
         };
         this.subMenu.menuItems = menu.children(this.env);
         this.subMenu.isOpen = true;
@@ -29673,14 +29873,8 @@ class Menu extends owl.Component {
         this.subMenu.isHoveringChild = true;
         this.openingTimeOut.clear();
     }
-    onMouseEnter(menu, ev) {
-        this.hoveredMenu = menu;
-        menu.onStartHover?.(this.env);
-    }
     onMouseLeave(menu) {
         this.openingTimeOut.schedule(this.closeSubMenu.bind(this), TIMEOUT_DELAY);
-        this.hoveredMenu = undefined;
-        menu.onStopHover?.(this.env);
     }
     get menuStyle() {
         return this.props.width ? cssPropertiesToCss({ width: this.props.width + "px" }) : "";
@@ -29689,7 +29883,7 @@ class Menu extends owl.Component {
 
 class ChartDashboardMenu extends owl.Component {
     static template = "spreadsheet.ChartDashboardMenu";
-    static components = { Menu };
+    static components = { MenuPopover };
     static props = { figureUI: Object };
     originalChartDefinition;
     fullScreenFigureStore;
@@ -29953,7 +30147,7 @@ class FigureComponent extends owl.Component {
         onMouseDown: { type: Function, optional: true },
         onClickAnchor: { type: Function, optional: true },
     };
-    static components = { Menu };
+    static components = { MenuPopover };
     static defaultProps = {
         onFigureDeleted: () => { },
         onMouseDown: () => { },
@@ -30040,7 +30234,14 @@ class FigureComponent extends owl.Component {
         this.props.onClickAnchor(dirX, dirY, ev);
     }
     onMouseDown(ev) {
-        this.props.onMouseDown(ev);
+        if (!this.env.isMobile()) {
+            this.props.onMouseDown(ev);
+        }
+    }
+    onClick(ev) {
+        if (this.env.isMobile()) {
+            this.props.onMouseDown(ev);
+        }
     }
     onKeyDown(ev) {
         const keyDownShortcut = keyboardEventToShortcutString(ev);
@@ -31507,15 +31708,15 @@ class HighlightStore extends SpreadsheetStore {
         const activeSheetId = this.getters.getActiveSheetId();
         return this.providers
             .flatMap((h) => h.highlights)
-            .filter((h) => h.sheetId === activeSheetId)
+            .filter((h) => h.range.sheetId === activeSheetId)
             .map((highlight) => {
-            const { numberOfRows, numberOfCols } = zoneToDimension(highlight.zone);
+            const { numberOfRows, numberOfCols } = zoneToDimension(highlight.range.zone);
             const zone = numberOfRows * numberOfCols === 1
-                ? this.getters.expandZone(highlight.sheetId, highlight.zone)
-                : highlight.zone;
+                ? this.getters.expandZone(highlight.range.sheetId, highlight.range.zone)
+                : highlight.range.unboundedZone;
             return {
                 ...highlight,
-                zone,
+                range: this.model.getters.getRangeFromZone(highlight.range.sheetId, zone),
             };
         });
     }
@@ -31528,7 +31729,7 @@ class HighlightStore extends SpreadsheetStore {
     drawLayer(ctx, layer) {
         if (layer === "Highlights") {
             for (const highlight of this.highlights) {
-                const rect = this.getters.getVisibleRect(highlight.zone);
+                const rect = this.getters.getVisibleRect(highlight.range.zone);
                 drawHighlight(ctx, highlight, rect);
             }
         }
@@ -32156,12 +32357,12 @@ class AbstractComposerStore extends SpreadsheetStore {
     rangeColor(xc, sheetName) {
         const refSheet = sheetName ? this.model.getters.getSheetIdByName(sheetName) : this.sheetId;
         const highlight = this.highlights.find((highlight) => {
-            if (highlight.sheetId !== refSheet)
+            if (highlight.range.sheetId !== refSheet)
                 return false;
             const range = this.model.getters.getRangeFromSheetXC(refSheet, xc);
             let zone = range.zone;
             zone = getZoneArea(zone) === 1 ? this.model.getters.expandZone(refSheet, zone) : zone;
-            return isEqual(zone, highlight.zone);
+            return isEqual(zone, highlight.range.zone);
         });
         return highlight && highlight.color ? highlight.color : undefined;
     }
@@ -32271,11 +32472,10 @@ class AbstractComposerStore extends SpreadsheetStore {
             const { numberOfRows, numberOfCols } = zoneToDimension(range.zone);
             const zone = numberOfRows * numberOfCols === 1
                 ? this.getters.expandZone(range.sheetId, range.zone)
-                : range.zone;
+                : range.unboundedZone;
             return {
-                zone,
+                range: this.model.getters.getRangeFromZone(range.sheetId, zone),
                 color: rangeColor(rangeString),
-                sheetId: range.sheetId,
                 interactive: true,
             };
         });
@@ -32528,11 +32728,15 @@ class Composer extends owl.Component {
         onInputContextMenu: { type: Function, optional: true },
         composerStore: Object,
         placeholder: { type: String, optional: true },
+        inputMode: { type: String, optional: true },
+        showAssistant: { type: Boolean, optional: true },
     };
     static components = { TextValueProvider, FunctionDescriptionProvider, SpeechBubble };
     static defaultProps = {
         inputStyle: "",
         isDefaultFocus: false,
+        inputMode: "text",
+        showAssistant: true,
     };
     DOMFocusableElementStore;
     composerRef = owl.useRef("o_composer");
@@ -32583,8 +32787,7 @@ class Composer extends owl.Component {
                 assistantStyle["max-height"] = `${availableSpaceAbove - CLOSE_ICON_RADIUS}px`;
                 // render top
                 // We compensate 2 px of margin on the assistant style + 1px for design reasons
-                assistantStyle.top = `-3px`;
-                assistantStyle.transform = `translate(0, -100%)`;
+                assistantStyle.transform = `translate(0, calc(-100% - ${cellHeight + 3}px))`;
             }
             if (cellX + ASSISTANT_WIDTH > this.props.delimitation.width) {
                 // render left
@@ -32863,6 +33066,9 @@ class Composer extends owl.Component {
             // not main button, probably a context menu
             return;
         }
+        if (this.env.isMobile() && !isIOS()) {
+            return;
+        }
         this.contentHelper.removeSelection();
     }
     onMouseup() {
@@ -33486,7 +33692,7 @@ class ListCriterionForm extends CriterionForm {
  */
 function startDnd(onPointerMove, onPointerUp) {
     const removeListeners = () => {
-        window.removeEventListener("pointerup", _onPointerUp);
+        window.removeEventListener("pointerup", _onPointerUp, { capture: true });
         window.removeEventListener("dragstart", _onDragStart);
         window.removeEventListener("pointermove", onPointerMove);
         window.removeEventListener("wheel", onPointerMove);
@@ -33498,7 +33704,7 @@ function startDnd(onPointerMove, onPointerUp) {
     function _onDragStart(ev) {
         ev.preventDefault();
     }
-    window.addEventListener("pointerup", _onPointerUp);
+    window.addEventListener("pointerup", _onPointerUp, { capture: true });
     window.addEventListener("dragstart", _onDragStart);
     window.addEventListener("pointermove", onPointerMove);
     // mouse wheel on window is by default a passive event.
@@ -34120,9 +34326,9 @@ class SelectionInputStore extends SpreadsheetStore {
             .filter((reference) => this.shouldBeHighlighted(this.inputSheetId, reference));
         return XCs.map((xc) => {
             const { sheetName } = splitReference(xc);
+            const sheetId = (sheetName && this.getters.getSheetIdByName(sheetName)) || this.inputSheetId;
             return {
-                zone: this.getters.getRangeFromSheetXC(this.inputSheetId, xc).zone,
-                sheetId: (sheetName && this.getters.getSheetIdByName(sheetName)) || this.inputSheetId,
+                range: this.getters.getRangeFromSheetXC(sheetId, xc),
                 color,
                 interactive: true,
             };
@@ -34591,7 +34797,7 @@ function getCriterionMenuItems(callback, availableTypes) {
     return createActions(actionSpecs);
 }
 
-/** This component looks like a select input, but on click it opens a Menu with the items given as props instead of a dropdown */
+/** This component looks like a select input, but on click it opens a MenuPopover with the items given as props instead of a dropdown */
 class SelectMenu extends owl.Component {
     static template = "o-spreadsheet-SelectMenu";
     static props = {
@@ -34599,7 +34805,7 @@ class SelectMenu extends owl.Component {
         selectedValue: String,
         class: { type: String, optional: true },
     };
-    static components = { Menu };
+    static components = { MenuPopover };
     menuId = new UuidGenerator().uuidv4();
     selectRef = owl.useRef("select");
     state = owl.useState({
@@ -34772,17 +34978,22 @@ class FilterMenuValueList extends owl.Component {
     static components = { FilterMenuValueItem };
     state = owl.useState({
         values: [],
+        displayedValues: [],
         textFilter: "",
         selectedValue: undefined,
+        numberOfDisplayedValues: 50,
+        hasMoreValues: false,
     });
     searchBar = owl.useRef("filterMenuSearchBar");
     setup() {
         owl.onWillUpdateProps((nextProps) => {
             if (!deepEquals(nextProps.filterPosition, this.props.filterPosition)) {
                 this.state.values = this.getFilterHiddenValues(nextProps.filterPosition);
+                this.computeDisplayedValues();
             }
         });
         this.state.values = this.getFilterHiddenValues(this.props.filterPosition);
+        this.computeDisplayedValues();
     }
     getFilterHiddenValues(position) {
         const sheetId = this.env.model.getters.getActiveSheetId();
@@ -34800,21 +35011,28 @@ class FilterMenuValueList extends owl.Component {
         }
         const cellValues = cells.map((val) => val.cellValue);
         const filterValues = filterValue?.filterType === "values" ? filterValue.hiddenValues : [];
-        const strValues = [...cellValues, ...filterValues];
-        const normalizedFilteredValues = filterValues.map(toLowerCase);
-        // Set with lowercase values to avoid duplicates
-        const normalizedValues = [...new Set(strValues.map(toLowerCase))];
-        const sortedValues = normalizedValues.sort((val1, val2) => val1.localeCompare(val2, undefined, { numeric: true, sensitivity: "base" }));
-        return sortedValues.map((normalizedValue) => {
-            let checked = false;
-            if (filterValue?.filterType !== "criterion") {
-                checked = normalizedFilteredValues.findIndex((val) => val === normalizedValue) === -1;
+        const normalizedFilteredValues = new Set(filterValues.map(toLowerCase));
+        const set = new Set();
+        const values = [];
+        const addValue = (value) => {
+            const normalizedValue = toLowerCase(value);
+            if (!set.has(normalizedValue)) {
+                values.push({
+                    string: value || "",
+                    checked: filterValue?.filterType !== "criterion"
+                        ? !normalizedFilteredValues.has(normalizedValue)
+                        : false,
+                    normalizedValue,
+                });
+                set.add(normalizedValue);
             }
-            return {
-                checked,
-                string: strValues.find((val) => toLowerCase(val) === normalizedValue) || "",
-            };
-        });
+        };
+        cellValues.forEach(addValue);
+        filterValues.forEach(addValue);
+        return values.sort((val1, val2) => val1.normalizedValue.localeCompare(val2.normalizedValue, undefined, {
+            numeric: true,
+            sensitivity: "base",
+        }));
     }
     checkValue(value) {
         this.state.selectedValue = value.string;
@@ -34826,25 +35044,37 @@ class FilterMenuValueList extends owl.Component {
         this.state.selectedValue = value.string;
     }
     selectAll() {
-        this.displayedValues.forEach((value) => (value.checked = true));
-        this.updateHiddenValues();
+        this.state.displayedValues.forEach((value) => (value.checked = true));
+        this.props.onUpdateHiddenValues([]);
     }
     clearAll() {
-        this.displayedValues.forEach((value) => (value.checked = false));
-        this.updateHiddenValues();
+        this.state.displayedValues.forEach((value) => (value.checked = false));
+        const hiddenValues = this.state.values.map((val) => val.string);
+        this.props.onUpdateHiddenValues(hiddenValues);
     }
     updateHiddenValues() {
         const hiddenValues = this.state.values.filter((val) => !val.checked).map((val) => val.string);
         this.props.onUpdateHiddenValues(hiddenValues);
     }
-    get displayedValues() {
-        if (!this.state.textFilter) {
-            return this.state.values;
-        }
-        return fuzzyLookup(this.state.textFilter, this.state.values, (val) => val.string);
+    updateSearch(ev) {
+        const target = ev.target;
+        this.state.textFilter = target.value;
+        this.state.selectedValue = undefined;
+        this.computeDisplayedValues();
+    }
+    computeDisplayedValues() {
+        const values = !this.state.textFilter
+            ? this.state.values
+            : fuzzyLookup(this.state.textFilter, this.state.values, (val) => val.string);
+        this.state.displayedValues = values.slice(0, this.state.numberOfDisplayedValues);
+        this.state.hasMoreValues = values.length > this.state.numberOfDisplayedValues;
+    }
+    loadMoreValues() {
+        this.state.numberOfDisplayedValues += 100;
+        this.computeDisplayedValues();
     }
     onKeyDown(ev) {
-        const displayedValues = this.displayedValues;
+        const displayedValues = this.state.displayedValues;
         if (displayedValues.length === 0)
             return;
         let selectedIndex = undefined;
@@ -35347,7 +35577,7 @@ class MenuItemRegistry extends Registry {
 }
 
 //------------------------------------------------------------------------------
-// Link Menu Registry
+// Link MenuPopover Registry
 //------------------------------------------------------------------------------
 const linkMenuRegistry = new MenuItemRegistry();
 linkMenuRegistry.add("sheet", {
@@ -35409,7 +35639,7 @@ class LinkEditor extends owl.Component {
         cellPosition: Object,
         onClosed: { type: Function, optional: true },
     };
-    static components = { Menu };
+    static components = { MenuPopover };
     menuItems = linkMenuRegistry.getMenuItems();
     link = owl.useState(this.defaultState);
     menu = owl.useState({
@@ -35866,58 +36096,149 @@ css /* scss */ `
 const ARROW_DOWN = {
     width: 448,
     height: 512,
-    fillColor: "#E06666",
-    path: "M413.1 222.5l22.2 22.2c9.4 9.4 9.4 24.6 0 33.9L241 473c-9.4 9.4-24.6 9.4-33.9 0L12.7 278.6c-9.4-9.4-9.4-24.6 0-33.9l22.2-22.2c9.5-9.5 25-9.3 34.3.4L184 343.4V56c0-13.3 10.7-24 24-24h32c13.3 0 24 10.7 24 24v287.4l114.8-120.5c9.3-9.8 24.8-10 34.3-.4z",
+    paths: [
+        {
+            fillColor: "#E06666",
+            path: "M413.1 222.5l22.2 22.2c9.4 9.4 9.4 24.6 0 33.9L241 473c-9.4 9.4-24.6 9.4-33.9 0L12.7 278.6c-9.4-9.4-9.4-24.6 0-33.9l22.2-22.2c9.5-9.5 25-9.3 34.3.4L184 343.4V56c0-13.3 10.7-24 24-24h32c13.3 0 24 10.7 24 24v287.4l114.8-120.5c9.3-9.8 24.8-10 34.3-.4z",
+        },
+    ],
 };
 const ARROW_UP = {
     width: 448,
     height: 512,
-    fillColor: "#6AA84F",
-    path: "M34.9 289.5l-22.2-22.2c-9.4-9.4-9.4-24.6 0-33.9L207 39c9.4-9.4 24.6-9.4 33.9 0l194.3 194.3c9.4 9.4 9.4 24.6 0 33.9L413 289.4c-9.5 9.5-25 9.3-34.3-.4L264 168.6V456c0 13.3-10.7 24-24 24h-32c-13.3 0-24-10.7-24-24V168.6L69.2 289.1c-9.3 9.8-24.8 10-34.3.4z",
+    paths: [
+        {
+            fillColor: "#6AA84F",
+            path: "M34.9 289.5l-22.2-22.2c-9.4-9.4-9.4-24.6 0-33.9L207 39c9.4-9.4 24.6-9.4 33.9 0l194.3 194.3c9.4 9.4 9.4 24.6 0 33.9L413 289.4c-9.5 9.5-25 9.3-34.3-.4L264 168.6V456c0 13.3-10.7 24-24 24h-32c-13.3 0-24-10.7-24-24V168.6L69.2 289.1c-9.3 9.8-24.8 10-34.3.4z",
+        },
+    ],
 };
 const ARROW_RIGHT = {
     width: 448,
     height: 512,
-    fillColor: "#F0AD4E",
-    path: "M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z",
+    paths: [
+        {
+            fillColor: "#F0AD4E",
+            path: "M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z",
+        },
+    ],
 };
 const SMILE = {
     width: 496,
     height: 512,
-    fillColor: "#6AA84F",
-    path: "M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm-80-216c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160 0c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm4 72.6c-20.8 25-51.5 39.4-84 39.4s-63.2-14.3-84-39.4c-8.5-10.2-23.7-11.5-33.8-3.1-10.2 8.5-11.5 23.6-3.1 33.8 30 36 74.1 56.6 120.9 56.6s90.9-20.6 120.9-56.6c8.5-10.2 7.1-25.3-3.1-33.8-10.1-8.4-25.3-7.1-33.8 3.1z",
+    paths: [
+        {
+            fillColor: "#6AA84F",
+            path: "M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm-80-216c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160 0c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm4 72.6c-20.8 25-51.5 39.4-84 39.4s-63.2-14.3-84-39.4c-8.5-10.2-23.7-11.5-33.8-3.1-10.2 8.5-11.5 23.6-3.1 33.8 30 36 74.1 56.6 120.9 56.6s90.9-20.6 120.9-56.6c8.5-10.2 7.1-25.3-3.1-33.8-10.1-8.4-25.3-7.1-33.8 3.1z",
+        },
+    ],
 };
 const MEH = {
     width: 496,
     height: 512,
-    fillColor: "#F0AD4E",
-    path: "M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm-80-216c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160-64c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zm8 144H160c-13.2 0-24 10.8-24 24s10.8 24 24 24h176c13.2 0 24-10.8 24-24s-10.8-24-24-24z",
+    paths: [
+        {
+            fillColor: "#F0AD4E",
+            path: "M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm-80-216c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160-64c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zm8 144H160c-13.2 0-24 10.8-24 24s10.8 24 24 24h176c13.2 0 24-10.8 24-24s-10.8-24-24-24z",
+        },
+    ],
 };
 const FROWN = {
     width: 496,
     height: 512,
-    fillColor: "#E06666",
-    path: "M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm-80-216c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160-64c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zm-80 128c-40.2 0-78 17.7-103.8 48.6-8.5 10.2-7.1 25.3 3.1 33.8 10.2 8.4 25.3 7.1 33.8-3.1 16.6-19.9 41-31.4 66.9-31.4s50.3 11.4 66.9 31.4c8.1 9.7 23.1 11.9 33.8 3.1 10.2-8.5 11.5-23.6 3.1-33.8C326 321.7 288.2 304 248 304z",
+    paths: [
+        {
+            fillColor: "#E06666",
+            path: "M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm-80-216c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160-64c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zm-80 128c-40.2 0-78 17.7-103.8 48.6-8.5 10.2-7.1 25.3 3.1 33.8 10.2 8.4 25.3 7.1 33.8-3.1 16.6-19.9 41-31.4 66.9-31.4s50.3 11.4 66.9 31.4c8.1 9.7 23.1 11.9 33.8 3.1 10.2-8.5 11.5-23.6 3.1-33.8C326 321.7 288.2 304 248 304z",
+        },
+    ],
 };
 const DOT_PATH = "M256 9 a247 247 0 1 0.1 0 0";
 const GREEN_DOT = {
     width: 512,
     height: 512,
-    fillColor: "#6AA84F",
-    path: DOT_PATH,
+    paths: [{ fillColor: "#6AA84F", path: DOT_PATH }],
 };
 const YELLOW_DOT = {
     width: 512,
     height: 512,
-    fillColor: "#F0AD4E",
-    path: DOT_PATH,
+    paths: [{ fillColor: "#F0AD4E", path: DOT_PATH }],
 };
 const RED_DOT = {
     width: 512,
     height: 512,
-    fillColor: "#E06666",
-    path: DOT_PATH,
+    paths: [{ fillColor: "#E06666", path: DOT_PATH }],
+};
+const CARET_DOWN = {
+    width: 512,
+    height: 512,
+    paths: [{ fillColor: TEXT_BODY_MUTED, path: "M120 195 h270 l-135 130" }],
+};
+const HOVERED_CARET_DOWN = {
+    width: 512,
+    height: 512,
+    paths: [
+        { fillColor: TEXT_BODY_MUTED, path: "M15 15 h482 v482 h-482" },
+        { fillColor: "#fff", path: "M120 195 h270 l-135 130" },
+    ],
+};
+const CHECKBOX_UNCHECKED = {
+    width: 512,
+    height: 512,
+    paths: [{ fillColor: GRAY_300, path: "M45,45 h422 v422 h-422 v-422 m30,30 v362 h362 v-362" }],
+};
+const CHECKBOX_UNCHECKED_HOVERED = {
+    width: 512,
+    height: 512,
+    paths: [{ fillColor: ACTION_COLOR, path: "M45,45 h422 v422 h-422 v-422 m30,30 v362 h362 v-362" }],
+};
+const CHECKBOX_CHECKED = {
+    width: 512,
+    height: 512,
+    paths: [
+        { fillColor: ACTION_COLOR, path: "M45,45 h422 v422 h-422 v-422" },
+        { fillColor: "#FFF", path: "M165,240 l45,45 l135,-135 h60 l-195,195 l-105,-105" },
+    ],
 };
+function getPivotIconSvg(isCollapsed, isHovered) {
+    const symbolPath = isCollapsed
+        ? "M149,235 h213 v43 h-213 M235,149 h43 v213 h-43" // +
+        : "M149,235 h213 v43 h-213"; // -
+    return {
+        width: 512,
+        height: 512,
+        paths: [
+            { path: "M21,21 h469 v469 h-469", fillColor: isHovered ? GRAY_900 : "#777" }, // borders
+            { path: "M64,64 v384 h384 v-384", fillColor: isHovered ? GRAY_200 : "#eee" }, // background
+            { path: symbolPath, fillColor: isHovered ? GRAY_900 : "#777" },
+        ],
+    };
+}
+function getDataFilterIcon(isActive, isHighContrast, isHovered) {
+    const symbolPath = isActive
+        ? "M18.6 3.5H4.29c-.7 0-1.06.85-.56 1.35l6.1 6.1v6.8c0 .26.13.5.34.65l2.64 1.85a.79.79 0 0 0 1.25-.65v-8.64l6.1-6.1a.79.79 0 0 0-.56-1.35"
+        : "M 339.667 681 L 510.333 681 L 510.333 595.667 L 339.667 595.667 L 339.667 681 Z M 41 169 L 41 254.333 L 809 254.333 L 809 169 L 41 169 Z M 169 467.667 L 681 467.667 L 681 382.333 L 169 382.333 L 169 467.667 Z";
+    const hoverBackgroundPath = isActive ? "M0,0 h24 v24 h-24" : "M0,0 h850 v850 h-850";
+    const colors = { iconColor: FILTERS_COLOR, hoverBackgroundColor: FILTERS_COLOR };
+    if (isHovered && !isHighContrast) {
+        colors.iconColor = "#fff";
+    }
+    else if (!isHovered && isHighContrast) {
+        colors.iconColor = "#defade";
+    }
+    else if (isHovered && isHighContrast) {
+        colors.iconColor = FILTERS_COLOR;
+        colors.hoverBackgroundColor = "#fff";
+    }
+    return {
+        width: isActive ? 24 : 850,
+        height: isActive ? 24 : 850,
+        paths: [
+            isHovered ? { path: hoverBackgroundPath, fillColor: colors.hoverBackgroundColor } : undefined,
+            { path: symbolPath, fillColor: colors.iconColor },
+        ].filter(isDefined),
+    };
+}
 const ICONS = {
     arrowGood: {
         template: "ARROW_UP",
@@ -35973,6 +36294,15 @@ const ICON_SETS = {
         bad: "dotBad",
     },
 };
+const path2DCache = {};
+function getPath2D(svgPath) {
+    if (path2DCache[svgPath]) {
+        return path2DCache[svgPath];
+    }
+    const path2D = new Path2D(svgPath);
+    path2DCache[svgPath] = path2D;
+    return path2D;
+}
 
 /**
  * Map of the different types of conversions warnings and their name in error messages
@@ -38217,7 +38547,7 @@ class XlsxBaseExtractor {
      */
     handleMissingValue(parentElement, missingElementName, optionalArgs) {
         if (optionalArgs?.required) {
-            if (optionalArgs?.default) {
+            if (optionalArgs?.default !== undefined) {
                 this.warningManager.addParsingWarning(`Missing required ${missingElementName} in element <${parentElement.tagName}> of ${this.currentFile}, replacing it by the default value ${optionalArgs.default}`);
             }
             else {
@@ -41944,6 +42274,7 @@ const findAndReplace = {
     execute: (env) => {
         env.openSidePanel("FindAndReplace", {});
     },
+    isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.SEARCH",
 };
 const deleteValues = {
@@ -42200,11 +42531,13 @@ const insertCellShiftRight = {
 const insertChart = {
     name: _t("Chart"),
     execute: CREATE_CHART,
+    isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.INSERT_CHART",
 };
 const insertPivot = {
     name: _t("Pivot table"),
     execute: CREATE_PIVOT,
+    isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.PIVOT",
 };
 const insertImage = {
@@ -42212,12 +42545,14 @@ const insertImage = {
     description: "Ctrl+O",
     execute: CREATE_IMAGE,
     isVisible: (env) => env.imageProvider !== undefined,
+    isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.INSERT_IMAGE",
 };
 const insertTable = {
     name: () => _t("Table"),
     execute: INSERT_TABLE,
     isVisible: (env) => IS_SELECTION_CONTINUOUS(env) && !env.model.getters.getFirstTableInSelection(),
+    isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.PAINT_TABLE",
 };
 const insertFunction = {
@@ -42323,6 +42658,7 @@ const insertDropdown = {
             },
         });
     },
+    isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.INSERT_DROPDOWN",
 };
 const insertSheet = {
@@ -42592,7 +42928,7 @@ const pivotProperties = {
     isVisible: (env) => {
         const position = env.model.getters.getActivePosition();
         const pivotId = env.model.getters.getPivotIdFromPosition(position);
-        return (pivotId && env.model.getters.isExistingPivot(pivotId)) || false;
+        return (!env.isSmall && pivotId && env.model.getters.isExistingPivot(pivotId)) || false;
     },
     isReadonlyAllowed: true,
     icon: "o-spreadsheet-Icon.PIVOT",
@@ -42710,7 +43046,7 @@ function isPivotSortMenuItemActive(env, order) {
 }
 
 //------------------------------------------------------------------------------
-// Context Menu Registry
+// Context MenuPopover Registry
 //------------------------------------------------------------------------------
 const cellMenuRegistry = new MenuItemRegistry();
 cellMenuRegistry
@@ -42793,6 +43129,7 @@ cellMenuRegistry
     .add("edit_table", {
     ...editTable,
     isVisible: SELECTION_CONTAINS_SINGLE_TABLE,
+    isEnabled: (env) => !env.isSmall,
     sequence: 140,
 })
     .add("delete_table", {
@@ -42861,6 +43198,7 @@ const removeDuplicates = {
         }
         env.openSidePanel("RemoveDuplicates", {});
     },
+    isEnabled: (env) => !env.isSmall,
 };
 const trimWhitespace = {
     name: _t("Trim whitespace"),
@@ -42888,7 +43226,7 @@ const splitToColumns = {
     name: _t("Split text to columns"),
     sequence: 1,
     execute: (env) => env.openSidePanel("SplitToColumns", {}),
-    isEnabled: (env) => env.model.getters.isSingleColSelected(),
+    isEnabled: (env) => !env.isSmall && env.model.getters.isSingleColSelected(),
     icon: "o-spreadsheet-Icon.SPLIT_TEXT",
 };
 const reinsertDynamicPivotMenu = {
@@ -42975,7 +43313,7 @@ const formatNumberAccounting = createFormatActionSpec({
 const EXAMPLE_DATE = parseLiteral("2023/09/26 10:43:00 PM", DEFAULT_LOCALE);
 const formatCustomCurrency = {
     name: _t("Custom currency"),
-    isVisible: (env) => env.loadCurrencies !== undefined,
+    isVisible: (env) => env.loadCurrencies !== undefined && !env.isSmall,
     execute: (env) => env.openSidePanel("CustomCurrency", {}),
 };
 const formatNumberDate = createFormatActionSpec({
@@ -43198,6 +43536,7 @@ const formatWrappingClip = {
 const formatCF = {
     name: _t("Conditional formatting"),
     execute: OPEN_CF_SIDEPANEL_ACTION,
+    isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.CONDITIONAL_FORMAT",
 };
 const clearFormat = {
@@ -43581,8 +43920,7 @@ class ArrayFormulaHighlight extends SpreadsheetStore {
         }
         return [
             {
-                sheetId: position.sheetId,
-                zone,
+                range: this.model.getters.getRangeFromZone(position.sheetId, zone),
                 dashed: cell.value === CellErrorType.SpilledBlocked,
                 color: "#17A2B8",
                 noFill: true,
@@ -43667,6 +44005,7 @@ function useDragAndDropBeyondTheViewport(env) {
     let previousEvClientPosition;
     let startingX;
     let startingY;
+    let scrollDirection = "all";
     const getters = env.model.getters;
     let cleanUpFns = [];
     const cleanUp = () => {
@@ -43692,55 +44031,59 @@ function useDragAndDropBeyondTheViewport(env) {
         let timeoutDelay = MAX_DELAY;
         const x = currentEv.clientX - position.left;
         let colIndex = getters.getColIndex(x);
-        const previousX = previousEvClientPosition.clientX - position.left;
-        const edgeScrollInfoX = getters.getEdgeScrollCol(x, previousX, startingX);
-        if (edgeScrollInfoX.canEdgeScroll) {
-            canEdgeScroll = true;
-            timeoutDelay = Math.min(timeoutDelay, edgeScrollInfoX.delay);
-            let newTarget = colIndex;
-            switch (edgeScrollInfoX.direction) {
-                case "reset":
-                    colIndex = newTarget = xSplit;
-                    break;
-                case 1:
-                    colIndex = right;
-                    newTarget = left + 1;
-                    break;
-                case -1:
-                    colIndex = left - 1;
-                    while (env.model.getters.isColHidden(sheetId, colIndex)) {
-                        colIndex--;
-                    }
-                    newTarget = colIndex;
-                    break;
+        if (scrollDirection !== "vertical") {
+            const previousX = previousEvClientPosition.clientX - position.left;
+            const edgeScrollInfoX = getters.getEdgeScrollCol(x, previousX, startingX);
+            if (edgeScrollInfoX.canEdgeScroll) {
+                canEdgeScroll = true;
+                timeoutDelay = Math.min(timeoutDelay, edgeScrollInfoX.delay);
+                let newTarget = colIndex;
+                switch (edgeScrollInfoX.direction) {
+                    case "reset":
+                        colIndex = newTarget = xSplit;
+                        break;
+                    case 1:
+                        colIndex = right;
+                        newTarget = left + 1;
+                        break;
+                    case -1:
+                        colIndex = left - 1;
+                        while (env.model.getters.isColHidden(sheetId, colIndex)) {
+                            colIndex--;
+                        }
+                        newTarget = colIndex;
+                        break;
+                }
+                scrollX = getters.getColDimensions(sheetId, newTarget).start - offsetCorrectionX;
             }
-            scrollX = getters.getColDimensions(sheetId, newTarget).start - offsetCorrectionX;
         }
         const y = currentEv.clientY - position.top;
         let rowIndex = getters.getRowIndex(y);
-        const previousY = previousEvClientPosition.clientY - position.top;
-        const edgeScrollInfoY = getters.getEdgeScrollRow(y, previousY, startingY);
-        if (edgeScrollInfoY.canEdgeScroll) {
-            canEdgeScroll = true;
-            timeoutDelay = Math.min(timeoutDelay, edgeScrollInfoY.delay);
-            let newTarget = rowIndex;
-            switch (edgeScrollInfoY.direction) {
-                case "reset":
-                    rowIndex = newTarget = ySplit;
-                    break;
-                case 1:
-                    rowIndex = bottom;
-                    newTarget = top + 1;
-                    break;
-                case -1:
-                    rowIndex = top - 1;
-                    while (env.model.getters.isRowHidden(sheetId, rowIndex)) {
-                        rowIndex--;
-                    }
-                    newTarget = rowIndex;
-                    break;
+        if (scrollDirection !== "horizontal") {
+            const previousY = previousEvClientPosition.clientY - position.top;
+            const edgeScrollInfoY = getters.getEdgeScrollRow(y, previousY, startingY);
+            if (edgeScrollInfoY.canEdgeScroll) {
+                canEdgeScroll = true;
+                timeoutDelay = Math.min(timeoutDelay, edgeScrollInfoY.delay);
+                let newTarget = rowIndex;
+                switch (edgeScrollInfoY.direction) {
+                    case "reset":
+                        rowIndex = newTarget = ySplit;
+                        break;
+                    case 1:
+                        rowIndex = bottom;
+                        newTarget = top + 1;
+                        break;
+                    case -1:
+                        rowIndex = top - 1;
+                        while (env.model.getters.isRowHidden(sheetId, rowIndex)) {
+                            rowIndex--;
+                        }
+                        newTarget = rowIndex;
+                        break;
+                }
+                scrollY = env.model.getters.getRowDimensions(sheetId, newTarget).start - offsetCorrectionY;
             }
-            scrollY = env.model.getters.getRowDimensions(sheetId, newTarget).start - offsetCorrectionY;
         }
         if (!canEdgeScroll) {
             colIndex = adjustIndexWithinBounds(colIndex, x, getters.getNumberCols(sheetId) - 1);
@@ -43760,9 +44103,10 @@ function useDragAndDropBeyondTheViewport(env) {
         pointerUpCallback?.();
         cleanUp();
     };
-    const startFn = (initialPointerCoordinates, onPointerMove, onPointerUp) => {
+    const startFn = (initialPointerCoordinates, onPointerMove, onPointerUp, startScrollDirection = "all") => {
         cleanUp();
         const position = gridOverlayPosition();
+        scrollDirection = startScrollDirection;
         startingX = initialPointerCoordinates.clientX - position.left;
         startingY = initialPointerCoordinates.clientY - position.top;
         previousEvClientPosition = {
@@ -44240,7 +44584,7 @@ class GridComposer extends owl.Component {
         });
     }
     get shouldDisplayCellReference() {
-        return this.isCellReferenceVisible;
+        return !this.env.isMobile() && this.isCellReferenceVisible;
     }
     get cellReference() {
         const { col, row, sheetId } = this.composerStore.currentEditedCell;
@@ -44281,11 +44625,12 @@ class GridComposer extends owl.Component {
             onInputContextMenu: this.props.onInputContextMenu,
             composerStore: this.composerStore,
             inputStyle: `max-height: ${maxHeight}px;`,
+            inputMode: this.composerStore.editionMode === "inactive" ? "none" : undefined,
         };
     }
     get containerStyle() {
-        if (this.composerStore.editionMode === "inactive") {
-            return `z-index: -1000;`;
+        if (this.composerStore.editionMode === "inactive" || this.env.isMobile()) {
+            return `z-index: -1000; opacity: 0;`; // opacity 0 for safari on ios
         }
         const _isFormula = isFormula(this.composerStore.currentContent);
         const cell = this.env.model.getters.getActiveCell();
@@ -44314,11 +44659,13 @@ class GridComposer extends owl.Component {
          *
          * The +-1 are there to include cell borders in the composer sizing/positioning
          */
+        const minHeight = Math.min(height + 1, maxHeight);
+        const minWidth = Math.min(width + 1, maxWidth);
         return cssPropertiesToCss({
             left: `${left - 1}px`,
             top: `${top}px`,
-            "min-width": `${width + 1}px`,
-            "min-height": `${height + 1}px`,
+            "min-width": `${minWidth}px`,
+            "min-height": `${minHeight}px`,
             "max-width": `${maxWidth}px`,
             "max-height": `${maxHeight}px`,
             background,
@@ -44815,6 +45162,9 @@ class FiguresContainer extends owl.Component {
         if (!selectResult.isSuccessful) {
             return;
         }
+        if (this.env.isMobile()) {
+            return;
+        }
         const sheetId = this.env.model.getters.getActiveSheetId();
         const initialMousePosition = { x: ev.clientX, y: ev.clientY };
         const initialScrollPosition = this.env.model.getters.getActiveSheetScrollInfo();
@@ -45107,78 +45457,6 @@ class GridAddRowsFooter extends owl.Component {
     }
 }
 
-class GridCellIcon extends owl.Component {
-    static template = "o-spreadsheet-GridCellIcon";
-    static props = {
-        icon: Object,
-        verticalAlign: { type: String, optional: true },
-        slots: Object,
-    };
-    get iconStyle() {
-        const cellPosition = this.props.icon.position;
-        const merge = this.env.model.getters.getMerge(cellPosition);
-        const zone = merge || positionToZone(cellPosition);
-        const rect = this.env.model.getters.getVisibleRectWithoutHeaders(zone);
-        const x = this.getIconHorizontalPosition(rect, cellPosition);
-        const y = this.getIconVerticalPosition(rect, cellPosition);
-        return cssPropertiesToCss({
-            top: `${y}px`,
-            left: `${x}px`,
-            width: `${this.props.icon.size}px`,
-            height: `${this.props.icon.size}px`,
-        });
-    }
-    getIconVerticalPosition(rect, cellPosition) {
-        const start = rect.y;
-        const end = rect.y + rect.height;
-        const cell = this.env.model.getters.getCell(cellPosition);
-        const align = this.props.verticalAlign || cell?.style?.verticalAlign || DEFAULT_VERTICAL_ALIGN;
-        switch (align) {
-            case "bottom":
-                return end - GRID_ICON_MARGIN - GRID_ICON_EDGE_LENGTH;
-            case "top":
-                return start + GRID_ICON_MARGIN;
-            default:
-                const centeringOffset = Math.floor((end - start - GRID_ICON_EDGE_LENGTH) / 2);
-                return end - GRID_ICON_EDGE_LENGTH - centeringOffset;
-        }
-    }
-    getIconHorizontalPosition(rect, cellPosition) {
-        const start = rect.x;
-        const end = rect.x + rect.width;
-        const cell = this.env.model.getters.getCell(cellPosition);
-        const evaluatedCell = this.env.model.getters.getEvaluatedCell(cellPosition);
-        const align = this.props.icon.horizontalAlign || cell?.style?.align || evaluatedCell.defaultAlign;
-        switch (align) {
-            case "right":
-                return end - this.props.icon.size - this.props.icon.margin;
-            case "left":
-                return start + this.props.icon.margin;
-            default:
-                const centeringOffset = Math.floor((end - start - this.props.icon.size) / 2);
-                return end - this.props.icon.size - centeringOffset;
-        }
-    }
-    isPositionVisible(position) {
-        const rect = this.env.model.getters.getVisibleRect(positionToZone(position));
-        return !(rect.width === 0 || rect.height === 0);
-    }
-}
-
-class GridCellIconOverlay extends owl.Component {
-    static template = "o-spreadsheet-GridCellIconOverlay";
-    static props = {};
-    static components = { GridCellIcon };
-    get icons() {
-        const icons = [];
-        for (const position of this.env.model.getters.getVisibleCellPositions()) {
-            const cellIcons = this.env.model.getters.getCellIcons(position);
-            icons.push(...cellIcons.filter((icon) => icon.component));
-        }
-        return icons;
-    }
-}
-
 /**
  * Manages an event listener on a ref. Useful for hooks that want to manage
  * event listeners, especially more than one. Prefer using t-on directly in
@@ -45267,7 +45545,7 @@ class PaintFormatStore extends SpreadsheetStore {
             return [];
         }
         return data.zones.map((zone) => ({
-            zone,
+            range: this.model.getters.getRangeFromZone(data.sheetId, zone),
             color: SELECTION_BORDER_COLOR,
             dashed: true,
             sheetId: data.sheetId,
@@ -45290,7 +45568,7 @@ class HoveredTableStore extends SpreadsheetStore {
         }
     }
     hover(position) {
-        if (position.col === this.col && position.row === this.row) {
+        if (!this.getters.isDashboard() || (position.col === this.col && position.row === this.row)) {
             return "noStateChange";
         }
         this.col = position.col;
@@ -45324,6 +45602,14 @@ class HoveredTableStore extends SpreadsheetStore {
     }
 }
 
+class HoveredIconStore extends SpreadsheetStore {
+    mutators = ["setHoveredIcon"];
+    hoveredIcon = undefined;
+    setHoveredIcon(icon) {
+        this.hoveredIcon = icon;
+    }
+}
+
 const CURSOR_SVG = /*xml*/ `
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="16"><path d="M6.5.4c1.3-.8 2.9-.1 3.8 1.4l2.9 5.1c.2.4.9 1.6-.4 2.3l-1.6.9 1.8 3.1c.2.4.1 1-.2 1.2l-1.6 1c-.3.1-.9 0-1.1-.4l-1.8-3.1-1.6 1c-.6.4-1.7 0-2.2-.8L0 4.3"/><path fill="#fff" d="M9.1 2a1.4 1.1 60 0 0-1.7-.6L5.5 2.5l.9 1.6-1 .6-.9-1.6-.6.4 1.8 3.1-1.3.7-1.8-3.1-1 .6 3.8 6.6 6.8-3.98M3.9 8.8 10.82 5l.795 1.4-6.81 3.96"/></svg>
 `;
@@ -45395,10 +45681,11 @@ function useCellHovered(env, gridRef) {
             return pause();
         }
     }
-    useRefListener(gridRef, "pointermove", updateMousePosition);
+    useRefListener(gridRef, "pointermove", (ev) => !env.isMobile() && updateMousePosition(ev));
     useRefListener(gridRef, "mouseleave", onMouseLeave);
     useRefListener(gridRef, "mouseenter", resume);
     useRefListener(gridRef, "pointerdown", recompute);
+    useRefListener(gridRef, "pointerdown", (ev) => env.isMobile() && updateMousePosition(ev));
     owl.useExternalListener(window, "click", handleGlobalClick);
     function handleGlobalClick(e) {
         const target = e.target;
@@ -45427,11 +45714,11 @@ class GridOverlay extends owl.Component {
         onGridMoved: Function,
         gridOverlayDimensions: String,
         slots: { type: Object, optional: true },
+        getGridSize: Function,
     };
     static components = {
         FiguresContainer,
         GridAddRowsFooter,
-        GridCellIconOverlay,
     };
     static defaultProps = {
         onCellDoubleClicked: () => { },
@@ -45443,15 +45730,17 @@ class GridOverlay extends owl.Component {
     gridOverlay = owl.useRef("gridOverlay");
     cellPopovers;
     paintFormatStore;
+    hoveredIconStore;
     setup() {
         useCellHovered(this.env, this.gridOverlay);
         const resizeObserver = new ResizeObserver(() => {
             const boundingRect = this.gridOverlayEl.getBoundingClientRect();
+            const { width, height } = this.props.getGridSize();
             this.props.onGridResized({
                 x: boundingRect.left,
                 y: boundingRect.top,
-                height: this.gridOverlayEl.clientHeight,
-                width: this.gridOverlayEl.clientWidth,
+                height: height,
+                width: width,
             });
         });
         owl.onMounted(() => {
@@ -45462,6 +45751,7 @@ class GridOverlay extends owl.Component {
         });
         this.cellPopovers = useStore(CellPopoverStore);
         this.paintFormatStore = useStore(PaintFormatStore);
+        this.hoveredIconStore = useStore(HoveredIconStore);
     }
     get gridOverlayEl() {
         if (!this.gridOverlay.el) {
@@ -45470,26 +45760,59 @@ class GridOverlay extends owl.Component {
         return this.gridOverlay.el;
     }
     get style() {
-        return this.props.gridOverlayDimensions;
+        return (this.props.gridOverlayDimensions +
+            cssPropertiesToCss({ cursor: this.hoveredIconStore.hoveredIcon ? "pointer" : "default" }));
     }
     get isPaintingFormat() {
         return this.paintFormatStore.isActive;
     }
-    onMouseDown(ev) {
-        if (ev.button > 0) {
+    onPointerMove(ev) {
+        if (this.env.isMobile()) {
+            return;
+        }
+        const icon = this.getInteractiveIconAtEvent(ev);
+        const hoveredIcon = icon?.type ? { id: icon.type, position: icon.position } : undefined;
+        if (!deepEquals(hoveredIcon, this.hoveredIconStore.hoveredIcon)) {
+            this.hoveredIconStore.setHoveredIcon(hoveredIcon);
+        }
+    }
+    onPointerDown(ev) {
+        if (ev.button > 0 || this.env.isMobile()) {
             // not main button, probably a context menu
             return;
         }
-        if (ev.target === this.gridOverlay.el && this.cellPopovers.isOpen) {
-            this.cellPopovers.close();
+        this.onCellClicked(ev);
+    }
+    onClick(ev) {
+        if (ev.button > 0 || !this.env.isMobile()) {
+            // not main button, probably a context menu
+            return;
         }
+        this.onCellClicked(ev);
+    }
+    onCellClicked(ev) {
+        const openedPopover = this.cellPopovers.persistentCellPopover;
         const [col, row] = this.getCartesianCoordinates(ev);
         this.props.onCellClicked(col, row, {
             expandZone: ev.shiftKey,
             addZone: isCtrlKey(ev),
         }, ev);
+        const clickedIcon = this.getInteractiveIconAtEvent(ev);
+        if (clickedIcon?.onClick) {
+            clickedIcon.onClick(clickedIcon.position, this.env);
+        }
+        if (ev.target === this.gridOverlay.el &&
+            this.cellPopovers.isOpen &&
+            deepEquals(openedPopover, this.cellPopovers.persistentCellPopover)) {
+            // Only close the popover if props.click/icon.click didn't open a new one
+            this.cellPopovers.close();
+            return;
+        }
     }
     onDoubleClick(ev) {
+        if (this.getInteractiveIconAtEvent(ev)) {
+            return;
+        }
         const [col, row] = this.getCartesianCoordinates(ev);
         this.props.onCellDoubleClicked(col, row);
     }
@@ -45505,6 +45828,24 @@ class GridOverlay extends owl.Component {
         const rowIndex = this.env.model.getters.getRowIndex(y);
         return [colIndex, rowIndex];
     }
+    getInteractiveIconAtEvent(ev) {
+        const gridOverLayRect = getRefBoundingRect(this.gridOverlay);
+        const gridOffset = this.env.model.getters.getGridOffset();
+        const x = ev.clientX - gridOverLayRect.x + gridOffset.x;
+        const y = ev.clientY - gridOverLayRect.y + gridOffset.y;
+        const [col, row] = this.getCartesianCoordinates(ev);
+        const sheetId = this.env.model.getters.getActiveSheetId();
+        let position = { col, row, sheetId };
+        const merge = this.env.model.getters.getMerge(position);
+        if (merge) {
+            position = { col: merge.left, row: merge.top, sheetId };
+        }
+        const icons = this.env.model.getters.getCellIcons(position);
+        const icon = icons.find((icon) => {
+            return isPointInsideRect(x, y, this.env.model.getters.getCellIconRect(icon));
+        });
+        return icon?.onClick ? icon : undefined;
+    }
 }
 
 class GridPopover extends owl.Component {
@@ -45665,6 +46006,9 @@ class AbstractResizer extends owl.Component {
         this.state.waitingForMove = false;
     }
     onMouseMove(ev) {
+        if (this.env.isMobile()) {
+            return;
+        }
         if (this.state.isResizing || this.state.isMoving || this.state.isSelecting) {
             return;
         }
@@ -45709,7 +46053,21 @@ class AbstractResizer extends owl.Component {
         };
         startDnd(onMouseMove, onMouseUp);
     }
+    onClick(ev) {
+        if (!this.env.isMobile()) {
+            return;
+        }
+        if (ev.button > 0) {
+            // not main button, probably a context menu
+            return;
+        }
+        const index = this._getElementIndex(this._getEvOffset(ev));
+        this._selectElement(index, false);
+    }
     select(ev) {
+        if (this.env.isMobile()) {
+            return;
+        }
         if (ev.button > 0) {
             // not main button, probably a context menu
             return;
@@ -45778,6 +46136,9 @@ class AbstractResizer extends owl.Component {
         this.dragNDropGrid.start(ev, mouseMoveMovement, mouseUpMovement);
     }
     startSelection(ev, index) {
+        if (this.env.isMobile()) {
+            return;
+        }
         this.state.isSelecting = true;
         if (ev.shiftKey) {
             this._increaseSelection(index);
@@ -46223,11 +46584,13 @@ class GridRenderer {
     renderer;
     fingerprints;
     hoveredTables;
+    hoveredIcon;
     constructor(get) {
         this.getters = get(ModelStore).getters;
         this.renderer = get(RendererStore);
         this.fingerprints = get(FormulaFingerprintStore);
         this.hoveredTables = get(HoveredTableStore);
+        this.hoveredIcon = get(HoveredIconStore);
         this.renderer.register(this);
     }
     get renderingLayers() {
@@ -46464,7 +46827,7 @@ class GridRenderer {
                 // compute vertical align start point parameter:
                 const textLineHeight = computeTextFontSizeInPixels(style);
                 const numberOfLines = box.content.textLines.length;
-                let y = this.computeTextYCoordinate(box, textLineHeight, numberOfLines);
+                let y = this.getters.computeTextYCoordinate(box, textLineHeight, style.verticalAlign, numberOfLines);
                 // use the horizontal and the vertical start points to:
                 // fill text / fill strikethrough / fill underline
                 for (const brokenLine of box.content.textLines) {
@@ -46481,7 +46844,12 @@ class GridRenderer {
         const { ctx } = renderingContext;
         for (const box of boxes) {
             for (const icon of Object.values(box.icons)) {
-                if (!icon || !icon.svg) {
+                if (!icon) {
+                    continue;
+                }
+                const isHovered = deepEquals({ id: icon.type, position: icon.position }, this.hoveredIcon.hoveredIcon);
+                const svg = isHovered ? icon.hoverSvg || icon.svg : icon.svg;
+                if (!svg) {
                     continue;
                 }
                 ctx.save();
@@ -46489,46 +46857,17 @@ class GridRenderer {
                 ctx.rect(box.x, box.y, box.width, box.height);
                 ctx.clip();
                 const iconSize = icon.size;
-                const iconY = this.computeTextYCoordinate(box, iconSize);
-                const svg = icon.svg;
-                let x;
-                if (icon.horizontalAlign === "left") {
-                    x = box.x + icon.margin;
-                }
-                else if (icon.horizontalAlign === "right") {
-                    x = box.x + box.width - iconSize - icon.margin;
-                }
-                else {
-                    x = box.x + (box.width - iconSize) / 2;
-                }
-                ctx.translate(x, iconY);
+                const { x, y } = this.getters.getCellIconRect(icon);
+                ctx.translate(x, y);
                 ctx.scale(iconSize / svg.width, iconSize / svg.height);
-                ctx.fillStyle = svg.fillColor;
-                ctx.fill(new Path2D(svg.path));
+                for (const path of svg.paths) {
+                    ctx.fillStyle = path.fillColor;
+                    ctx.fill(getPath2D(path.path));
+                }
                 ctx.restore();
             }
         }
     }
-    /** Computes the vertical start point from which a text line should be draw.
-     *
-     * Note that in case the cell does not have enough spaces to display its text lines,
-     * (wrapping cell case) then the vertical align should be at the top.
-     * */
-    computeTextYCoordinate(box, textLineHeight, numberOfLines = 1) {
-        const y = box.y + 1;
-        const textHeight = computeTextLinesHeight(textLineHeight, numberOfLines);
-        const hasEnoughSpaces = box.height > textHeight + MIN_CELL_TEXT_MARGIN * 2;
-        const verticalAlign = box.verticalAlign || DEFAULT_VERTICAL_ALIGN;
-        if (hasEnoughSpaces) {
-            if (verticalAlign === "middle") {
-                return y + (box.height - textHeight) / 2;
-            }
-            if (verticalAlign === "bottom") {
-                return y + box.height - textHeight - MIN_CELL_TEXT_MARGIN;
-            }
-        }
-        return y + MIN_CELL_TEXT_MARGIN;
-    }
     drawHeaders(renderingContext) {
         const { ctx, thinLineWidth } = renderingContext;
         const visibleCols = this.getters.getSheetViewVisibleCols();
@@ -46965,6 +47304,9 @@ function useTouchScroll(ref, updateScroll, canMoveUp) {
         const deltaX = lastX - clientX;
         const deltaY = lastY - clientY;
         const elapsedTime = currentTime - lastTime;
+        if (!elapsedTime) {
+            return;
+        }
         velocityX = deltaX / elapsedTime;
         velocityY = deltaY / elapsedTime;
         lastX = clientX;
@@ -46985,6 +47327,11 @@ function useTouchScroll(ref, updateScroll, canMoveUp) {
     function onTouchEnd(ev) {
         isMouseDown = false;
         lastX = lastY = 0;
+        if (resetTimeout) {
+            clearTimeout(resetTimeout);
+        }
+        velocityX *= 1.2;
+        velocityY *= 1.2;
         requestAnimationFrame(scroll);
     }
     function scroll() {
@@ -47069,12 +47416,16 @@ class Border extends owl.Component {
     }
 }
 
+const MOBILE_HANDLER_WIDTH = 40;
 css /* scss */ `
   .o-corner {
     position: absolute;
-    height: 8px;
-    width: 8px;
+  }
+
+  .o-corner-button {
     border: 1px solid white;
+    height: ${AUTOFILL_EDGE_LENGTH}px;
+    width: ${AUTOFILL_EDGE_LENGTH}px;
   }
   .o-corner-nw,
   .o-corner-se {
@@ -47101,34 +47452,61 @@ class Corner extends owl.Component {
         isResizing: Boolean,
         onResizeHighlight: Function,
     };
-    isTop = this.props.orientation[0] === "n";
-    isLeft = this.props.orientation[1] === "w";
-    get style() {
+    dirX;
+    dirY;
+    setup() {
+        const { dirX, dirY } = orientationToDir(this.props.orientation);
+        this.dirX = dirX;
+        this.dirY = dirY;
+    }
+    get handlerStyle() {
         const z = this.props.zone;
-        const col = this.isLeft ? z.left : z.right;
-        const row = this.isTop ? z.top : z.bottom;
         const rect = this.env.model.getters.getVisibleRect({
-            left: col,
-            right: col,
-            top: row,
-            bottom: row,
+            left: this.dirX === 1 ? z.right : z.left,
+            right: this.dirX === -1 ? z.left : z.right,
+            top: this.dirY === 1 ? z.bottom : z.top,
+            bottom: this.dirY === -1 ? z.top : z.bottom,
         });
         // Don't show if not visible in the viewport
         if (rect.width * rect.height === 0) {
-            return `display:none`;
+            return `display: none !important;`;
+        }
+        const leftValue = rect.x + rect.width / 2 + (this.dirX * rect.width) / 2;
+        const topValue = rect.y + rect.height / 2 + (this.dirY * rect.height) / 2;
+        const edgeLength = this.getHandlerEdgeLength();
+        const css = {
+            left: `${leftValue - edgeLength / 2}px`,
+            top: `${topValue - edgeLength / 2}px`,
+            height: `${edgeLength}px`,
+            width: `${edgeLength}px`,
+        };
+        if (this.env.isMobile()) {
+            css["border-radius"] = `${edgeLength / 2}px`;
         }
-        const leftValue = this.isLeft ? rect.x : rect.x + rect.width;
-        const topValue = this.isTop ? rect.y : rect.y + rect.height;
-        return cssPropertiesToCss({
-            left: `${leftValue - AUTOFILL_EDGE_LENGTH / 2}px`,
-            top: `${topValue - AUTOFILL_EDGE_LENGTH / 2}px`,
+        return cssPropertiesToCss(css);
+    }
+    getHandlerEdgeLength() {
+        return this.env.isMobile() ? MOBILE_HANDLER_WIDTH : AUTOFILL_EDGE_LENGTH;
+    }
+    get buttonLook() {
+        const css = {
             "background-color": this.props.color,
-        });
+            cursor: `${this.props.orientation}-resize`,
+        };
+        if (this.env.isMobile()) {
+            css["border-radius"] = `${AUTOFILL_EDGE_LENGTH / 2}px`;
+        }
+        return cssPropertiesToCss(css);
     }
     onMouseDown(ev) {
-        this.props.onResizeHighlight(ev, this.isLeft, this.isTop);
+        this.props.onResizeHighlight(ev, this.dirX, this.dirY);
     }
 }
+function orientationToDir(or) {
+    const dirX = or.includes("w") ? -1 : or.includes("e") ? 1 : 0;
+    const dirY = or.includes("n") ? -1 : or.includes("s") ? 1 : 0;
+    return { dirX, dirY };
+}
 
 css /*SCSS*/ `
   .o-highlight {
@@ -47138,7 +47516,7 @@ css /*SCSS*/ `
 class Highlight extends owl.Component {
     static template = "o-spreadsheet-Highlight";
     static props = {
-        zone: Object,
+        range: Object,
         color: String,
     };
     static components = {
@@ -47149,26 +47527,49 @@ class Highlight extends owl.Component {
         shiftingMode: "none",
     });
     dragNDropGrid = useDragAndDropBeyondTheViewport(this.env);
-    onResizeHighlight(ev, isLeft, isTop) {
+    get cornerOrientations() {
+        if (!this.env.isMobile()) {
+            return ["nw", "ne", "sw", "se"];
+        }
+        const z = this.props.range.unboundedZone;
+        if (z.bottom === undefined) {
+            return ["w", "e"];
+        }
+        else if (z.right === undefined) {
+            return ["n", "s"];
+        }
+        else {
+            return ["nw", "se"];
+        }
+    }
+    onResizeHighlight(ev, dirX, dirY) {
         const activeSheetId = this.env.model.getters.getActiveSheetId();
         this.highlightState.shiftingMode = "isResizing";
-        const z = this.props.zone;
-        const pivotCol = isLeft ? z.right : z.left;
-        const pivotRow = isTop ? z.bottom : z.top;
-        let lastCol = isLeft ? z.left : z.right;
-        let lastRow = isTop ? z.top : z.bottom;
+        const z = this.props.range.zone;
+        const pivotCol = dirX === 1 ? z.left : z.right;
+        const pivotRow = dirY === 1 ? z.top : z.bottom;
+        let lastCol = dirX === 1 ? z.right : z.left;
+        let lastRow = dirY === 1 ? z.bottom : z.top;
         let currentZone = z;
+        let scrollDirection = "all";
+        if (this.env.isMobile()) {
+            scrollDirection = dirX === 0 ? "vertical" : dirY === 0 ? "horizontal" : "all";
+        }
         this.env.model.dispatch("START_CHANGE_HIGHLIGHT", { zone: currentZone });
         const mouseMove = (col, row) => {
             if (lastCol !== col || lastRow !== row) {
-                lastCol = clip(col === -1 ? lastCol : col, 0, this.env.model.getters.getNumberCols(activeSheetId) - 1);
-                lastRow = clip(row === -1 ? lastRow : row, 0, this.env.model.getters.getNumberRows(activeSheetId) - 1);
-                const newZone = {
-                    left: Math.min(pivotCol, lastCol),
-                    top: Math.min(pivotRow, lastRow),
-                    right: Math.max(pivotCol, lastCol),
-                    bottom: Math.max(pivotRow, lastRow),
-                };
+                let { left, right, top, bottom } = currentZone;
+                if (scrollDirection !== "horizontal") {
+                    lastRow = lastRow = clip(row === -1 ? lastRow : row, 0, this.env.model.getters.getNumberRows(activeSheetId) - 1);
+                    top = Math.min(pivotRow, lastRow);
+                    bottom = Math.max(pivotRow, lastRow);
+                }
+                if (scrollDirection !== "vertical") {
+                    lastCol = clip(col === -1 ? lastCol : col, 0, this.env.model.getters.getNumberCols(activeSheetId) - 1);
+                    left = Math.min(pivotCol, lastCol);
+                    right = Math.max(pivotCol, lastCol);
+                }
+                const newZone = { left, right, top, bottom };
                 if (!isEqual(newZone, currentZone)) {
                     this.env.model.selection.selectZone({
                         cell: { col: newZone.left, row: newZone.top },
@@ -47181,11 +47582,11 @@ class Highlight extends owl.Component {
         const mouseUp = () => {
             this.highlightState.shiftingMode = "none";
         };
-        this.dragNDropGrid.start(ev, mouseMove, mouseUp);
+        this.dragNDropGrid.start(ev, mouseMove, mouseUp, scrollDirection);
     }
     onMoveHighlight(ev) {
         this.highlightState.shiftingMode = "isMoving";
-        const z = this.props.zone;
+        const z = this.props.range.zone;
         const position = gridOverlayPosition();
         const activeSheetId = this.env.model.getters.getActiveSheetId();
         const initCol = this.env.model.getters.getColIndex(ev.clientX - position.left);
@@ -47407,6 +47808,18 @@ class VerticalScrollBar extends owl.Component {
     }
 }
 
+class Selection extends owl.Component {
+    static template = "o-spreadsheet-Selection";
+    static props = {};
+    static components = { Highlight };
+    get highlightProps() {
+        const sheetId = this.env.model.getters.getActiveSheetId();
+        const zone = this.env.model.getters.getUnboundedZone(sheetId, this.env.model.getters.getSelectedZone());
+        const range = this.env.model.getters.getRangeFromZone(sheetId, zone);
+        return { range, color: SELECTION_BORDER_COLOR };
+    }
+}
+
 class Section extends owl.Component {
     static template = "o_spreadsheet.Section";
     static props = {
@@ -48352,11 +48765,13 @@ class ColorPickerWidget extends owl.Component {
 
 css /* scss */ `
   .o-font-size-editor {
+    width: max-content !important;
     height: calc(100% - 4px);
     input.o-font-size {
       outline: none;
       height: 20px;
-      width: 23px;
+      width: 31px;
+      text-align: center;
     }
   }
   .o-text-options > div {
@@ -50500,8 +50915,7 @@ class ConditionalFormatPreview extends owl.Component {
     get highlights() {
         const sheetId = this.env.model.getters.getActiveSheetId();
         return this.props.conditionalFormat.ranges.map((range) => ({
-            sheetId,
-            zone: this.env.model.getters.getRangeFromSheetXC(sheetId, range).zone,
+            range: this.env.model.getters.getRangeFromSheetXC(sheetId, range),
             color: HIGHLIGHT_COLOR,
             fillAlpha: 0.06,
         }));
@@ -51459,8 +51873,7 @@ class DataValidationPreview extends owl.Component {
     }
     get highlights() {
         return this.props.rule.ranges.map((range) => ({
-            sheetId: this.env.model.getters.getActiveSheetId(),
-            zone: range.zone,
+            range,
             color: HIGHLIGHT_COLOR,
             fillAlpha: 0.06,
         }));
@@ -51789,13 +52202,15 @@ class FindAndReplaceStore extends SpreadsheetStore {
         if (this.selectedMatchIndex === null) {
             return;
         }
+        this.preserveSelectedMatchIndex = true;
+        this.shouldFinalizeUpdateSelection = true;
         this.model.dispatch("REPLACE_SEARCH", {
             searchString: this.toSearch,
             replaceWith: this.toReplace,
             matches: [this.searchMatches[this.selectedMatchIndex]],
             searchOptions: this.searchOptions,
         });
-        this.selectNextCell(Direction.next, { jumpToMatchSheet: true, updateSelection: true });
+        this.preserveSelectedMatchIndex = false;
     }
     /**
      * Apply the replace function to all the matches one time.
@@ -51867,8 +52282,7 @@ class FindAndReplaceStore extends SpreadsheetStore {
             const { width, height } = this.getters.getVisibleRect(zoneWithMerge);
             if (width > 0 && height > 0) {
                 highlights.push({
-                    sheetId,
-                    zone: zoneWithMerge,
+                    range: this.model.getters.getRangeFromZone(sheetId, zoneWithMerge),
                     color: FIND_AND_REPLACE_HIGHLIGHT_COLOR,
                     noBorder: index !== this.selectedMatchIndex,
                     thinLine: true,
@@ -51880,8 +52294,7 @@ class FindAndReplaceStore extends SpreadsheetStore {
             const range = this.searchOptions.specificRange;
             if (range && range.sheetId === sheetId) {
                 highlights.push({
-                    sheetId,
-                    zone: range.zone,
+                    range,
                     color: FIND_AND_REPLACE_HIGHLIGHT_COLOR,
                     noFill: true,
                     thinLine: true,
@@ -52255,7 +52668,11 @@ function getPivotHighlights(getters, pivotId) {
     const sheetId = getters.getActiveSheetId();
     const pivotCellPositions = getVisiblePivotCellPositions(getters, pivotId);
     const mergedZones = mergeContiguousZones(pivotCellPositions.map(positionToZone));
-    return mergedZones.map((zone) => ({ sheetId, zone, noFill: true, color: HIGHLIGHT_COLOR }));
+    return mergedZones.map((zone) => ({
+        range: getters.getRangeFromZone(sheetId, zone),
+        noFill: true,
+        color: HIGHLIGHT_COLOR,
+    }));
 }
 function getVisiblePivotCellPositions(getters, pivotId) {
     const positions = [];
@@ -52524,7 +52941,7 @@ class TextInput extends owl.Component {
 
 class CogWheelMenu extends owl.Component {
     static template = "o-spreadsheet-CogWheelMenu";
-    static components = { Menu };
+    static components = { MenuPopover };
     static props = {
         items: Array,
     };
@@ -53432,28 +53849,45 @@ class SpreadsheetPivotTable {
     getNumberOfDataColumns() {
         return this.columns.at(-1)?.length || 0;
     }
-    getPivotCells(includeTotal = true, includeColumnHeaders = true) {
-        const key = JSON.stringify({ includeTotal, includeColumnHeaders });
+    getSkippedRows(visibilityOptions) {
+        const skippedRows = new Set();
+        if (!visibilityOptions.displayColumnHeaders) {
+            for (let i = 0; i < this.columns.length - 1; i++) {
+                skippedRows.add(i);
+            }
+        }
+        if (!visibilityOptions.displayMeasuresRow) {
+            skippedRows.add(this.columns.length - 1);
+        }
+        return skippedRows;
+    }
+    getPivotCells(visibilityOptions = {
+        displayColumnHeaders: true,
+        displayTotals: true,
+        displayMeasuresRow: true,
+    }) {
+        const key = JSON.stringify(visibilityOptions);
         if (!this.pivotCells[key]) {
+            const { displayTotals } = visibilityOptions;
             const numberOfDataRows = this.rows.length;
             const numberOfDataColumns = this.getNumberOfDataColumns();
             let pivotHeight = this.columns.length + numberOfDataRows;
             let pivotWidth = 1 /*(row headers)*/ + numberOfDataColumns;
-            if (!includeTotal && numberOfDataRows !== 1) {
+            if (!displayTotals && numberOfDataRows !== 1) {
                 pivotHeight -= 1;
             }
-            if (!includeTotal && numberOfDataColumns !== this.measures.length) {
+            if (!displayTotals && numberOfDataColumns !== this.measures.length) {
                 pivotWidth -= this.measures.length;
             }
             const domainArray = [];
-            const startRow = includeColumnHeaders ? 0 : this.columns.length;
+            const skippedRows = this.getSkippedRows(visibilityOptions);
             for (let col = 0; col < pivotWidth; col++) {
                 domainArray.push([]);
-                for (let row = startRow; row < pivotHeight; row++) {
-                    if (!includeTotal && row === pivotHeight) {
+                for (let row = 0; row < pivotHeight; row++) {
+                    if (skippedRows.has(row)) {
                         continue;
                     }
-                    domainArray[col].push(this.getPivotCell(col, row, includeTotal));
+                    domainArray[col].push(this.getPivotCell(col, row, displayTotals));
                 }
             }
             this.pivotCells[key] = domainArray;
@@ -55094,6 +55528,7 @@ function createTableStyleContextMenuActions(env, styleId) {
             id: "editTableStyle",
             name: _t("Edit table style"),
             execute: (env) => env.openSidePanel("TableStyleEditorPanel", { styleId }),
+            isEnabled: (env) => !env.isSmall,
             icon: "o-spreadsheet-Icon.EDIT",
         },
         {
@@ -55215,7 +55650,7 @@ css /* scss */ `
 `;
 class TableStylePreview extends owl.Component {
     static template = "o-spreadsheet-TableStylePreview";
-    static components = { Menu };
+    static components = { MenuPopover };
     static props = {
         tableConfig: Object,
         tableStyle: Object,
@@ -55786,6 +56221,17 @@ sidePanelRegistry.add("PivotMeasureDisplayPanel", {
     },
 });
 
+class ScreenWidthStore {
+    mutators = ["setSmallThreshhold"];
+    _isSmallCallback = () => false;
+    get isSmall() {
+        return this._isSmallCallback();
+    }
+    setSmallThreshhold(isSmall) {
+        this._isSmallCallback = isSmall;
+    }
+}
+
 const DEFAULT_SIDE_PANEL_SIZE = 350;
 const MIN_SHEET_VIEW_WIDTH = 150;
 class SidePanelStore extends SpreadsheetStore {
@@ -55793,6 +56239,7 @@ class SidePanelStore extends SpreadsheetStore {
     initialPanelProps = {};
     componentTag = "";
     panelSize = DEFAULT_SIDE_PANEL_SIZE;
+    screenWidthStore = this.get(ScreenWidthStore);
     get isOpen() {
         if (!this.componentTag) {
             return false;
@@ -55814,6 +56261,9 @@ class SidePanelStore extends SpreadsheetStore {
         return undefined;
     }
     open(componentTag, panelProps = {}) {
+        if (this.screenWidthStore.isSmall) {
+            return;
+        }
         const state = this.computeState(componentTag, panelProps);
         if (!state.isOpen) {
             return;
@@ -55928,8 +56378,7 @@ class TableResizer extends owl.Component {
             return [];
         return [
             {
-                zone: this.state.highlightZone,
-                sheetId: this.props.table.range.sheetId,
+                range: this.env.model.getters.getRangeFromZone(this.props.table.range.sheetId, this.state.highlightZone),
                 color: COLOR,
                 noFill: true,
             },
@@ -55951,13 +56400,14 @@ class Grid extends owl.Component {
     static template = "o-spreadsheet-Grid";
     static props = {
         exposeFocus: Function,
+        getGridSize: Function,
     };
     static components = {
         GridComposer,
         GridOverlay,
         GridPopover,
         HeadersOverlay,
-        Menu,
+        MenuPopover,
         Autofill,
         ClientTag,
         Highlight,
@@ -55965,6 +56415,7 @@ class Grid extends owl.Component {
         VerticalScrollBar,
         HorizontalScrollBar,
         TableResizer,
+        Selection,
     };
     HEADER_HEIGHT = HEADER_HEIGHT;
     HEADER_WIDTH = HEADER_WIDTH;
@@ -56247,8 +56698,8 @@ class Grid extends owl.Component {
     }
     onGridResized({ height, width }) {
         this.env.model.dispatch("RESIZE_SHEETVIEW", {
-            width: width,
-            height: height,
+            width: width - HEADER_WIDTH,
+            height: height - HEADER_HEIGHT,
             gridOffsetX: HEADER_WIDTH,
             gridOffsetY: HEADER_HEIGHT,
         });
@@ -56302,6 +56753,9 @@ class Grid extends owl.Component {
         else {
             this.env.model.selection.selectCell(col, row);
         }
+        if (this.env.isMobile()) {
+            return;
+        }
         let prevCol = col;
         let prevRow = row;
         const onMouseMove = (col, row, ev) => {
@@ -56587,6 +57041,9 @@ class Grid extends owl.Component {
         const sheetId = this.env.model.getters.getActiveSheetId();
         return this.env.model.getters.getCoreTables(sheetId).filter(isStaticTable);
     }
+    get displaySelectionHandler() {
+        return this.env.isMobile() && this.composerFocusStore.activeComposer.editionMode === "inactive";
+    }
 }
 
 /**
@@ -61621,7 +62078,9 @@ class TablePlugin extends CorePlugin {
                 const ranges = cmd.ranges.map((rangeData) => this.getters.getRangeFromRangeData(rangeData));
                 const union = this.getters.getRangesUnion(ranges);
                 const mergesInTarget = this.getters.getMergesInZone(cmd.sheetId, union.zone);
-                this.dispatch("REMOVE_MERGE", { sheetId: cmd.sheetId, target: mergesInTarget });
+                if (mergesInTarget.length) {
+                    this.dispatch("REMOVE_MERGE", { sheetId: cmd.sheetId, target: mergesInTarget });
+                }
                 const id = this.consumeNextId();
                 const config = cmd.config || DEFAULT_TABLE_CONFIG;
                 const newTable = cmd.tableType === "dynamic"
@@ -61720,14 +62179,16 @@ class TablePlugin extends CorePlugin {
         const zoneToCheckIfEmpty = direction === "down"
             ? { ...zone, bottom: zone.bottom + 1, top: zone.bottom + 1 }
             : { ...zone, right: zone.right + 1, left: zone.right + 1 };
-        for (const position of positions(zoneToCheckIfEmpty)) {
-            const cellPosition = { sheetId, ...position };
-            // Since this plugin is loaded before CellPlugin, the getters still give us the old cell content
-            const cellContent = this.getters.getCell(cellPosition)?.content;
-            if (cellContent ||
-                this.getters.isInMerge(cellPosition) ||
-                this.getTablesOverlappingZones(sheetId, [positionToZone(position)]).length) {
-                return "none";
+        for (let row = zoneToCheckIfEmpty.top; row <= zoneToCheckIfEmpty.bottom; row++) {
+            for (let col = zoneToCheckIfEmpty.left; col <= zoneToCheckIfEmpty.right; col++) {
+                const cellPosition = { sheetId, col, row };
+                // Since this plugin is loaded before CellPlugin, the getters still give us the old cell content
+                const cellContent = this.getters.getCell(cellPosition)?.content;
+                if (cellContent ||
+                    this.getters.isInMerge(cellPosition) ||
+                    this.getTablesOverlappingZones(sheetId, [positionToZone(cellPosition)]).length) {
+                    return "none";
+                }
             }
         }
         return direction;
@@ -62513,7 +62974,7 @@ class PivotCorePlugin extends CorePlugin {
                 break;
             }
             case "UPDATE_PIVOT": {
-                this.history.update("pivots", cmd.pivotId, "definition", deepCopy(cmd.pivot));
+                this.history.update("pivots", cmd.pivotId, "definition", this.repairSortedColumn(deepCopy(cmd.pivot)));
                 this.compileCalculatedMeasures(cmd.pivot.measures);
                 break;
             }
@@ -62584,7 +63045,10 @@ class PivotCorePlugin extends CorePlugin {
     // Private
     // -------------------------------------------------------------------------
     addPivot(pivotId, pivot, formulaId = this.nextFormulaId.toString()) {
-        this.history.update("pivots", pivotId, { definition: deepCopy(pivot), formulaId });
+        this.history.update("pivots", pivotId, {
+            definition: this.repairSortedColumn(deepCopy(pivot)),
+            formulaId,
+        });
         this.compileCalculatedMeasures(pivot.measures);
         this.history.update("formulaIds", formulaId, pivotId);
         this.history.update("nextFormulaId", this.nextFormulaId + 1);
@@ -62673,6 +63137,7 @@ class PivotCorePlugin extends CorePlugin {
         }
     }
     checkSortedColumnInMeasures(definition) {
+        definition = this.repairSortedColumn(definition);
         const measures = definition.measures.map((measure) => measure.id);
         if (definition.sortedColumn && !measures.includes(definition.sortedColumn.measure)) {
             return "InvalidDefinition" /* CommandResult.InvalidDefinition */;
@@ -62686,6 +63151,26 @@ class PivotCorePlugin extends CorePlugin {
         }
         return "Success" /* CommandResult.Success */;
     }
+    repairSortedColumn(definition) {
+        if (definition.sortedColumn) {
+            // Fix for an upgrade issue: the sortedColumn measure was not updated
+            // from using fieldName to using id. If the sortedColumn measure matches
+            // a measure fieldName in the definition, update it to use the measure's id instead
+            // of its fieldName.
+            // TODO: add an upgrade step to fix this in master and remove this code
+            const sortedMeasure = definition.measures.find((measure) => measure.fieldName === definition.sortedColumn?.measure);
+            if (sortedMeasure) {
+                return {
+                    ...definition,
+                    sortedColumn: {
+                        ...definition.sortedColumn,
+                        measure: sortedMeasure.id,
+                    },
+                };
+            }
+        }
+        return definition;
+    }
     // ---------------------------------------------------------------------
     // Import/Export
     // ---------------------------------------------------------------------
@@ -65553,186 +66038,6 @@ class EvaluationDataValidationPlugin extends CoreViewPlugin {
     }
 }
 
-const MARGIN = (GRID_ICON_EDGE_LENGTH - CHECKBOX_WIDTH) / 2;
-css /* scss */ `
-  .o-dv-checkbox {
-    margin: ${MARGIN}px;
-    /* required to prevent the checkbox position to be sensible to the font-size (affects Firefox) */
-    position: absolute;
-  }
-`;
-class DataValidationCheckbox extends owl.Component {
-    static template = "o-spreadsheet-DataValidationCheckbox";
-    static components = {
-        Checkbox,
-    };
-    static props = {
-        cellPosition: Object,
-    };
-    onCheckboxChange(value) {
-        const { sheetId, col, row } = this.props.cellPosition;
-        const cellContent = value ? "TRUE" : "FALSE";
-        this.env.model.dispatch("UPDATE_CELL", { sheetId, col, row, content: cellContent });
-    }
-    get checkBoxValue() {
-        return !!this.env.model.getters.getEvaluatedCell(this.props.cellPosition).value;
-    }
-    get isDisabled() {
-        const cell = this.env.model.getters.getCell(this.props.cellPosition);
-        return this.env.model.getters.isReadonly() || !!cell?.isFormula;
-    }
-}
-
-const ICON_WIDTH = 13;
-css /* scss */ `
-  .o-dv-list-icon {
-    color: ${TEXT_BODY_MUTED};
-    border-radius: 1px;
-    height: ${GRID_ICON_EDGE_LENGTH}px;
-    width: ${GRID_ICON_EDGE_LENGTH}px;
-
-    &:hover {
-      color: #ffffff;
-      background-color: ${TEXT_BODY_MUTED};
-    }
-
-    svg {
-      width: ${ICON_WIDTH}px;
-      height: ${ICON_WIDTH}px;
-    }
-  }
-`;
-class DataValidationListIcon extends owl.Component {
-    static template = "o-spreadsheet-DataValidationListIcon";
-    static props = {
-        cellPosition: Object,
-    };
-    onClick() {
-        const { col, row } = this.props.cellPosition;
-        this.env.model.selection.selectCell(col, row);
-        this.env.startCellEdition();
-    }
-}
-
-css /* scss */ `
-  .o-filter-icon {
-    color: ${FILTERS_COLOR};
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: ${GRID_ICON_EDGE_LENGTH}px;
-    height: ${GRID_ICON_EDGE_LENGTH}px;
-
-    &:hover {
-      background: ${FILTERS_COLOR};
-      color: #fff;
-    }
-
-    &.o-high-contrast {
-      color: #defade;
-    }
-    &.o-high-contrast:hover {
-      color: ${FILTERS_COLOR};
-      background: #fff;
-    }
-  }
-  .o-filter-icon:hover {
-    background: ${FILTERS_COLOR};
-    color: #fff;
-  }
-`;
-class FilterIcon extends owl.Component {
-    static template = "o-spreadsheet-FilterIcon";
-    static props = {
-        cellPosition: Object,
-    };
-    cellPopovers;
-    setup() {
-        this.cellPopovers = useStore(CellPopoverStore);
-    }
-    onClick() {
-        const position = this.props.cellPosition;
-        const activePopover = this.cellPopovers.persistentCellPopover;
-        const { col, row } = position;
-        if (activePopover.isOpen &&
-            activePopover.col === col &&
-            activePopover.row === row &&
-            activePopover.type === "FilterMenu") {
-            this.cellPopovers.close();
-            return;
-        }
-        this.cellPopovers.open({ col, row }, "FilterMenu");
-    }
-    get isFilterActive() {
-        return this.env.model.getters.isFilterActive(this.props.cellPosition);
-    }
-    get iconClass() {
-        const cellStyle = this.env.model.getters.getCellComputedStyle(this.props.cellPosition);
-        const luminance = relativeLuminance(cellStyle.fillColor || "#fff");
-        return luminance < 0.45 ? "o-high-contrast" : "";
-    }
-}
-
-css /* scss */ `
-  .o-spreadsheet {
-    .o-pivot-collapse-icon {
-      cursor: pointer;
-      width: 11px;
-      height: 11px;
-      border: 1px solid #777;
-      background-color: #eee;
-      margin: 3px 0 3px 6px;
-
-      .o-icon {
-        width: 5px;
-        height: 5px;
-      }
-    }
-  }
-`;
-class PivotCollapseIcon extends owl.Component {
-    static template = "o-spreadsheet-PivotCollapseIcon";
-    static props = {
-        cellPosition: Object,
-    };
-    onClick() {
-        const pivotCell = this.env.model.getters.getPivotCellFromPosition(this.props.cellPosition);
-        const pivotId = this.env.model.getters.getPivotIdFromPosition(this.props.cellPosition);
-        if (!pivotId || pivotCell.type !== "HEADER") {
-            return;
-        }
-        const definition = this.env.model.getters.getPivotCoreDefinition(pivotId);
-        const collapsedDomains = definition.collapsedDomains?.[pivotCell.dimension]
-            ? [...definition.collapsedDomains[pivotCell.dimension]]
-            : [];
-        const index = collapsedDomains.findIndex((domain) => deepEquals(domain, pivotCell.domain));
-        if (index !== -1) {
-            collapsedDomains.splice(index, 1);
-        }
-        else {
-            collapsedDomains.push(pivotCell.domain);
-        }
-        const newDomains = definition.collapsedDomains
-            ? { ...definition.collapsedDomains }
-            : { COL: [], ROW: [] };
-        newDomains[pivotCell.dimension] = collapsedDomains;
-        this.env.model.dispatch("UPDATE_PIVOT", {
-            pivotId,
-            pivot: { ...definition, collapsedDomains: newDomains },
-        });
-    }
-    get isCollapsed() {
-        const pivotCell = this.env.model.getters.getPivotCellFromPosition(this.props.cellPosition);
-        const pivotId = this.env.model.getters.getPivotIdFromPosition(this.props.cellPosition);
-        if (!pivotId || pivotCell.type !== "HEADER") {
-            return false;
-        }
-        const definition = this.env.model.getters.getPivotCoreDefinition(pivotId);
-        const domains = definition.collapsedDomains?.[pivotCell.dimension] ?? [];
-        return domains?.some((domain) => deepEquals(domain, pivotCell.domain));
-    }
-}
-
 /**
  * Registry to draw icons on cells
  */
@@ -65740,14 +66045,25 @@ const iconsOnCellRegistry = new Registry();
 iconsOnCellRegistry.add("data_validation_checkbox", (getters, position) => {
     const hasIcon = getters.isCellValidCheckbox(position);
     if (hasIcon) {
+        const value = !!getters.getEvaluatedCell(position).value;
         return {
-            svg: undefined,
+            svg: value ? CHECKBOX_CHECKED : CHECKBOX_UNCHECKED,
+            hoverSvg: value ? CHECKBOX_CHECKED : CHECKBOX_UNCHECKED_HOVERED,
             priority: 2,
             horizontalAlign: "center",
             size: GRID_ICON_EDGE_LENGTH,
             margin: GRID_ICON_MARGIN,
-            component: DataValidationCheckbox,
             position,
+            type: "data_validation_checkbox",
+            onClick: (position, env) => {
+                const cell = env.model.getters.getCell(position);
+                const isDisabled = env.model.getters.isReadonly() || !!cell?.isFormula;
+                if (isDisabled) {
+                    return;
+                }
+                const cellContent = value ? "FALSE" : "TRUE";
+                env.model.dispatch("UPDATE_CELL", { ...position, content: cellContent });
+            },
         };
     }
     return undefined;
@@ -65756,13 +66072,19 @@ iconsOnCellRegistry.add("data_validation_list_icon", (getters, position) => {
     const hasIcon = !getters.isReadonly() && getters.cellHasListDataValidationIcon(position);
     if (hasIcon) {
         return {
-            svg: undefined,
+            svg: CARET_DOWN,
+            hoverSvg: HOVERED_CARET_DOWN,
             priority: 2,
             horizontalAlign: "right",
             size: GRID_ICON_EDGE_LENGTH,
             margin: GRID_ICON_MARGIN,
-            component: DataValidationListIcon,
             position,
+            onClick: (position, env) => {
+                const { col, row } = position;
+                env.model.selection.selectCell(col, row);
+                env.startCellEdition();
+            },
+            type: "data_validation_list_icon",
         };
     }
     return undefined;
@@ -65770,14 +66092,30 @@ iconsOnCellRegistry.add("data_validation_list_icon", (getters, position) => {
 iconsOnCellRegistry.add("filter_icon", (getters, position) => {
     const hasIcon = getters.isFilterHeader(position);
     if (hasIcon) {
+        const isFilterActive = getters.isFilterActive(position);
+        const cellStyle = getters.getCellComputedStyle(position);
+        const isHighContrast = relativeLuminance(cellStyle.fillColor || "#fff") < 0.45;
         return {
-            svg: undefined,
+            type: "filter_icon",
+            svg: getDataFilterIcon(isFilterActive, isHighContrast, false),
+            hoverSvg: getDataFilterIcon(isFilterActive, isHighContrast, true),
             priority: 3,
             horizontalAlign: "right",
             size: GRID_ICON_EDGE_LENGTH,
             margin: GRID_ICON_MARGIN,
-            component: FilterIcon,
             position,
+            onClick: (position, env) => {
+                const cellPopovers = env.getStore(CellPopoverStore);
+                const activePopover = cellPopovers.persistentCellPopover;
+                if (activePopover.isOpen &&
+                    activePopover.col === position.col &&
+                    activePopover.row === position.row &&
+                    activePopover.type === "FilterMenu") {
+                    cellPopovers.close();
+                    return;
+                }
+                cellPopovers.open(position, "FilterMenu");
+            },
         };
     }
     return undefined;
@@ -65787,6 +66125,7 @@ iconsOnCellRegistry.add("conditional_formatting", (getters, position) => {
     if (icon) {
         const style = getters.getCellStyle(position);
         return {
+            type: "conditional_formatting",
             svg: ICONS[icon].svg,
             priority: 1,
             horizontalAlign: "left",
@@ -65807,23 +66146,55 @@ iconsOnCellRegistry.add("pivot_collapse", (getters, position) => {
         const definition = getters.getPivotCoreDefinition(pivotId);
         const isDashboard = getters.isDashboard();
         const fields = pivotCell.dimension === "COL" ? definition.columns : definition.rows;
-        const component = !isDashboard && pivotCell.domain.length !== fields.length ? PivotCollapseIcon : undefined;
+        const hasIcon = !isDashboard && pivotCell.domain.length !== fields.length;
+        const domains = definition.collapsedDomains?.[pivotCell.dimension] ?? [];
+        const isCollapsed = domains.some((domain) => deepEquals(domain, pivotCell.domain));
+        const indent = pivotCell.dimension === "ROW" ? (pivotCell.domain.length - 1) * PIVOT_INDENT : 0;
         return {
+            type: "pivot_collapse",
             priority: 4,
             horizontalAlign: "left",
-            size: !!component || (!isDashboard && pivotCell.dimension === "ROW" && definition.rows.length > 1)
-                ? GRID_ICON_EDGE_LENGTH
+            size: hasIcon || (!isDashboard && pivotCell.dimension === "ROW" && definition.rows.length > 1)
+                ? PIVOT_COLLAPSE_ICON_SIZE
                 : 0,
-            margin: pivotCell.dimension === "ROW" ? (pivotCell.domain.length - 1) * PIVOT_INDENT : 0,
-            component,
+            margin: hasIcon ? GRID_ICON_MARGIN * 2 + indent : indent,
+            svg: hasIcon ? getPivotIconSvg(isCollapsed, false) : undefined,
+            hoverSvg: hasIcon ? getPivotIconSvg(isCollapsed, true) : undefined,
             position,
+            onClick: togglePivotCollapse,
         };
     }
     return undefined;
 });
+function togglePivotCollapse(position, env) {
+    const pivotCell = env.model.getters.getPivotCellFromPosition(position);
+    const pivotId = env.model.getters.getPivotIdFromPosition(position);
+    if (!pivotId || pivotCell.type !== "HEADER") {
+        return;
+    }
+    const definition = env.model.getters.getPivotCoreDefinition(pivotId);
+    const collapsedDomains = definition.collapsedDomains?.[pivotCell.dimension]
+        ? [...definition.collapsedDomains[pivotCell.dimension]]
+        : [];
+    const index = collapsedDomains.findIndex((domain) => deepEquals(domain, pivotCell.domain));
+    if (index !== -1) {
+        collapsedDomains.splice(index, 1);
+    }
+    else {
+        collapsedDomains.push(pivotCell.domain);
+    }
+    const newDomains = definition.collapsedDomains
+        ? { ...definition.collapsedDomains }
+        : { COL: [], ROW: [] };
+    newDomains[pivotCell.dimension] = collapsedDomains;
+    env.model.dispatch("UPDATE_PIVOT", {
+        pivotId,
+        pivot: { ...definition, collapsedDomains: newDomains },
+    });
+}
 
 class CellIconPlugin extends CoreViewPlugin {
-    static getters = ["doesCellHaveGridIcon", "getCellIcons"];
+    static getters = ["doesCellHaveGridIcon", "getCellIcons", "getCellIconRect"];
     cellIconsCache = {};
     handle(cmd) {
         if (cmd.type !== "SET_VIEWPORT_OFFSET") {
@@ -65843,6 +66214,29 @@ class CellIconPlugin extends CoreViewPlugin {
         }
         return this.cellIconsCache[position.sheetId][position.col][position.row];
     }
+    getCellIconRect(icon) {
+        const cellPosition = icon.position;
+        const merge = this.getters.getMerge(cellPosition);
+        const zone = merge || positionToZone(cellPosition);
+        const cellRect = this.getters.getRect(zone);
+        const cell = this.getters.getCell(cellPosition);
+        const x = this.getIconHorizontalPosition(cellRect, icon.horizontalAlign, icon);
+        const y = this.getters.computeTextYCoordinate(cellRect, icon.size, cell?.style?.verticalAlign);
+        return { x: x, y: y, width: icon.size, height: icon.size };
+    }
+    getIconHorizontalPosition(rect, align, icon) {
+        const start = rect.x;
+        const end = rect.x + rect.width;
+        switch (align) {
+            case "right":
+                return end - icon.margin - icon.size;
+            case "left":
+                return start + icon.margin;
+            default:
+                const centeringOffset = Math.floor((end - start - icon.size) / 2);
+                return end - icon.size - centeringOffset;
+        }
+    }
     computeCellIcons(position) {
         const icons = { left: undefined, right: undefined, center: undefined };
         const callbacks = iconsOnCellRegistry.getAll();
@@ -66947,10 +67341,15 @@ class PivotUIPlugin extends CoreViewPlugin {
             const includeTotal = toScalar(args[2]);
             const shouldIncludeTotal = includeTotal === undefined ? true : toBoolean(includeTotal);
             const includeColumnHeaders = toScalar(args[3]);
+            const includeMeasures = toScalar(args[5]);
+            const shouldIncludeMeasures = includeMeasures === undefined ? true : toBoolean(includeMeasures);
             const shouldIncludeColumnHeaders = includeColumnHeaders === undefined ? true : toBoolean(includeColumnHeaders);
-            const pivotCells = pivot
-                .getCollapsedTableStructure()
-                .getPivotCells(shouldIncludeTotal, shouldIncludeColumnHeaders);
+            const visibilityOptions = {
+                displayColumnHeaders: shouldIncludeColumnHeaders,
+                displayTotals: shouldIncludeTotal,
+                displayMeasuresRow: shouldIncludeMeasures,
+            };
+            const pivotCells = pivot.getCollapsedTableStructure().getPivotCells(visibilityOptions);
             const pivotCol = position.col - mainPosition.col;
             const pivotRow = position.row - mainPosition.row;
             return pivotCells[pivotCol][pivotRow];
@@ -69172,8 +69571,7 @@ class CollaborativePlugin extends UIPlugin {
         "isFullySynchronized",
     ];
     static layers = ["Selection"];
-    availableColors = new AlternatingColorGenerator(12);
-    colors = {};
+    colors = new AlternatingColorMap(12);
     session;
     constructor(config) {
         super(config);
@@ -69191,7 +69589,7 @@ class CollaborativePlugin extends UIPlugin {
     }
     getConnectedClients() {
         return [...this.session.getConnectedClients()].map((client) => {
-            return { ...client, color: this.colors[client.id] };
+            return { ...client, color: this.colors.get(client.id) };
         });
     }
     isFullySynchronized() {
@@ -69220,10 +69618,7 @@ class CollaborativePlugin extends UIPlugin {
                 client.position &&
                 client.position.sheetId === sheetId &&
                 this.isPositionValid(client.position)) {
-                if (!this.colors[client.id]) {
-                    this.colors[client.id] = this.availableColors.next();
-                }
-                clients.push({ ...client, color: this.colors[client.id], position: client.position });
+                clients.push({ ...client, position: client.position });
             }
         }
         return clients;
@@ -70069,6 +70464,7 @@ class SheetUIPlugin extends UIPlugin {
         "getCellText",
         "getCellMultiLineText",
         "getContiguousZone",
+        "computeTextYCoordinate",
     ];
     ctx = document.createElement("canvas").getContext("2d");
     // ---------------------------------------------------------------------------
@@ -70171,6 +70567,25 @@ class SheetUIPlugin extends UIPlugin {
         });
         return splitTextToWidth(this.ctx, text, style, args.wrapText ? args.maxWidth : undefined);
     }
+    /** Computes the vertical start point from which a text line should be draw in a cell.
+     *
+     * Note that in case the cell does not have enough spaces to display its text lines,
+     * (wrapping cell case) then the vertical align should be at the top.
+     * */
+    computeTextYCoordinate(cellRect, textLineHeight, verticalAlign = DEFAULT_VERTICAL_ALIGN, numberOfLines = 1) {
+        const y = cellRect.y + 1; // +1 to skip the cell grid line at the top
+        const textHeight = computeTextLinesHeight(textLineHeight, numberOfLines);
+        const hasEnoughSpaces = cellRect.height > textHeight + MIN_CELL_TEXT_MARGIN * 2;
+        if (hasEnoughSpaces) {
+            if (verticalAlign === "middle") {
+                return Math.ceil(y + (cellRect.height - textHeight) / 2);
+            }
+            if (verticalAlign === "bottom") {
+                return y + cellRect.height - textHeight - MIN_CELL_TEXT_MARGIN;
+            }
+        }
+        return y + MIN_CELL_TEXT_MARGIN;
+    }
     /**
      * Expands the given zone until bordered by empty cells or reached the sheet boundaries.
      */
@@ -72077,9 +72492,10 @@ class FilterEvaluationPlugin extends UIPlugin {
                 const filteredValues = filterValue.hiddenValues?.map(toLowerCase);
                 if (!filteredValues)
                     continue;
+                const filteredValuesSet = new Set(filteredValues);
                 for (let row = filteredZone.top; row <= filteredZone.bottom; row++) {
                     const value = this.getCellValueAsString(sheetId, filter.col, row);
-                    if (filteredValues.includes(value)) {
+                    if (filteredValuesSet.has(value)) {
                         hiddenRows.add(row);
                     }
                 }
@@ -72196,6 +72612,7 @@ class GridSelectionPlugin extends UIPlugin {
         "getElementsFromSelection",
         "tryGetActiveSheetId",
         "isGridSelectionActive",
+        "getSelectecUnboundedZone",
     ];
     gridSelection = {
         anchor: {
@@ -72207,12 +72624,14 @@ class GridSelectionPlugin extends UIPlugin {
     selectedFigureId = null;
     sheetsData = {};
     moveClient;
+    isUnbounded;
     // This flag is used to avoid to historize the ACTIVE_SHEET command when it's
     // the main command.
     activeSheet = null;
     constructor(config) {
         super(config);
         this.moveClient = config.moveClient;
+        this.isUnbounded = false;
     }
     // ---------------------------------------------------------------------------
     // Command Handling
@@ -72238,6 +72657,7 @@ class GridSelectionPlugin extends UIPlugin {
     handleEvent(event) {
         const anchor = event.anchor;
         let zones = [];
+        this.isUnbounded = event.options?.unbounded || false;
         switch (event.mode) {
             case "overrideSelection":
                 zones = [anchor.zone];
@@ -72427,6 +72847,12 @@ class GridSelectionPlugin extends UIPlugin {
     getSelectedZone() {
         return deepCopy(this.gridSelection.anchor.zone);
     }
+    getSelectecUnboundedZone() {
+        const zone = this.isUnbounded
+            ? this.getters.getUnboundedZone(this.activeSheet.id, this.gridSelection.anchor.zone)
+            : this.gridSelection.anchor.zone;
+        return deepCopy(zone);
+    }
     getSelection() {
         return deepCopy(this.gridSelection);
     }
@@ -72620,11 +73046,6 @@ class GridSelectionPlugin extends UIPlugin {
             },
         ];
         const sheetId = this.getActiveSheetId();
-        const handler = new CellClipboardHandler(this.getters, this.dispatch);
-        const data = handler.copy(getClipboardDataPositions(sheetId, target));
-        if (!data) {
-            return;
-        }
         const base = isBasedBefore ? cmd.base : cmd.base + 1;
         const pasteTarget = [
             {
@@ -72634,7 +73055,14 @@ class GridSelectionPlugin extends UIPlugin {
                 bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
             },
         ];
-        handler.paste({ zones: pasteTarget, sheetId }, data, { isCutOperation: true });
+        for (const Handler of clipboardHandlersRegistries.cellHandlers.getAll()) {
+            const handler = new Handler(this.getters, this.dispatch);
+            const data = handler.copy(getClipboardDataPositions(sheetId, target));
+            if (!data) {
+                continue;
+            }
+            handler.paste({ zones: pasteTarget, sheetId }, data, { isCutOperation: true });
+        }
         const selection = pasteTarget[0];
         const col = selection.left;
         const row = selection.top;
@@ -73180,6 +73608,7 @@ class SheetViewPlugin extends UIPlugin {
         "getRect",
         "getFigureUI",
         "getPositionAnchorOffset",
+        "getGridOffset",
     ];
     viewports = {};
     /**
@@ -73369,6 +73798,9 @@ class SheetViewPlugin extends UIPlugin {
             height: this.sheetViewHeight,
         };
     }
+    getGridOffset() {
+        return { x: this.gridOffsetX, y: this.gridOffsetY };
+    }
     /** type as pane, not viewport but basically pane extends viewport */
     getActiveMainViewport() {
         const sheetId = this.getters.getActiveSheetId();
@@ -74745,8 +75177,9 @@ topbarMenuRegistry
 })
     .addChild("settings", ["file"], {
     name: _t("Settings"),
-    sequence: 100,
+    sequence: 200,
     execute: (env) => env.openSidePanel("Settings"),
+    isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.COG",
 })
     // ---------------------------------------------------------------------
@@ -75164,6 +75597,7 @@ topbarMenuRegistry
     execute: (env) => {
         env.openSidePanel("DataValidation");
     },
+    isEnabled: (env) => !env.isSmall,
     icon: "o-spreadsheet-Icon.DATA_VALIDATION",
     sequence: 30,
     separator: true,
@@ -75187,6 +75621,7 @@ topbarMenuRegistry
             sequence: sequence + index,
             isReadonlyAllowed: true,
             execute: (env) => env.openSidePanel("PivotSidePanel", { pivotId }),
+            isEnabled: (env) => !env.isSmall,
             onStartHover: (env) => env.getStore(HighlightStore).register(highlightProvider),
             onStopHover: (env) => env.getStore(HighlightStore).unRegister(highlightProvider),
             icon: "o-spreadsheet-Icon.PIVOT",
@@ -75458,7 +75893,7 @@ css /* scss */ `
   .o-sheet {
     padding: 0 15px;
     padding-right: 10px;
-    height: ${BOTTOMBAR_HEIGHT}px;
+    height: ${DESKTOP_BOTTOMBAR_HEIGHT}px;
     border-left: 1px solid #c1c1c1;
     border-right: 1px solid #c1c1c1;
     margin-left: -1px;
@@ -75502,6 +75937,10 @@ css /* scss */ `
       width: calc(100% - 1px);
     }
   }
+
+  .o-spreadshet-mobile .o-sheet {
+    height: ${MOBILE_BOTTOMBAR_HEIGHT}px;
+  }
 `;
 class BottomBarSheet extends owl.Component {
     static template = "o-spreadsheet-BottomBarSheet";
@@ -75556,7 +75995,16 @@ class BottomBarSheet extends owl.Component {
             this.stopEdition();
         }
     }
+    onClick() {
+        if (!this.env.isMobile()) {
+            return;
+        }
+        this.activateSheet();
+    }
     onMouseDown(ev) {
+        if (this.env.isMobile()) {
+            return;
+        }
         this.activateSheet();
         this.props.onMouseDown(ev);
     }
@@ -75900,8 +76348,8 @@ css /* scss */ `
     }
   }
 
-  .mobile.o-spreadsheet-bottom-bar {
-    padding-left: 1rem;
+  .o-spreadsheet-mobile .o-spreadsheet-bottom-bar {
+    padding-left: 0;
 
     .add-sheet-container {
       order: 2;
@@ -75918,10 +76366,8 @@ css /* scss */ `
 `;
 class BottomBar extends owl.Component {
     static template = "o-spreadsheet-BottomBar";
-    static props = {
-        onClick: Function,
-    };
-    static components = { Menu, Ripple, BottomBarSheet, BottomBarStatistic };
+    static props = { onClick: Function };
+    static components = { MenuPopover, Ripple, BottomBarSheet, BottomBarStatistic };
     bottomBarRef = owl.useRef("bottomBar");
     sheetListRef = owl.useRef("sheetList");
     dragAndDrop = useDragAndDropListItems();
@@ -76058,6 +76504,9 @@ class BottomBar extends owl.Component {
         if (event.button !== 0 || this.env.model.getters.isReadonly())
             return;
         this.closeMenu();
+        if (this.env.isMobile()) {
+            return;
+        }
         const visibleSheets = this.getVisibleSheets();
         const sheetRects = this.getSheetItemRects();
         const sheets = visibleSheets.map((sheet, index) => ({
@@ -76177,7 +76626,7 @@ css /* scss */ `
 `;
 class SpreadsheetDashboard extends owl.Component {
     static template = "o-spreadsheet-SpreadsheetDashboard";
-    static props = {};
+    static props = { getGridSize: Function };
     static components = {
         GridOverlay,
         GridPopover,
@@ -76464,7 +76913,7 @@ class HeaderGroupContainer extends owl.Component {
         dimension: String,
         layers: Array,
     };
-    static components = { RowGroup, ColGroup, Menu };
+    static components = { RowGroup, ColGroup, MenuPopover };
     menu = owl.useState({ isOpen: false, anchorRect: null, menuItems: [] });
     getLayerOffset(layerIndex) {
         return layerIndex * GROUP_LAYER_WIDTH;
@@ -76680,6 +77129,158 @@ class SidePanel extends owl.Component {
     }
 }
 
+class RibbonMenu extends owl.Component {
+    static template = "o-spreadsheet-RibbonMenu";
+    static props = {
+        onClose: Function,
+    };
+    static components = { Menu };
+    rootItems = topbarMenuRegistry.getMenuItems();
+    menuRef = owl.useRef("menu");
+    state = owl.useState({
+        menuItems: this.rootItems,
+        title: _t("Menu Bar"),
+        parentState: undefined,
+    });
+    setup() {
+        owl.useExternalListener(window, "click", this.onExternalClick, { capture: true });
+    }
+    onExternalClick(ev) {
+        if (!this.menuRef.el?.contains(ev.target)) {
+            this.props.onClose();
+        }
+    }
+    onClickMenu(menu) {
+        const children = menu.children(this.env);
+        if (children.length) {
+            this.state.parentState = { ...this.state };
+            this.state.menuItems = children;
+            this.state.title = menu.name(this.env);
+        }
+        else {
+            this.state.menuItems = this.rootItems;
+            this.state.title = undefined;
+            this.state.parentState = undefined;
+            menu.execute?.(this.env);
+            this.props.onClose();
+        }
+    }
+    get menuProps() {
+        return {
+            menuItems: this.state.menuItems,
+            onClose: this.props.onClose,
+            onClickMenu: this.onClickMenu.bind(this),
+        };
+    }
+    get style() {
+        return cssPropertiesToCss({
+            height: `${this.props.height}px`,
+        });
+    }
+    onClickBack() {
+        if (!this.state.parentState) {
+            this.props.onClose();
+            return;
+        }
+        this.state.menuItems = this.state.parentState.menuItems;
+        this.state.title = this.state.parentState.title;
+        this.state.parentState = this.state.parentState.parentState;
+    }
+    get backTitle() {
+        return this.state.parentState ? _t("Go to previous menu") : _t("Close menu bar");
+    }
+}
+
+css `
+  .o-small-composer {
+    z-index: ${ComponentsImportance.TopBarComposer};
+  }
+`;
+class SmallBottomBar extends owl.Component {
+    static components = { Composer, BottomBar, Ripple, RibbonMenu };
+    static template = "o-spreadsheet-SmallBottomBar";
+    static props = {
+        onClick: Function,
+    };
+    composerFocusStore;
+    composerStore;
+    composerInterface;
+    composerRef = owl.useRef("bottombarComposer");
+    menuState = owl.useState({
+        isOpen: false,
+    });
+    setup() {
+        this.composerFocusStore = useStore(ComposerFocusStore);
+        const composerStore = useStore(CellComposerStore);
+        this.composerStore = composerStore;
+        this.composerInterface = {
+            id: "bottombarComposer",
+            get editionMode() {
+                return composerStore.editionMode;
+            },
+            startEdition: this.composerStore.startEdition,
+            setCurrentContent: this.composerStore.setCurrentContent,
+            stopEdition: this.composerStore.stopEdition,
+        };
+        owl.useEffect(() => {
+            if (
+            // we hide the grid composer on mobile so we need to autofocus this composer
+            this.env.isMobile() &&
+                !this.menuState.isOpen &&
+                this.composerStore.editionMode !== "inactive" &&
+                this.composerFocusStore.activeComposer !== this.composerInterface) {
+                this.composerFocusStore.focusComposer(this.composerInterface, {
+                    focusMode: "contentFocus",
+                });
+            }
+        });
+    }
+    get focus() {
+        return this.composerFocusStore.activeComposer === this.composerInterface
+            ? this.composerFocusStore.focusMode
+            : "inactive";
+    }
+    get rect() {
+        return this.composerRef.el
+            ? getBoundingRectAsPOJO(this.composerRef.el)
+            : { x: 0, y: 0, width: 0, height: 0 };
+    }
+    get composerProps() {
+        const { width, height } = this.env.model.getters.getSheetViewDimensionWithHeaders();
+        return {
+            rect: { ...this.rect },
+            delimitation: {
+                width,
+                height,
+            },
+            focus: this.focus,
+            composerStore: this.composerStore,
+            onComposerContentFocused: () => this.composerFocusStore.focusComposer(this.composerInterface, {
+                focusMode: "contentFocus",
+            }),
+            isDefaultFocus: false,
+            inputStyle: cssPropertiesToCss({
+                height: this.focus === "inactive" ? "26px" : "fit-content",
+                "max-height": `130px`,
+            }),
+            showAssistant: !isIOS(), // Hide assistant on iOS as it breaks visually
+        };
+    }
+    get symbols() {
+        return ["=", "(", ")", ":", "-", "/", "*", ",", "+", "$", "."];
+    }
+    insertSymbol(symbol) {
+        this.composerStore.replaceComposerCursorSelection(symbol);
+        this.composerFocusStore.focusComposer(this.composerInterface, {
+            focusMode: "contentFocus",
+        });
+    }
+    toggleRibbon() {
+        this.composerStore.cancelEdition();
+        this.menuState.isOpen = !this.menuState.isOpen;
+    }
+}
+
 const COMPOSER_MAX_HEIGHT = 100;
 /* svg free of use from https://uxwing.com/formula-fx-icon/ */
 const FX_SVG = /*xml*/ `
@@ -76689,7 +77290,7 @@ const FX_SVG = /*xml*/ `
 `;
 css /* scss */ `
   .o-topbar-composer-container {
-    height: ${TOPBAR_TOOLBAR_HEIGHT}px;
+    height: ${DESKTOP_TOPBAR_TOOLBAR_HEIGHT}px;
   }
 
   .o-topbar-composer {
@@ -76744,7 +77345,7 @@ class TopBarComposer extends owl.Component {
             "max-height": `${COMPOSER_MAX_HEIGHT}px`,
             "line-height": "24px",
         };
-        style.height = this.focus === "inactive" ? `${TOPBAR_TOOLBAR_HEIGHT}px` : "fit-content";
+        style.height = this.focus === "inactive" ? `${DESKTOP_TOPBAR_TOOLBAR_HEIGHT}px` : "fit-content";
         return cssPropertiesToCss(style);
     }
     get containerStyle() {
@@ -77247,7 +77848,7 @@ class TopBarFontSizeEditor extends owl.Component {
 
 class NumberFormatsTool extends owl.Component {
     static template = "o-spreadsheet-NumberFormatsTool";
-    static components = { Menu, ActionButton };
+    static components = { MenuPopover, ActionButton };
     static props = { class: String };
     formatNumberMenuItemSpec = formatNumberMenuItemSpec;
     topBarToolStore;
@@ -77297,7 +77898,7 @@ topBarToolBarRegistry
     .addChild("edit", {
     component: PaintFormatButton,
     props: {
-        class: "o-hoverable-button o-toolbar-button",
+        class: "o-hoverable-button o-toolbar-button o-mobile-disabled",
     },
     sequence: 3,
 })
@@ -77456,7 +78057,7 @@ topBarToolBarRegistry
     .add("misc")
     .addChild("misc", {
     component: TableDropdownButton,
-    props: { class: "o-toolbar-button o-hoverable-button o-menu-item-button" },
+    props: { class: "o-toolbar-button o-hoverable-button o-menu-item-button o-mobile-disabled" },
     sequence: 1,
 })
     .addChild("misc", {
@@ -77476,6 +78077,7 @@ css /* scss */ `
     border-right: 1px solid ${SEPARATOR_COLOR};
     width: 0;
     margin: 0 6px;
+    height: 30px;
   }
 
   .o-toolbar-button {
@@ -77484,7 +78086,7 @@ css /* scss */ `
 
   .o-spreadsheet-topbar {
     line-height: 1.2;
-    font-size: 13px;
+    font-size: 14px;
     font-weight: 500;
     background-color: #fff;
 
@@ -77508,7 +78110,7 @@ css /* scss */ `
 
     .irregularity-map {
       border-top: 1px solid ${SEPARATOR_COLOR};
-      height: ${TOPBAR_TOOLBAR_HEIGHT}px;
+      height: ${DESKTOP_TOPBAR_TOOLBAR_HEIGHT}px;
 
       .alert-info {
         border-left: 3px solid ${ALERT_INFO_BORDER};
@@ -77521,7 +78123,7 @@ css /* scss */ `
 
     /* Toolbar */
     .o-topbar-toolbar {
-      height: ${TOPBAR_TOOLBAR_HEIGHT}px;
+      height: ${DESKTOP_TOPBAR_TOOLBAR_HEIGHT}px;
 
       .o-readonly-toolbar {
         background-color: ${BACKGROUND_HEADER_COLOR};
@@ -77535,6 +78137,24 @@ css /* scss */ `
       }
     }
   }
+
+  .o-spreadsheet-mobile {
+    .o-topbar-toolbar {
+      height: ${MOBILE_TOPBAR_TOOLBAR_HEIGHT}px;
+    }
+    .o-topbar-divider {
+      border-width: 2px;
+      border-radius: 4px;
+    }
+
+    .o-toolbar-button {
+      height: 35px;
+      width: 31px;
+      .o-toolbar-button.o-mobile-disabled * {
+      color: ${DISABLED_TEXT_COLOR};
+      cursor: not-allowed;
+    }
+  }
 `;
 class TopBar extends owl.Component {
     static template = "o-spreadsheet-TopBar";
@@ -77543,7 +78163,7 @@ class TopBar extends owl.Component {
         dropdownMaxHeight: Number,
     };
     static components = {
-        Menu,
+        MenuPopover,
         TopBarComposer,
         Popover,
     };
@@ -77623,7 +78243,7 @@ class TopBar extends owl.Component {
         // TODO : manage click events better. We need this piece of code
         // otherwise the event opening the menu would close it on the same frame.
         // And we cannot stop the event propagation because it's used in an
-        // external listener of the Menu component to close the context menu when
+        // external listener of the MenuPopover component to close the context menu when
         // clicking on the top bar
         if (this.openedEl === ev.target) {
             return;
@@ -78049,6 +78669,11 @@ css /* scss */ `
       color: ${TEXT_BODY};
     }
   }
+
+  .o-spreadsheet-topbar-wrapper,
+  .o-spreadsheet-bottombar-wrapper {
+    z-index: ${ComponentsImportance.ScrollBar + 1};
+  }
 `;
 class Spreadsheet extends owl.Component {
     static template = "o-spreadsheet-Spreadsheet";
@@ -78062,6 +78687,7 @@ class Spreadsheet extends owl.Component {
         TopBar,
         Grid,
         BottomBar,
+        SmallBottomBar,
         SidePanel,
         SpreadsheetDashboard,
         HeaderGroupContainer,
@@ -78085,12 +78711,25 @@ class Spreadsheet extends owl.Component {
         else {
             properties["grid-template-rows"] = `min-content auto min-content`;
         }
-        properties["grid-template-columns"] = `auto ${this.sidePanel.panelSize}px`;
+        const columnWidth = this.sidePanel.isOpen ? `${this.sidePanel.panelSize}px` : "auto";
+        properties["grid-template-columns"] = `auto ${columnWidth}`;
         return cssPropertiesToCss(properties);
     }
     setup() {
+        if (!("isSmall" in this.env)) {
+            const screenSize = useScreenWidth();
+            owl.useSubEnv({
+                get isSmall() {
+                    return screenSize.isSmall;
+                },
+            });
+        }
         const stores = useStoreProvider();
         stores.inject(ModelStore, this.model);
+        const env = this.env;
+        stores.get(ScreenWidthStore).setSmallThreshhold(() => {
+            return env.isSmall;
+        });
         this.notificationStore = useStore(NotificationStore);
         this.composerFocusStore = useStore(ComposerFocusStore);
         this.sidePanel = useStore(SidePanelStore);
@@ -78108,15 +78747,8 @@ class Spreadsheet extends owl.Component {
             notifyUser: (notification) => this.notificationStore.notifyUser(notification),
             askConfirmation: (text, confirm, cancel) => this.notificationStore.askConfirmation(text, confirm, cancel),
             raiseError: (text, cb) => this.notificationStore.raiseError(text, cb),
+            isMobile: isMobileOS,
         });
-        if (!("isSmall" in this.env)) {
-            const screenSize = useScreenWidth();
-            owl.useSubEnv({
-                get isSmall() {
-                    return screenSize.isSmall;
-                },
-            });
-        }
         this.notificationStore.updateNotificationCallbacks({ ...this.props });
         owl.useEffect(() => {
             /**
@@ -78222,6 +78854,24 @@ class Spreadsheet extends owl.Component {
         const sheetId = this.env.model.getters.getActiveSheetId();
         return this.env.model.getters.getVisibleGroupLayers(sheetId, "COL");
     }
+    getGridSize() {
+        const topBarHeight = this.spreadsheetRef.el
+            ?.querySelector(".o-spreadsheet-topbar-wrapper")
+            ?.getBoundingClientRect().height || 0;
+        const bottomBarHeight = this.spreadsheetRef.el
+            ?.querySelector(".o-spreadsheet-bottombar-wrapper")
+            ?.getBoundingClientRect().height || 0;
+        const gridWidth = this.spreadsheetRef.el?.querySelector(".o-grid")?.getBoundingClientRect().width || 0;
+        const gridHeight = (this.spreadsheetRef.el?.getBoundingClientRect().height || 0) -
+            (this.spreadsheetRef.el?.querySelector(".o-column-groups")?.getBoundingClientRect().height ||
+                0) -
+            topBarHeight -
+            bottomBarHeight;
+        return {
+            width: Math.max(gridWidth - SCROLLBAR_WIDTH, 0),
+            height: Math.max(gridHeight - SCROLLBAR_WIDTH, 0),
+        };
+    }
 }
 
 function inverseCommand(cmd) {
@@ -82484,7 +83134,7 @@ const SPREADSHEET_DIMENSIONS = {
     MIN_COL_WIDTH,
     HEADER_HEIGHT,
     HEADER_WIDTH,
-    BOTTOMBAR_HEIGHT,
+    DESKTOP_BOTTOMBAR_HEIGHT,
     DEFAULT_CELL_WIDTH,
     DEFAULT_CELL_HEIGHT,
     SCROLLBAR_WIDTH,
@@ -82630,7 +83280,7 @@ const components = {
     FunnelChartDesignPanel,
     ChartTypePicker,
     FigureComponent,
-    Menu,
+    MenuPopover,
     Popover,
     SelectionInput,
     ValidationMessages,
@@ -82695,6 +83345,7 @@ exports.AbstractCellClipboardHandler = AbstractCellClipboardHandler;
 exports.AbstractChart = AbstractChart;
 exports.AbstractFigureClipboardHandler = AbstractFigureClipboardHandler;
 exports.CellErrorType = CellErrorType;
+exports.ClientDisconnectedError = ClientDisconnectedError;
 exports.CorePlugin = CorePlugin;
 exports.CoreViewPlugin = CoreViewPlugin;
 exports.DispatchResult = DispatchResult;
@@ -82741,6 +83392,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.4.0-alpha.6";
-__info__.date = "2025-05-30T08:44:33.216Z";
-__info__.hash = "eecf7e4";
+__info__.version = "18.4.0-alpha.8";
+__info__.date = "2025-06-12T09:53:48.133Z";
+__info__.hash = "9b7a8d0";