@odoo/o-spreadsheet 16.4.23 → 16.4.24

package/dist/o-spreadsheet.cjs.js

@@ -20671,7 +20671,7 @@ class SelectionInput extends owl.Component {
             : this.props.ranges()
                 ? this.props.ranges().map((xc, id) => ({
                     xc,
-                    id,
+                    id: id + 1,
                     isFocused: false,
                 }))
                 : [];
@@ -30912,29 +30912,12 @@ const MIGRATIONS = [
         from: 12,
         to: 12.5,
         applyMigration(data) {
-            for (let sheet of data.sheets || []) {
-                let knownDataFilterZones = [];
-                for (let filterTable of sheet.filterTables || []) {
-                    const zone = toZone(filterTable.range);
-                    // See commit message for the details
-                    const intersectZoneIndex = knownDataFilterZones.findIndex((knownZone) => overlap(knownZone, zone));
-                    if (intersectZoneIndex !== -1) {
-                        knownDataFilterZones[intersectZoneIndex] = zone;
-                    }
-                    else {
-                        knownDataFilterZones.push(zone);
-                    }
-                }
-                sheet.filterTables = knownDataFilterZones.map((zone) => ({
-                    range: zoneToXc(zone),
-                }));
-            }
-            return data;
+            return fixOverlappingFilters(data);
         },
     },
     {
         description: "Change Border description structure",
-        from: 12,
+        from: 12.5,
         to: 13,
         applyMigration(data) {
             for (const borderId in data.borders) {
@@ -30965,6 +30948,14 @@ const MIGRATIONS = [
             return data;
         },
     },
+    {
+        description: "Fix datafilter duplication (post saas-16.4)",
+        from: 14,
+        to: 14.5,
+        applyMigration(data) {
+            return fixOverlappingFilters(data);
+        },
+    },
 ];
 /**
  * This function is used to repair faulty data independently of the migration.
@@ -31122,6 +31113,26 @@ function fixChartDefinitions(data, initialMessages) {
     }
     return messages;
 }
+function fixOverlappingFilters(data) {
+    for (let sheet of data.sheets || []) {
+        let knownDataFilterZones = [];
+        for (let filterTable of sheet.filterTables || []) {
+            const zone = toZone(filterTable.range);
+            // See commit message of https://github.com/odoo/o-spreadsheet/pull/3632 of more details
+            const intersectZoneIndex = knownDataFilterZones.findIndex((knownZone) => overlap(knownZone, zone));
+            if (intersectZoneIndex !== -1) {
+                knownDataFilterZones[intersectZoneIndex] = zone;
+            }
+            else {
+                knownDataFilterZones.push(zone);
+            }
+        }
+        sheet.filterTables = knownDataFilterZones.map((zone) => ({
+            range: zoneToXc(zone),
+        }));
+    }
+    return data;
+}
 // -----------------------------------------------------------------------------
 // Helpers
 // -----------------------------------------------------------------------------
@@ -41050,14 +41061,12 @@ class SelectionInputsManagerPlugin extends UIPlugin {
                 break;
             case "FOCUS_RANGE":
             case "CHANGE_RANGE":
-                if (cmd.id !== this.focusedInputId) {
-                    const input = this.inputs[cmd.id];
-                    const range = input.ranges.find((range) => range.id === cmd.rangeId);
-                    if (this.isRangeValid(range?.xc || "A1")) {
-                        const sheetId = this.getters.getActiveSheetId();
-                        const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
-                        this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
-                    }
+                const input = this.inputs[cmd.id];
+                const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                if (range) {
+                    const sheetId = this.getters.getActiveSheetId();
+                    const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
+                    this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
                     this.focusedInputId = cmd.id;
                 }
                 break;
@@ -51707,6 +51716,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.23';
-__info__.date = '2024-02-16T14:23:29.521Z';
-__info__.hash = 'cb5db1a';
+__info__.version = '16.4.24';
+__info__.date = '2024-02-28T12:27:32.683Z';
+__info__.hash = '90c74d1';

package/dist/o-spreadsheet.esm.js

@@ -20667,7 +20667,7 @@ class SelectionInput extends Component {
             : this.props.ranges()
                 ? this.props.ranges().map((xc, id) => ({
                     xc,
-                    id,
+                    id: id + 1,
                     isFocused: false,
                 }))
                 : [];
@@ -30908,29 +30908,12 @@ const MIGRATIONS = [
         from: 12,
         to: 12.5,
         applyMigration(data) {
-            for (let sheet of data.sheets || []) {
-                let knownDataFilterZones = [];
-                for (let filterTable of sheet.filterTables || []) {
-                    const zone = toZone(filterTable.range);
-                    // See commit message for the details
-                    const intersectZoneIndex = knownDataFilterZones.findIndex((knownZone) => overlap(knownZone, zone));
-                    if (intersectZoneIndex !== -1) {
-                        knownDataFilterZones[intersectZoneIndex] = zone;
-                    }
-                    else {
-                        knownDataFilterZones.push(zone);
-                    }
-                }
-                sheet.filterTables = knownDataFilterZones.map((zone) => ({
-                    range: zoneToXc(zone),
-                }));
-            }
-            return data;
+            return fixOverlappingFilters(data);
         },
     },
     {
         description: "Change Border description structure",
-        from: 12,
+        from: 12.5,
         to: 13,
         applyMigration(data) {
             for (const borderId in data.borders) {
@@ -30961,6 +30944,14 @@ const MIGRATIONS = [
             return data;
         },
     },
+    {
+        description: "Fix datafilter duplication (post saas-16.4)",
+        from: 14,
+        to: 14.5,
+        applyMigration(data) {
+            return fixOverlappingFilters(data);
+        },
+    },
 ];
 /**
  * This function is used to repair faulty data independently of the migration.
@@ -31118,6 +31109,26 @@ function fixChartDefinitions(data, initialMessages) {
     }
     return messages;
 }
+function fixOverlappingFilters(data) {
+    for (let sheet of data.sheets || []) {
+        let knownDataFilterZones = [];
+        for (let filterTable of sheet.filterTables || []) {
+            const zone = toZone(filterTable.range);
+            // See commit message of https://github.com/odoo/o-spreadsheet/pull/3632 of more details
+            const intersectZoneIndex = knownDataFilterZones.findIndex((knownZone) => overlap(knownZone, zone));
+            if (intersectZoneIndex !== -1) {
+                knownDataFilterZones[intersectZoneIndex] = zone;
+            }
+            else {
+                knownDataFilterZones.push(zone);
+            }
+        }
+        sheet.filterTables = knownDataFilterZones.map((zone) => ({
+            range: zoneToXc(zone),
+        }));
+    }
+    return data;
+}
 // -----------------------------------------------------------------------------
 // Helpers
 // -----------------------------------------------------------------------------
@@ -41046,14 +41057,12 @@ class SelectionInputsManagerPlugin extends UIPlugin {
                 break;
             case "FOCUS_RANGE":
             case "CHANGE_RANGE":
-                if (cmd.id !== this.focusedInputId) {
-                    const input = this.inputs[cmd.id];
-                    const range = input.ranges.find((range) => range.id === cmd.rangeId);
-                    if (this.isRangeValid(range?.xc || "A1")) {
-                        const sheetId = this.getters.getActiveSheetId();
-                        const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
-                        this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
-                    }
+                const input = this.inputs[cmd.id];
+                const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                if (range) {
+                    const sheetId = this.getters.getActiveSheetId();
+                    const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
+                    this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
                     this.focusedInputId = cmd.id;
                 }
                 break;
@@ -51671,6 +51680,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.4.23';
-__info__.date = '2024-02-16T14:23:29.521Z';
-__info__.hash = 'cb5db1a';
+__info__.version = '16.4.24';
+__info__.date = '2024-02-28T12:27:32.683Z';
+__info__.hash = '90c74d1';

package/dist/o-spreadsheet.iife.js

@@ -20668,7 +20668,7 @@
               : this.props.ranges()
                   ? this.props.ranges().map((xc, id) => ({
                       xc,
-                      id,
+                      id: id + 1,
                       isFocused: false,
                   }))
                   : [];
@@ -30909,29 +30909,12 @@
           from: 12,
           to: 12.5,
           applyMigration(data) {
-              for (let sheet of data.sheets || []) {
-                  let knownDataFilterZones = [];
-                  for (let filterTable of sheet.filterTables || []) {
-                      const zone = toZone(filterTable.range);
-                      // See commit message for the details
-                      const intersectZoneIndex = knownDataFilterZones.findIndex((knownZone) => overlap(knownZone, zone));
-                      if (intersectZoneIndex !== -1) {
-                          knownDataFilterZones[intersectZoneIndex] = zone;
-                      }
-                      else {
-                          knownDataFilterZones.push(zone);
-                      }
-                  }
-                  sheet.filterTables = knownDataFilterZones.map((zone) => ({
-                      range: zoneToXc(zone),
-                  }));
-              }
-              return data;
+              return fixOverlappingFilters(data);
           },
       },
       {
           description: "Change Border description structure",
-          from: 12,
+          from: 12.5,
           to: 13,
           applyMigration(data) {
               for (const borderId in data.borders) {
@@ -30962,6 +30945,14 @@
               return data;
           },
       },
+      {
+          description: "Fix datafilter duplication (post saas-16.4)",
+          from: 14,
+          to: 14.5,
+          applyMigration(data) {
+              return fixOverlappingFilters(data);
+          },
+      },
   ];
   /**
    * This function is used to repair faulty data independently of the migration.
@@ -31119,6 +31110,26 @@
       }
       return messages;
   }
+  function fixOverlappingFilters(data) {
+      for (let sheet of data.sheets || []) {
+          let knownDataFilterZones = [];
+          for (let filterTable of sheet.filterTables || []) {
+              const zone = toZone(filterTable.range);
+              // See commit message of https://github.com/odoo/o-spreadsheet/pull/3632 of more details
+              const intersectZoneIndex = knownDataFilterZones.findIndex((knownZone) => overlap(knownZone, zone));
+              if (intersectZoneIndex !== -1) {
+                  knownDataFilterZones[intersectZoneIndex] = zone;
+              }
+              else {
+                  knownDataFilterZones.push(zone);
+              }
+          }
+          sheet.filterTables = knownDataFilterZones.map((zone) => ({
+              range: zoneToXc(zone),
+          }));
+      }
+      return data;
+  }
   // -----------------------------------------------------------------------------
   // Helpers
   // -----------------------------------------------------------------------------
@@ -41047,14 +41058,12 @@
                   break;
               case "FOCUS_RANGE":
               case "CHANGE_RANGE":
-                  if (cmd.id !== this.focusedInputId) {
-                      const input = this.inputs[cmd.id];
-                      const range = input.ranges.find((range) => range.id === cmd.rangeId);
-                      if (this.isRangeValid(range?.xc || "A1")) {
-                          const sheetId = this.getters.getActiveSheetId();
-                          const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
-                          this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
-                      }
+                  const input = this.inputs[cmd.id];
+                  const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                  if (range) {
+                      const sheetId = this.getters.getActiveSheetId();
+                      const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
+                      this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
                       this.focusedInputId = cmd.id;
                   }
                   break;
@@ -51706,9 +51715,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.4.23';
-  __info__.date = '2024-02-16T14:23:29.521Z';
-  __info__.hash = 'cb5db1a';
+  __info__.version = '16.4.24';
+  __info__.date = '2024-02-28T12:27:32.683Z';
+  __info__.hash = '90c74d1';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);