@odoo/o-spreadsheet 18.2.16 → 18.2.17

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.2.16
- * @date 2025-06-06T09:32:04.909Z
- * @hash 7ee118c
+ * @version 18.2.17
+ * @date 2025-06-12T09:52:15.050Z
+ * @hash ea64209
  */
 
 'use strict';
@@ -5856,7 +5856,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);
 }
@@ -5905,6 +5907,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.
@@ -5912,9 +5917,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);
@@ -10448,10 +10450,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, dataset, i);
             drawTextWithBackground(displayValue, x, y, ctx);
         }
     }
@@ -26217,7 +26231,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 {
@@ -33414,19 +33428,26 @@ class FilterMenu extends owl.Component {
             .filter(({ row }) => !this.env.model.getters.isRowHidden(sheetId, row))
             .map(({ col, row }) => this.env.model.getters.getEvaluatedCell({ sheetId, col, row }).formattedValue);
         const filterValues = this.env.model.getters.getFilterHiddenValues({ sheetId, ...position });
-        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) => {
-            const checked = normalizedFilteredValues.findIndex((filteredValue) => filteredValue === normalizedValue) ===
-                -1;
-            return {
-                checked,
-                string: strValues.find((val) => toLowerCase(val) === normalizedValue) || "",
-            };
-        });
+        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: !normalizedFilteredValues.has(normalizedValue),
+                    normalizedValue,
+                });
+                set.add(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;
@@ -58593,7 +58614,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"
@@ -58692,14 +58715,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;
@@ -68073,9 +68098,10 @@ class FilterEvaluationPlugin extends UIPlugin {
             const filteredZone = filter.filteredRange?.zone;
             if (!filteredValues || !filteredZone)
                 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);
                 }
             }
@@ -76989,6 +77015,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.2.16";
-__info__.date = "2025-06-06T09:32:04.909Z";
-__info__.hash = "7ee118c";
+__info__.version = "18.2.17";
+__info__.date = "2025-06-12T09:52:15.050Z";
+__info__.hash = "ea64209";

package/dist/o-spreadsheet.esm.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.2.16
- * @date 2025-06-06T09:32:04.909Z
- * @hash 7ee118c
+ * @version 18.2.17
+ * @date 2025-06-12T09:52:15.050Z
+ * @hash ea64209
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -5854,7 +5854,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);
 }
@@ -5903,6 +5905,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.
@@ -5910,9 +5915,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);
@@ -10446,10 +10448,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, dataset, i);
             drawTextWithBackground(displayValue, x, y, ctx);
         }
     }
@@ -26215,7 +26229,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 {
@@ -33412,19 +33426,26 @@ class FilterMenu extends Component {
             .filter(({ row }) => !this.env.model.getters.isRowHidden(sheetId, row))
             .map(({ col, row }) => this.env.model.getters.getEvaluatedCell({ sheetId, col, row }).formattedValue);
         const filterValues = this.env.model.getters.getFilterHiddenValues({ sheetId, ...position });
-        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) => {
-            const checked = normalizedFilteredValues.findIndex((filteredValue) => filteredValue === normalizedValue) ===
-                -1;
-            return {
-                checked,
-                string: strValues.find((val) => toLowerCase(val) === normalizedValue) || "",
-            };
-        });
+        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: !normalizedFilteredValues.has(normalizedValue),
+                    normalizedValue,
+                });
+                set.add(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;
@@ -58591,7 +58612,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"
@@ -58690,14 +58713,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;
@@ -68071,9 +68096,10 @@ class FilterEvaluationPlugin extends UIPlugin {
             const filteredZone = filter.filteredRange?.zone;
             if (!filteredValues || !filteredZone)
                 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);
                 }
             }
@@ -76942,6 +76968,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "18.2.16";
-__info__.date = "2025-06-06T09:32:04.909Z";
-__info__.hash = "7ee118c";
+__info__.version = "18.2.17";
+__info__.date = "2025-06-12T09:52:15.050Z";
+__info__.hash = "ea64209";

package/dist/o-spreadsheet.iife.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.2.16
- * @date 2025-06-06T09:32:04.909Z
- * @hash 7ee118c
+ * @version 18.2.17
+ * @date 2025-06-12T09:52:15.050Z
+ * @hash ea64209
  */
 
 (function (exports, owl) {
@@ -5855,7 +5855,9 @@
   }
 
   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);
   }
@@ -5904,6 +5906,9 @@
       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.
@@ -5911,9 +5916,6 @@
           // 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);
@@ -10447,10 +10449,22 @@ stores.inject(MyMetaStore, storeInstance);
               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, dataset, i);
               drawTextWithBackground(displayValue, x, y, ctx);
           }
       }
@@ -26216,7 +26230,7 @@ stores.inject(MyMetaStore, storeInstance);
        */
       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 {
@@ -33413,19 +33427,26 @@ stores.inject(MyMetaStore, storeInstance);
               .filter(({ row }) => !this.env.model.getters.isRowHidden(sheetId, row))
               .map(({ col, row }) => this.env.model.getters.getEvaluatedCell({ sheetId, col, row }).formattedValue);
           const filterValues = this.env.model.getters.getFilterHiddenValues({ sheetId, ...position });
-          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) => {
-              const checked = normalizedFilteredValues.findIndex((filteredValue) => filteredValue === normalizedValue) ===
-                  -1;
-              return {
-                  checked,
-                  string: strValues.find((val) => toLowerCase(val) === normalizedValue) || "",
-              };
-          });
+          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: !normalizedFilteredValues.has(normalizedValue),
+                      normalizedValue,
+                  });
+                  set.add(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;
@@ -58592,7 +58613,9 @@ stores.inject(MyMetaStore, storeInstance);
                   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"
@@ -58691,14 +58714,16 @@ stores.inject(MyMetaStore, storeInstance);
           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;
@@ -68072,9 +68097,10 @@ stores.inject(MyMetaStore, storeInstance);
               const filteredZone = filter.filteredRange?.zone;
               if (!filteredValues || !filteredZone)
                   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);
                   }
               }
@@ -76988,9 +77014,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.2.16";
-  __info__.date = "2025-06-06T09:32:04.909Z";
-  __info__.hash = "7ee118c";
+  __info__.version = "18.2.17";
+  __info__.date = "2025-06-12T09:52:15.050Z";
+  __info__.hash = "ea64209";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);