@odoo/o-spreadsheet 17.4.9 → 17.4.10

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 17.4.9
- * @date 2024-10-14T07:53:51.633Z
- * @hash b7015b7
+ * @version 17.4.10
+ * @date 2024-10-24T08:54:56.262Z
+ * @hash c82d9c1
  */
 
 (function (exports, owl) {
@@ -10624,67 +10624,108 @@ stores.inject(MyMetaStore, storeInstance);
           ctx.save();
           ctx.textAlign = "center";
           ctx.textBaseline = "middle";
-          ctx.fillStyle = chartFontColor(options.background);
-          ctx.strokeStyle = chartFontColor(ctx.fillStyle);
-          chart._metasets.forEach(function (dataset) {
-              switch (dataset.type) {
-                  case "doughnut":
-                  case "pie": {
-                      for (let i = 0; i < dataset._parsed.length; i++) {
-                          const bar = dataset.data[i];
-                          const { startAngle, endAngle, innerRadius, outerRadius } = bar;
-                          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;
-                          ctx.fillStyle = chartFontColor(bar.options.backgroundColor);
-                          ctx.strokeStyle = chartFontColor(ctx.fillStyle);
-                          const value = options.callback(dataset._parsed[i]);
-                          ctx.strokeText(value, x, y);
-                          ctx.fillText(value, x, y);
-                      }
-                      break;
-                  }
-                  case "bar":
-                  case "line": {
-                      const yOffset = dataset.type === "bar" && !options.horizontal ? 0 : 3;
-                      for (let i = 0; i < dataset._parsed.length; i++) {
-                          const point = dataset.data[i];
-                          const value = options.horizontal ? dataset._parsed[i].x : dataset._parsed[i].y;
-                          const displayedValue = options.callback(value - 0);
-                          let xPosition = 0, yPosition = 0;
-                          if (options.horizontal) {
-                              yPosition = point.y;
-                              if (value < 0) {
-                                  ctx.textAlign = "right";
-                                  xPosition = point.x - yOffset;
-                              }
-                              else {
-                                  ctx.textAlign = "left";
-                                  xPosition = point.x + yOffset;
-                              }
-                          }
-                          else {
-                              xPosition = point.x;
-                              if (value < 0) {
-                                  ctx.textBaseline = "top";
-                                  yPosition = point.y + yOffset;
-                              }
-                              else {
-                                  ctx.textBaseline = "bottom";
-                                  yPosition = point.y - yOffset;
-                              }
-                          }
-                          ctx.strokeText(displayedValue, xPosition, yPosition);
-                          ctx.fillText(displayedValue, xPosition, yPosition);
-                      }
-                      break;
-                  }
-              }
-          });
+          ctx.miterLimit = 1; // Avoid sharp artifacts on strokeText
+          switch (chart.config.type) {
+              case "pie":
+              case "doughnut":
+                  drawPieChartValues(chart, options, ctx);
+                  break;
+              case "bar":
+              case "line":
+                  options.horizontal
+                      ? drawHorizontalBarChartValues(chart, options, ctx)
+                      : drawLineOrBarChartValues(chart, options, ctx);
+                  break;
+          }
           ctx.restore();
       },
   };
+  function drawTextWithBackground(text, x, y, ctx) {
+      ctx.lineWidth = 3; // Stroke the text with a big lineWidth width to have some kind of background
+      ctx.strokeText(text, x, y);
+      ctx.lineWidth = 1;
+      ctx.fillText(text, x, y);
+  }
+  function drawLineOrBarChartValues(chart, options, ctx) {
+      const yMax = chart.chartArea.bottom;
+      const yMin = chart.chartArea.top;
+      const textsPositions = {};
+      for (const dataset of chart._metasets) {
+          for (let i = 0; i < dataset._parsed.length; i++) {
+              const value = dataset._parsed[i].y;
+              const point = dataset.data[i];
+              const xPosition = point.x;
+              let yPosition = 0;
+              if (chart.config.type === "line") {
+                  yPosition = point.y - 10;
+              }
+              else {
+                  yPosition = value < 0 ? point.y - point.height / 2 : point.y + point.height / 2;
+              }
+              yPosition = Math.min(yPosition, yMax);
+              yPosition = Math.max(yPosition, yMin);
+              // Avoid overlapping texts with same X
+              if (!textsPositions[xPosition]) {
+                  textsPositions[xPosition] = [];
+              }
+              for (const otherPosition of textsPositions[xPosition] || []) {
+                  if (Math.abs(otherPosition - yPosition) < 13) {
+                      yPosition = otherPosition - 13;
+                  }
+              }
+              textsPositions[xPosition].push(yPosition);
+              ctx.fillStyle = point.options.backgroundColor;
+              ctx.strokeStyle = options.background || "#ffffff";
+              drawTextWithBackground(options.callback(value - 0), xPosition, yPosition, ctx);
+          }
+      }
+  }
+  function drawHorizontalBarChartValues(chart, options, ctx) {
+      const xMax = chart.chartArea.right;
+      const xMin = chart.chartArea.left;
+      const textsPositions = {};
+      for (const dataset of chart._metasets) {
+          for (let i = 0; i < dataset._parsed.length; i++) {
+              const value = dataset._parsed[i].x;
+              const displayValue = options.callback(value - 0);
+              const point = dataset.data[i];
+              const yPosition = point.y;
+              let xPosition = value < 0 ? point.x + point.width / 2 : point.x - point.width / 2;
+              xPosition = Math.min(xPosition, xMax);
+              xPosition = Math.max(xPosition, xMin);
+              // Avoid overlapping texts with same Y
+              if (!textsPositions[yPosition]) {
+                  textsPositions[yPosition] = [];
+              }
+              const textWidth = computeTextWidth(ctx, displayValue, { fontSize: 12 }, "px");
+              for (const otherPosition of textsPositions[yPosition]) {
+                  if (Math.abs(otherPosition - xPosition) < textWidth) {
+                      xPosition = otherPosition + textWidth + 3;
+                  }
+              }
+              textsPositions[yPosition].push(xPosition);
+              ctx.fillStyle = point.options.backgroundColor;
+              ctx.strokeStyle = options.background || "#ffffff";
+              drawTextWithBackground(displayValue, xPosition, yPosition, ctx);
+          }
+      }
+  }
+  function drawPieChartValues(chart, options, ctx) {
+      for (const dataset of chart._metasets) {
+          for (let i = 0; i < dataset._parsed.length; i++) {
+              const bar = dataset.data[i];
+              const { startAngle, endAngle, innerRadius, outerRadius } = bar;
+              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;
+              ctx.fillStyle = chartFontColor(options.background);
+              ctx.strokeStyle = options.background || "#ffffff";
+              const value = options.callback(dataset._parsed[i]);
+              drawTextWithBackground(value, x, y, ctx);
+          }
+      }
+  }
 
   /** This is a chartJS plugin that will draw connector lines between the bars of a Waterfall chart */
   const waterfallLinesPlugin = {
@@ -23414,7 +23455,7 @@ stores.inject(MyMetaStore, storeInstance);
                           const xLabel = tooltipItem.dataset?.label || tooltipItem.label;
                           // tooltipItem.parsed can be an object or a number for pie charts
                           let yLabel = horizontalChart ? tooltipItem.parsed.x : tooltipItem.parsed.y;
-                          if (!yLabel) {
+                          if (yLabel === undefined || yLabel === null) {
                               yLabel = tooltipItem.parsed;
                           }
                           const toolTipFormat = !format && Math.abs(yLabel) >= 1000 ? "#,##" : format;
@@ -46531,7 +46572,7 @@ stores.inject(MyMetaStore, storeInstance);
       if (!data) {
           return createEmptyWorkbookData();
       }
-      console.group("Loading data");
+      console.debug("### Loading data ###");
       const start = performance.now();
       if (data["[Content_Types].xml"]) {
           const reader = new XlsxReader(data);
@@ -46545,13 +46586,13 @@ stores.inject(MyMetaStore, storeInstance);
       // apply migrations, if needed
       if ("version" in data) {
           if (data.version < CURRENT_VERSION) {
-              console.info("Migrating data from version", data.version);
+              console.debug("Migrating data from version", data.version);
               data = migrate(data);
           }
       }
       data = repairData(data);
-      console.info("Data loaded in", performance.now() - start, "ms");
-      console.groupEnd();
+      console.debug("Data loaded in", performance.now() - start, "ms");
+      console.debug("###");
       return data;
   }
   function migrate(data) {
@@ -46560,7 +46601,7 @@ stores.inject(MyMetaStore, storeInstance);
       for (let i = index; i < MIGRATIONS.length; i++) {
           data = MIGRATIONS[i].applyMigration(data);
       }
-      console.info("Data migrated in", performance.now() - start, "ms");
+      console.debug("Data migrated in", performance.now() - start, "ms");
       return data;
   }
   const MIGRATIONS = [
@@ -54120,7 +54161,7 @@ stores.inject(MyMetaStore, storeInstance);
           cellsToCompute.addMany(arrayFormulasPositions);
           cellsToCompute.addMany(this.getCellsDependingOn(arrayFormulasPositions));
           this.evaluate(cellsToCompute);
-          console.info("evaluate Cells", performance.now() - start, "ms");
+          console.debug("evaluate Cells", performance.now() - start, "ms");
       }
       getArrayFormulasImpactedByChangesOf(positions) {
           const impactedPositions = this.createEmptyPositionSet();
@@ -54159,7 +54200,7 @@ stores.inject(MyMetaStore, storeInstance);
           const start = performance.now();
           this.evaluatedCells = new PositionMap();
           this.evaluate(this.getAllCells());
-          console.info("evaluate all cells", performance.now() - start, "ms");
+          console.debug("evaluate all cells", performance.now() - start, "ms");
       }
       evaluateFormulaResult(sheetId, formulaString) {
           try {
@@ -57309,7 +57350,7 @@ stores.inject(MyMetaStore, storeInstance);
               this.onMessageReceived(message);
           }
           this.isReplayingInitialRevisions = false;
-          console.info("Replayed", numberOfCommands, "commands in", performance.now() - start, "ms");
+          console.debug("Replayed", numberOfCommands, "commands in", performance.now() - start, "ms");
       }
       /**
        * Notify the server that the user client left the collaborative session
@@ -67919,7 +67960,7 @@ stores.inject(MyMetaStore, storeInstance);
       coreHandlers = [];
       constructor(data = {}, config = {}, stateUpdateMessages = [], uuidGenerator = new UuidGenerator(), verboseImport = true) {
           const start = performance.now();
-          console.group("Model creation");
+          console.debug("##### Model creation #####");
           super();
           setDefaultTranslationMethod();
           stateUpdateMessages = repairInitialMessages(data, stateUpdateMessages);
@@ -67991,16 +68032,16 @@ stores.inject(MyMetaStore, storeInstance);
           this.joinSession();
           if (config.snapshotRequested) {
               const startSnapshot = performance.now();
-              console.info("Snapshot requested");
+              console.debug("Snapshot requested");
               this.session.snapshot(this.exportData());
               this.garbageCollectExternalResources();
-              console.info("Snapshot taken in", performance.now() - startSnapshot, "ms");
+              console.debug("Snapshot taken in", performance.now() - startSnapshot, "ms");
           }
           // mark all models as "raw", so they will not be turned into reactive objects
           // by owl, since we do not rely on reactivity
           owl.markRaw(this);
-          console.info("Model created in", performance.now() - start, "ms");
-          console.groupEnd();
+          console.debug("Model created in", performance.now() - start, "ms");
+          console.debug("######");
       }
       joinSession() {
           this.session.join(this.config.client);
@@ -68223,7 +68264,7 @@ stores.inject(MyMetaStore, storeInstance);
                       this.finalize();
                       const time = performance.now() - start;
                       if (time > 5) {
-                          console.info(type, time, "ms");
+                          console.debug(type, time, "ms");
                       }
                   });
                   this.session.save(command, commands, changes);
@@ -68609,9 +68650,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.4.9";
-  __info__.date = "2024-10-14T07:53:51.633Z";
-  __info__.hash = "b7015b7";
+  __info__.version = "17.4.10";
+  __info__.date = "2024-10-24T08:54:56.262Z";
+  __info__.hash = "c82d9c1";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);