Skip to content

Commit a8f31c3

Browse files
committed
Build with modified d3
1 parent 2cf0440 commit a8f31c3

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

build/jsroot.js

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const version_id = 'dev',
1414

1515
/** @summary version date
1616
* @desc Release date in format day/month/year like '14/04/2022' */
17-
version_date = '26/02/2026',
17+
version_date = '10/03/2026',
1818

1919
/** @summary version id and date
2020
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -2925,11 +2925,11 @@ function compareValue(compare) {
29252925
};
29262926
}
29272927

2928-
function chord() {
2929-
return chord$1(false);
2928+
function chord_default() {
2929+
return chord(false);
29302930
}
29312931

2932-
function chord$1(directed, transpose) {
2932+
function chord(directed, transpose) {
29332933
var padAngle = 0,
29342934
sortGroups = null,
29352935
sortSubgroups = null,
@@ -3280,7 +3280,7 @@ function ribbon(headRadius) {
32803280
return ribbon;
32813281
}
32823282

3283-
function ribbon$1() {
3283+
function ribbon_default() {
32843284
return ribbon();
32853285
}
32863286

@@ -5188,8 +5188,8 @@ function formatDecimal(x) {
51885188
// significant digits p, where x is positive and p is in [1, 21] or undefined.
51895189
// For example, formatDecimalParts(1.23) returns ["123", 0].
51905190
function formatDecimalParts(x, p) {
5191-
if ((i = (x = p ? x.toExponential(p - 1) : x.toExponential()).indexOf("e")) < 0) return null; // NaN, ±Infinity
5192-
var i, coefficient = x.slice(0, i);
5191+
if (!isFinite(x) || x === 0) return null; // NaN, ±Infinity, ±0
5192+
var i = (x = p ? x.toExponential(p - 1) : x.toExponential()).indexOf("e"), coefficient = x.slice(0, i);
51935193

51945194
// The string returned by toExponential either has the form \d\.\d+e[-+]\d+
51955195
// (e.g., 1.2e+3) or the form \de[-+]\d+ (e.g., 1e+3).
@@ -5294,7 +5294,7 @@ var prefixExponent;
52945294

52955295
function formatPrefixAuto(x, p) {
52965296
var d = formatDecimalParts(x, p);
5297-
if (!d) return x + "";
5297+
if (!d) return prefixExponent = undefined, x.toPrecision(p);
52985298
var coefficient = d[0],
52995299
exponent = d[1],
53005300
i = exponent - (prefixExponent = Math.max(-8, Math.min(8, Math.floor(exponent / 3))) * 3) + 1,
@@ -5348,7 +5348,7 @@ function formatLocale$1(locale) {
53485348
minus = locale.minus === undefined ? "−" : locale.minus + "",
53495349
nan = locale.nan === undefined ? "NaN" : locale.nan + "";
53505350

5351-
function newFormat(specifier) {
5351+
function newFormat(specifier, options) {
53525352
specifier = formatSpecifier(specifier);
53535353

53545354
var fill = specifier.fill,
@@ -5373,8 +5373,8 @@ function formatLocale$1(locale) {
53735373

53745374
// Compute the prefix and suffix.
53755375
// For SI-prefix, the suffix is lazily computed.
5376-
var prefix = symbol === "$" ? currencyPrefix : symbol === "#" && /[boxX]/.test(type) ? "0" + type.toLowerCase() : "",
5377-
suffix = symbol === "$" ? currencySuffix : /[%p]/.test(type) ? percent : "";
5376+
var prefix = (options && options.prefix !== undefined ? options.prefix : "") + (symbol === "$" ? currencyPrefix : symbol === "#" && /[boxX]/.test(type) ? "0" + type.toLowerCase() : ""),
5377+
suffix = (symbol === "$" ? currencySuffix : /[%p]/.test(type) ? percent : "") + (options && options.suffix !== undefined ? options.suffix : "");
53785378

53795379
// What format function should we use?
53805380
// Is this an integer type?
@@ -5415,7 +5415,7 @@ function formatLocale$1(locale) {
54155415

54165416
// Compute the prefix and suffix.
54175417
valuePrefix = (valueNegative ? (sign === "(" ? sign : minus) : sign === "-" || sign === "(" ? "" : sign) + valuePrefix;
5418-
valueSuffix = (type === "s" ? prefixes[8 + prefixExponent / 3] : "") + valueSuffix + (valueNegative && sign === "(" ? ")" : "");
5418+
valueSuffix = (type === "s" && !isNaN(value) && prefixExponent !== undefined ? prefixes[8 + prefixExponent / 3] : "") + valueSuffix + (valueNegative && sign === "(" ? ")" : "");
54195419

54205420
// Break the formatted value into the integer “value” part that can be
54215421
// grouped, and fractional or exponential “suffix” part that is not.
@@ -5460,12 +5460,11 @@ function formatLocale$1(locale) {
54605460
}
54615461

54625462
function formatPrefix(specifier, value) {
5463-
var f = newFormat((specifier = formatSpecifier(specifier), specifier.type = "f", specifier)),
5464-
e = Math.max(-8, Math.min(8, Math.floor(exponent(value) / 3))) * 3,
5463+
var e = Math.max(-8, Math.min(8, Math.floor(exponent(value) / 3))) * 3,
54655464
k = Math.pow(10, -e),
5466-
prefix = prefixes[8 + e / 3];
5465+
f = newFormat((specifier = formatSpecifier(specifier), specifier.type = "f", specifier), {suffix: prefixes[8 + e / 3]});
54675466
return function(value) {
5468-
return f(k * value) + prefix;
5467+
return f(k * value);
54695468
};
54705469
}
54715470

@@ -14363,9 +14362,8 @@ class ObjectPainter extends BasePainter {
1436314362
}
1436414363

1436514364
/** @summary Configure user-defined tooltip handler
14366-
* @desc Hook for the users to get tooltip information when mouse cursor moves over frame area
14365+
* @desc Hook for the users to get tooltip information when mouse cursor moves over then object
1436714366
* Handler function will be called every time when new data is selected
14368-
* when mouse leave frame area, handler(null) will be called
1436914367
* @param {function} handler - function called when tooltip is produced
1437014368
* @param {number} [tmout = 100] - delay in ms before tooltip delivered */
1437114369
configureUserTooltipHandler(handler, tmout = 100) {
@@ -101483,19 +101481,19 @@ let TH2Painter$2 = class TH2Painter extends THistPainter {
101483101481

101484101482
this.assignChordCircInteractive(midx, midy);
101485101483

101486-
const chord$1 = chord()
101484+
const chord = chord_default()
101487101485
.padAngle(10 / innerRadius)
101488101486
.sortSubgroups(d3_descending)
101489101487
.sortChords(d3_descending),
101490-
chords = chord$1(data),
101488+
chords = chord(data),
101491101489
group = g.append('g')
101492101490
.attr('font-size', 10)
101493101491
.attr('font-family', 'sans-serif')
101494101492
.selectAll('g')
101495101493
.data(chords.groups)
101496101494
.join('g'),
101497101495
arc$1 = arc().innerRadius(innerRadius).outerRadius(outerRadius),
101498-
ribbon = ribbon$1().radius(innerRadius - 1).padAngle(1 / innerRadius);
101496+
ribbon = ribbon_default().radius(innerRadius - 1).padAngle(1 / innerRadius);
101499101497

101500101498
function ticks({ startAngle, endAngle, value }) {
101501101499
const k = (endAngle - startAngle) / value,

modules/core.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const version_id = 'dev',
66

77
/** @summary version date
88
* @desc Release date in format day/month/year like '14/04/2022' */
9-
version_date = '26/02/2026',
9+
version_date = '10/03/2026',
1010

1111
/** @summary version id and date
1212
* @desc Produced by concatenation of {@link version_id} and {@link version_date}

0 commit comments

Comments
 (0)