Merge branch 'main' into domainpad

Author: SharadhNaidu

draftlogs/7826_fix.md

@@ -0,0 +1 @@
+- Respect explicit `node.x`/`node.y` positions in Sankey traces that contain unlinked or grouped nodes [[#7826](https://github.com/plotly/plotly.js/pull/7826)], with thanks to @kyo5uke for the contribution!

draftlogs/8071_fix.md

@@ -0,0 +1 @@
+- Fix numeric and numeric-string marker symbol variant detection in `scattergl` [[#8071](https://github.com/plotly/plotly.js/pull/8071)]

draftlogs/8139_fix.md

@@ -0,0 +1 @@
+ - Fix funnel `percentTotal` text formatting to display formatted percentages instead of raw ratios [[#8139](https://github.com/plotly/plotly.js/pull/8139)], with thanks to @ORITOMI for the contribution!

draftlogs/8145_add.md

@@ -0,0 +1 @@
+ - Add TypeScript declarations for lifecycle and WebGL context events [[#8145](https://github.com/plotly/plotly.js/pull/8145)]

lib/index.d.ts

@@ -81,28 +81,37 @@ export type {
 
 export type {
     BeforePlotEvent,
+    ButtonClickedEvent,
     ClickAnnotationEvent,
     FrameAnimationEvent,
+    IcicleClickEvent,
+    IciclePlotDatum,
     LegendClickEvent,
+    LegendTitleClickEvent,
     PlotCoordinate,
     PlotDatum,
     PlotHoverEvent,
     PlotlyEventName,
     PlotlyHTMLElement,
     PlotMouseEvent,
+    PlotReactEvent,
     PlotRelayoutEvent,
     PlotRestyleEvent,
     PlotRestyleEventUpdate,
     PlotScatterDataPoint,
     PlotScene,
     PlotSelectedData,
     PlotSelectionEvent,
+    PlotUpdateEvent,
     SelectionRange,
     SliderChangeEvent,
     SliderEndEvent,
     SliderStartEvent,
     SunburstClickEvent,
-    SunburstPlotDatum
+    SunburstPlotDatum,
+    TreemapClickEvent,
+    TreemapPlotDatum,
+    WebGLContextLostEvent
 } from '../src/types/core/events';
 
 // ---------------------------------------------------------------------------

src/traces/bar/plot.js

@@ -1107,7 +1107,7 @@ function calcTexttemplate(fullLayout, cd, index, xa, ya) {
         obj.percentPrevious = cdi.difR;
         obj.percentPreviousLabel = Lib.formatPercent(cdi.difR);
         obj.percentTotal = cdi.sumR;
-        obj.percenTotalLabel = Lib.formatPercent(cdi.sumR);
+        obj.percentTotalLabel = Lib.formatPercent(cdi.sumR);
     }
 
     var customdata = Lib.castOption(trace, cdi.i, 'customdata');

src/traces/sankey/render.js

@@ -261,15 +261,23 @@ function sankeyModel(layout, d, traceIndex) {
 
     // Force node position
     if(trace.node.x.length && trace.node.y.length) {
-        for(i = 0; i < Math.min(trace.node.x.length, trace.node.y.length, graph.nodes.length); i++) {
-            if(trace.node.x[i] && trace.node.y[i]) {
-                var pos = [trace.node.x[i] * width, trace.node.y[i] * height];
-                graph.nodes[i].x0 = pos[0] - nodeThickness / 2;
-                graph.nodes[i].x1 = pos[0] + nodeThickness / 2;
-
-                var nodeHeight = graph.nodes[i].y1 - graph.nodes[i].y0;
-                graph.nodes[i].y0 = pos[1] - nodeHeight / 2;
-                graph.nodes[i].y1 = pos[1] + nodeHeight / 2;
+        // graph.nodes omits unlinked nodes and may have transient group
+        // children unshifted to its front, so its order does not match
+        // trace.node.x/y. Index the explicit positions by each node's
+        // original pointNumber rather than by array position.
+        for(i = 0; i < graph.nodes.length; i++) {
+            var forcedNode = graph.nodes[i];
+            if(forcedNode.partOfGroup) continue;
+
+            var p = forcedNode.pointNumber;
+            if (trace.node.x[p] && trace.node.y[p]) {
+                var pos = [trace.node.x[p] * width, trace.node.y[p] * height];
+                forcedNode.x0 = pos[0] - nodeThickness / 2;
+                forcedNode.x1 = pos[0] + nodeThickness / 2;
+
+                var nodeHeight = forcedNode.y1 - forcedNode.y0;
+                forcedNode.y0 = pos[1] - nodeHeight / 2;
+                forcedNode.y1 = pos[1] + nodeHeight / 2;
             }
         }
         if(trace.arrangement === 'snap') {
@@ -825,13 +833,13 @@ function snappingForce(sankeyNode, forceKey, nodes, d) {
 // basic data utilities
 
 function persistFinalNodePositions(d, gd) {
-    var x = [];
-    var y = [];
-    for(var i = 0; i < d.graph.nodes.length; i++) {
-        var nodeX = (d.graph.nodes[i].x0 + d.graph.nodes[i].x1) / 2;
-        var nodeY = (d.graph.nodes[i].y0 + d.graph.nodes[i].y1) / 2;
-        x.push(nodeX / d.figure.width);
-        y.push(nodeY / d.figure.height);
+    // Write by pointNumber because graph.nodes omits unlinked nodes
+    const x = [...d.trace.node.x];
+    const y = [...d.trace.node.y];
+    for (const node of d.graph.nodes) {
+        if (node.partOfGroup) continue;
+        x[node.pointNumber] = (node.x0 + node.x1) / 2 / d.figure.width;
+        y[node.pointNumber] = (node.y0 + node.y1) / 2 / d.figure.height;
     }
     Registry.call('_guiRestyle', gd, {
         'node.x': [x],
@@ -1110,4 +1118,4 @@ module.exports = function(gd, svg, calcData, layout, callbacks) {
     nodeLabel
         .transition()
         .ease(c.ease).duration(c.duration);
-};
+};

src/traces/scattergl/constants.ts

@@ -6,9 +6,6 @@ export const SYMBOL_SDF_SIZE = 200;
 export const SYMBOL_SIZE = 20;
 export const SYMBOL_STROKE = SYMBOL_SIZE / 20;
 
-export const DOT_RE = /-dot/;
-export const OPEN_RE = /-open/;
-
 export const DASHES = {
     solid: [1],
     dot: [1, 1],

src/traces/scattergl/helpers.js

@@ -1,15 +1,7 @@
 'use strict';
 
-var constants = require('./constants');
+const { symbolNumber } = require('../../components/drawing');
 
-exports.isOpenSymbol = function(symbol) {
-    return (typeof symbol === 'string') ?
-        constants.OPEN_RE.test(symbol) :
-        symbol % 200 > 100;
-};
+exports.isOpenSymbol = (symbol) => symbolNumber(symbol) % 200 >= 100;
 
-exports.isDotSymbol = function(symbol) {
-    return (typeof symbol === 'string') ?
-        constants.DOT_RE.test(symbol) :
-        symbol > 200;
-};
+exports.isDotSymbol = (symbol) => symbolNumber(symbol) >= 200;