Skip to content

Upgrade d3 formats#5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
archmoj wants to merge 6 commits into from
Closed

Upgrade d3 formats #5023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fb8266
apply latest d3-time-format in plotly.js
archmoj Jul 24, 2020
c3e3f54
apply latest d3-format in plotly.js
archmoj Jul 24, 2020
eafc956
update doc links for d3 formatters
archmoj Jul 24, 2020
c35aac5
need to change indicator delta auto default format
archmoj Jul 27, 2020
a53c750
need to change 0.f formatter in the mock
archmoj Jul 27, 2020
e3934d3
need to change localize test
archmoj Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,10 @@
"country-regex": "^1.1.0",
"d3": "^3.5.17",
"d3-force": "^1.2.1",
"d3-format": "^1.4.4",
"d3-hierarchy": "^1.1.9",
"d3-interpolate": "^1.4.0",
"d3-time-format": "^2.2.3",
"delaunay-triangulate": "^1.1.6",
"es6-promise": "^4.2.8",
"fast-isnumeric": "^1.1.4",
Expand Down
3 changes: 2 additions & 1 deletion src/components/drawing/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var isNumeric = require('fast-isnumeric');
var tinycolor = require('tinycolor2');

Expand DownExpand Up@@ -275,7 +276,7 @@ function makePointPath(symbolNumber, r) {

var HORZGRADIENT = {x1: 1, x2: 0, y1: 0, y2: 0};
var VERTGRADIENT = {x1: 0, x2: 0, y1: 1, y2: 0};
var stopFormatter = d3.format('~.1f');
var stopFormatter = numberFormat('~f');
var gradientInfo = {
radial: {node: 'radialGradient'},
radialreversed: {node: 'radialGradient', reversed: true},
Expand Down
4 changes: 2 additions & 2 deletions src/constants/docs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,6 @@
'use strict';

module.exports = {
FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
DATE_FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Formatting.md#format'
FORMAT_LINK: 'https://github.com/d3/d3-format#format',
DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
};
2 changes: 1 addition & 1 deletion src/lib/dates.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ var EPOCHJD = constants.EPOCHJD;

var Registry = require('../registry');

var utcFormat = d3.time.format.utc;
var utcFormat = require('d3-time-format').utcFormat;

var DATETIME_REGEXP = /^\s*(-?\d\d\d\d|\d\d)(-(\d?\d)(-(\d?\d)([ Tt]([01]?\d|2[0-3])(:([0-5]\d)(:([0-5]\d(\.\d+)?))?(Z|z|[+\-]\d\d(:?\d\d)?)?)?)?)?)?\s*$/m;
// special regex for chinese calendars to support yyyy-mmi-dd etc for intercalary months
Expand Down
7 changes: 4 additions & 3 deletions src/lib/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@

'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var numConstants = require('../constants/numerical');
Expand DownExpand Up@@ -1077,12 +1078,12 @@ function templateFormatString(string, labels, d3locale) {
if(format) {
var fmt;
if(format[0] === ':') {
fmt = d3locale ? d3locale.numberFormat : d3.format;
fmt = numberFormat;
value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
}

if(format[0] === '|') {
fmt = d3locale ? d3locale.timeFormat.utc : d3.time.format.utc;
fmt = d3locale ? d3locale.utcFormat : utcFormat;
var ms = lib.dateTime2ms(value);
value = lib.formatDate(ms, format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''), false, fmt);
}
Expand Down
5 changes: 3 additions & 2 deletions src/plots/cartesian/dragbox.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var tinycolor = require('tinycolor2');
var supportsPassive = require('has-passive-events');

Expand DownExpand Up@@ -983,11 +984,11 @@ function getEndText(ax, end) {
return initialVal;
} else if(ax.type === 'log') {
dig = Math.ceil(Math.max(0, -Math.log(diff) / Math.LN10)) + 3;
return d3.format('.' + dig + 'g')(Math.pow(10, initialVal));
return numberFormat('.' + dig + 'g')(Math.pow(10, initialVal));
} else { // linear numeric (or category... but just show numbers here)
dig = Math.floor(Math.log(Math.abs(initialVal)) / Math.LN10) -
Math.floor(Math.log(diff) / Math.LN10) + 4;
return d3.format('.' + String(dig) + 'g')(initialVal);
return numberFormat('.' + String(dig) + 'g')(initialVal);
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/plots/cartesian/set_convert.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var Lib = require('../../lib');
Expand DownExpand Up@@ -954,13 +956,13 @@ module.exports = function setConvert(ax, fullLayout) {
// Fall back on default format for dummy axes that don't care about formatting
var locale = fullLayout._d3locale;
if(ax.type === 'date') {
ax._dateFormat = locale ? locale.timeFormat.utc : d3.time.format.utc;
ax._dateFormat = locale ? locale.utcFormat : utcFormat;
ax._extraFormat = fullLayout._extraFormat;
}
// occasionally we need _numFormat to pass through
// even though it won't be needed by this axis
ax._separators = fullLayout.separators;
ax._numFormat = locale ? locale.numberFormat : d3.format;
ax._numFormat = numberFormat;

// and for bar charts and box plots: reset forced minimum tick spacing
delete ax._minDtick;
Expand Down
3 changes: 2 additions & 1 deletion src/plots/plots.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var timeFormatLocale = require('d3-time-format').timeFormatLocale;
var isNumeric = require('fast-isnumeric');

var Registry = require('../registry');
Expand DownExpand Up@@ -723,7 +724,7 @@ function getFormatter(formatObj, separators) {
formatObj.decimal = separators.charAt(0);
formatObj.thousands = separators.charAt(1);

return d3.locale(formatObj);
return timeFormatLocale(formatObj);
}

function fillMetaTextHelpers(newFullData, newFullLayout) {
Expand Down
2 changes: 1 addition & 1 deletion src/traces/indicator/defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
}
coerce('delta.reference', traceOut.value);
coerce('delta.relative');
coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
coerce('delta.valueformat', traceOut.delta.relative ? '.0%' : '');
coerce('delta.increasing.symbol');
coerce('delta.increasing.color');
coerce('delta.decreasing.symbol');
Expand Down
5 changes: 3 additions & 2 deletions src/traces/parcoords/parcoords.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var rgba = require('color-rgba');

var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -85,7 +86,7 @@ function domainScale(height, padding, dimension, tickvals, ticktext) {
var extent = dimensionExtent(dimension);
if(tickvals) {
return d3.scale.ordinal()
.domain(tickvals.map(toText(d3.format(dimension.tickformat), ticktext)))
.domain(tickvals.map(toText(numberFormat(dimension.tickformat), ticktext)))
.range(tickvals
.map(function(d) {
var unitVal = (d - extent[0]) / (extent[1] - extent[0]);
Expand DownExpand Up@@ -272,7 +273,7 @@ function viewModel(state, callbacks, model) {

// ensure ticktext and tickvals have same length
if(!Array.isArray(ticktext) || !ticktext.length) {
ticktext = tickvals.map(d3.format(dimension.tickformat));
ticktext = tickvals.map(numberFormat(dimension.tickformat));
} else if(ticktext.length > tickvals.length) {
ticktext = ticktext.slice(0, tickvals.length);
} else if(tickvals.length > ticktext.length) {
Expand Down
9 changes: 5 additions & 4 deletions src/traces/sankey/plot.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var render = require('./render');
var Fx = require('../../components/fx');
var Color = require('../../components/color');
Expand DownExpand Up@@ -200,7 +201,7 @@ module.exports = function plot(gd, calcData) {
link.fullData = link.trace;
obj = d.link.trace.link;
var hoverCenter = hoverCenterPosition(link);
var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(link.value) + d.valueSuffix};
var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(link.value) + d.valueSuffix};

hoverItems.push({
x: hoverCenter[0],
Expand All@@ -210,7 +211,7 @@ module.exports = function plot(gd, calcData) {
link.label || '',
sourceLabel + link.source.label,
targetLabel + link.target.label,
link.concentrationscale ? concentrationLabel + d3.format('%0.2f')(link.flow.labelConcentration) : ''
link.concentrationscale ? concentrationLabel + numberFormat('%0.2f')(link.flow.labelConcentration) : ''
].filter(renderableValuePresent).join('<br>'),
color: castHoverOption(obj, 'bgcolor') || Color.addOpacity(link.color, 1),
borderColor: castHoverOption(obj, 'bordercolor'),
Expand DownExpand Up@@ -289,14 +290,14 @@ module.exports = function plot(gd, calcData) {
var hoverCenterX1 = boundingBox.right + 2 - rootBBox.left;
var hoverCenterY = boundingBox.top + boundingBox.height / 4 - rootBBox.top;

var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix};
var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix};
d.node.fullData = d.node.trace;

var tooltip = Fx.loneHover({
x0: hoverCenterX0,
x1: hoverCenterX1,
y: hoverCenterY,
name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
name: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix,
text: [
d.node.label,
incomingLabel + d.node.targetLinks.length,
Expand Down
3 changes: 2 additions & 1 deletion src/traces/table/plot.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@

var c = require('./constants');
var d3 = require('d3');
var numberFormat = require('d3-format').format;
var gup = require('../../lib/gup');
var Drawing = require('../../components/drawing');
var svgUtil = require('../../lib/svg_text_utils');
Expand DownExpand Up@@ -534,7 +535,7 @@ function populateCellText(cellText, tableControlView, allColumnBlock, gd) {
var suffix = latex ? '' : gridPick(d.calcdata.cells.suffix, col, row) || '';
var format = latex ? null : gridPick(d.calcdata.cells.format, col, row) || null;

var prefixSuffixedText = prefix + (format ? d3.format(format)(d.value) : d.value) + suffix;
var prefixSuffixedText = prefix + (format ? numberFormat(format)(d.value) : d.value) + suffix;

var hasWrapSplitCharacter;
d.wrappingNeeded = !d.wrapped && !userBrokenText && !latex && (hasWrapSplitCharacter = hasWrapCharacter(prefixSuffixedText));
Expand Down
2 changes: 1 addition & 1 deletion test/image/mocks/texttemplate_scatter.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
"Toronto",
"Vancouver"
],
"texttemplate": "%{text}: (%{lon:.0f}, %{lat:0.f}): %{customdata:.2s}",
"texttemplate": "%{text}: (%{lon:.0f}, %{lat:~f}): %{customdata:.2s}",
"textposition": "top center",
"customdata": [1780000, 2930000, 675218],
"geo": "geo"
Expand Down
3 changes: 2 additions & 1 deletion test/jasmine/tests/axes_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
var Plotly = require('@lib/index');
var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plots = require('@src/plots/plots');
var Lib = require('@src/lib');
Expand DownExpand Up@@ -5206,7 +5207,7 @@ function getZoomOutButton(gd) {
}

function getFormatter(format) {
return d3.time.format.utc(format);
return utcFormat(format);
}

describe('Test Axes.getTickformat', function() {
Expand Down
8 changes: 4 additions & 4 deletions test/jasmine/tests/indicator_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ describe('Indicator defaults', function() {

it('defaults to displaying relative changes in percentage', function() {
var out = _supply({type: 'indicator', mode: 'delta', delta: {relative: true}, value: 1});
expect(out.delta.valueformat).toBe('2%');
expect(out.delta.valueformat).toBe('.0%');
});

it('should not ignore empty valueformat', function() {
Expand DownExpand Up@@ -164,7 +164,7 @@ describe('Indicator plot', function() {
Plotly.newPlot(gd, [{
type: 'indicator',
value: 500,
number: {valueformat: '0.f'}
number: {valueformat: '~f'}
}], {width: 400, height: 400})
.then(function() {
checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -185,7 +185,7 @@ describe('Indicator plot', function() {
Plotly.newPlot(gd, [{
type: 'indicator',
value: 1,
number: {valueformat: '0.f'}
number: {valueformat: '~f'}
}], {width: 400, height: 400})
.then(function() {
checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -208,7 +208,7 @@ describe('Indicator plot', function() {
type: 'indicator',
mode: 'number+delta',
value: 1,
number: {valueformat: '0.f'}
number: {valueformat: '~f'}
};
figure[numberType] = {font: {size: 100}};
Plotly.newPlot(gd, [figure], {width: 400, height: 400})
Expand Down
10 changes: 3 additions & 7 deletions test/jasmine/tests/localize_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ var _ = Lib._;
var Registry = require('@src/registry');

var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
Expand DownExpand Up@@ -236,7 +237,7 @@ describe('localization', function() {
expect(firstYLabel()).toBe('0~5');
var d0 = new Date(0); // thursday, Jan 1 1970 (UTC)
// sanity check that d0 is what we think...
expect(d3.time.format.utc('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
expect(utcFormat('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
// full names were not overridden, so fall back on english
expect(gd._fullLayout.xaxis._dateFormat('%a %b %A %B')(d0)).toBe('t !1 Thursday January');
})
Expand DownExpand Up@@ -306,15 +307,10 @@ describe('localization', function() {
.then(function() {
expect(firstYLabel()).toBe('0p5');

return Plotly.relayout(gd, {'yaxis.tickformat': '.3f'});
})
.then(function() {
expect(firstYLabel()).toBe('0p500');

return Plotly.relayout(gd, {separators: null});
})
.then(function() {
expect(firstYLabel()).toBe('0D500');
expect(firstYLabel()).toBe('0D5');
})
.catch(failTest)
.then(done);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Upgrade d3 formats by archmoj · Pull Request #5023 · plotly/plotly.js · GitHub
Skip to content
Upgrade d3 formats#5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

archmoj
wants to merge
6
commits into

from

 Closed


Upgrade d3 formats
#5023
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7fb8266

apply latest d3-time-format in plotly.js


archmoj Jul 24, 2020
c3e3f54

apply latest d3-format in plotly.js


archmoj Jul 24, 2020
eafc956

update doc links for d3 formatters


archmoj Jul 24, 2020
c35aac5

need to change indicator delta auto default format


archmoj Jul 27, 2020
a53c750

need to change 0.f formatter in the mock


archmoj Jul 27, 2020
e3934d3

need to change localize test


archmoj Jul 27, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,10 @@
 "country-regex": "^1.1.0",
 "d3": "^3.5.17",
 "d3-force": "^1.2.1",
 "d3-format": "^1.4.4",
 "d3-hierarchy": "^1.1.9",
 "d3-interpolate": "^1.4.0",
 "d3-time-format": "^2.2.3",
 "delaunay-triangulate": "^1.1.6",
 "es6-promise": "^4.2.8",
 "fast-isnumeric": "^1.1.4",
Expand Down

3 changes: 2 additions & 1 deletion
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var isNumeric = require('fast-isnumeric');
var tinycolor = require('tinycolor2');

Expand DownExpand Up@@ -275,7 +276,7 @@ function makePointPath(symbolNumber, r) {

var HORZGRADIENT = {x1: 1, x2: 0, y1: 0, y2: 0};
var VERTGRADIENT = {x1: 0, x2: 0, y1: 1, y2: 0};
var stopFormatter = d3.format('~.1f');
var stopFormatter = numberFormat('~f');
var gradientInfo = {
 radial: {node: 'radialGradient'},
 radialreversed: {node: 'radialGradient', reversed: true},
Expand Down

4 changes: 2 additions & 2 deletions
src/constants/docs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,6 @@
'use strict';

module.exports = {
 FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Formatting.md#format'
 FORMAT_LINK: 'https://github.com/d3/d3-format#format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
};

2 changes: 1 addition & 1 deletion
src/lib/dates.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ var EPOCHJD = constants.EPOCHJD;

var Registry = require('../registry');

var utcFormat = d3.time.format.utc;
var utcFormat = require('d3-time-format').utcFormat;

var DATETIME_REGEXP = /^\s*(-?\d\d\d\d|\d\d)(-(\d?\d)(-(\d?\d)([ Tt]([01]?\d|2[0-3])(:([0-5]\d)(:([0-5]\d(\.\d+)?))?(Z|z|[+\-]\d\d(:?\d\d)?)?)?)?)?)?\s*$/m;
// special regex for chinese calendars to support yyyy-mmi-dd etc for intercalary months
Expand Down

7 changes: 4 additions & 3 deletions
src/lib/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@

'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var numConstants = require('../constants/numerical');
Expand DownExpand Up@@ -1077,12 +1078,12 @@ function templateFormatString(string, labels, d3locale) {
 if(format) {
 var fmt;
 if(format[0] === ':') {
 fmt = d3locale ? d3locale.numberFormat : d3.format;
 fmt = numberFormat;
 value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
 }

 if(format[0] === '|') {
 fmt = d3locale ? d3locale.timeFormat.utc : d3.time.format.utc;
 fmt = d3locale ? d3locale.utcFormat : utcFormat;
 var ms = lib.dateTime2ms(value);
 value = lib.formatDate(ms, format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''), false, fmt);
 }
Expand Down

5 changes: 3 additions & 2 deletions
src/plots/cartesian/dragbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var tinycolor = require('tinycolor2');
var supportsPassive = require('has-passive-events');

Expand DownExpand Up@@ -983,11 +984,11 @@ function getEndText(ax, end) {
 return initialVal;
 } else if(ax.type === 'log') {
 dig = Math.ceil(Math.max(0, -Math.log(diff) / Math.LN10)) + 3;
 return d3.format('.' + dig + 'g')(Math.pow(10, initialVal));
 return numberFormat('.' + dig + 'g')(Math.pow(10, initialVal));
 } else { // linear numeric (or category... but just show numbers here)
 dig = Math.floor(Math.log(Math.abs(initialVal)) / Math.LN10) -
 Math.floor(Math.log(diff) / Math.LN10) + 4;
 return d3.format('.' + String(dig) + 'g')(initialVal);
 return numberFormat('.' + String(dig) + 'g')(initialVal);
 }
}

Expand Down

6 changes: 4 additions & 2 deletions
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var Lib = require('../../lib');
Expand DownExpand Up@@ -954,13 +956,13 @@ module.exports = function setConvert(ax, fullLayout) {
 // Fall back on default format for dummy axes that don't care about formatting
 var locale = fullLayout._d3locale;
 if(ax.type === 'date') {
 ax._dateFormat = locale ? locale.timeFormat.utc : d3.time.format.utc;
 ax._dateFormat = locale ? locale.utcFormat : utcFormat;
 ax._extraFormat = fullLayout._extraFormat;
 }
 // occasionally we need _numFormat to pass through
 // even though it won't be needed by this axis
 ax._separators = fullLayout.separators;
 ax._numFormat = locale ? locale.numberFormat : d3.format;
 ax._numFormat = numberFormat;

 // and for bar charts and box plots: reset forced minimum tick spacing
 delete ax._minDtick;
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var timeFormatLocale = require('d3-time-format').timeFormatLocale;
var isNumeric = require('fast-isnumeric');

var Registry = require('../registry');
Expand DownExpand Up@@ -723,7 +724,7 @@ function getFormatter(formatObj, separators) {
 formatObj.decimal = separators.charAt(0);
 formatObj.thousands = separators.charAt(1);

 return d3.locale(formatObj);
 return timeFormatLocale(formatObj);
}

function fillMetaTextHelpers(newFullData, newFullLayout) {
Expand Down

2 changes: 1 addition & 1 deletion
src/traces/indicator/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 }
 coerce('delta.reference', traceOut.value);
 coerce('delta.relative');
 coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
 coerce('delta.valueformat', traceOut.delta.relative ? '.0%' : '');
 coerce('delta.increasing.symbol');
 coerce('delta.increasing.color');
 coerce('delta.decreasing.symbol');
Expand Down

5 changes: 3 additions & 2 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var rgba = require('color-rgba');

var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -85,7 +86,7 @@ function domainScale(height, padding, dimension, tickvals, ticktext) {
 var extent = dimensionExtent(dimension);
 if(tickvals) {
 return d3.scale.ordinal()
 .domain(tickvals.map(toText(d3.format(dimension.tickformat), ticktext)))
 .domain(tickvals.map(toText(numberFormat(dimension.tickformat), ticktext)))
 .range(tickvals
 .map(function(d) {
 var unitVal = (d - extent[0]) / (extent[1] - extent[0]);
Expand DownExpand Up@@ -272,7 +273,7 @@ function viewModel(state, callbacks, model) {

 // ensure ticktext and tickvals have same length
 if(!Array.isArray(ticktext) || !ticktext.length) {
 ticktext = tickvals.map(d3.format(dimension.tickformat));
 ticktext = tickvals.map(numberFormat(dimension.tickformat));
 } else if(ticktext.length > tickvals.length) {
 ticktext = ticktext.slice(0, tickvals.length);
 } else if(tickvals.length > ticktext.length) {
Expand Down

9 changes: 5 additions & 4 deletions
src/traces/sankey/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var render = require('./render');
var Fx = require('../../components/fx');
var Color = require('../../components/color');
Expand DownExpand Up@@ -200,7 +201,7 @@ module.exports = function plot(gd, calcData) {
 link.fullData = link.trace;
 obj = d.link.trace.link;
 var hoverCenter = hoverCenterPosition(link);
 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(link.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(link.value) + d.valueSuffix};

 hoverItems.push({
 x: hoverCenter[0],
Expand All@@ -210,7 +211,7 @@ module.exports = function plot(gd, calcData) {
 link.label || '',
 sourceLabel + link.source.label,
 targetLabel + link.target.label,
 link.concentrationscale ? concentrationLabel + d3.format('%0.2f')(link.flow.labelConcentration) : ''
 link.concentrationscale ? concentrationLabel + numberFormat('%0.2f')(link.flow.labelConcentration) : ''
 ].filter(renderableValuePresent).join('<br>'),
 color: castHoverOption(obj, 'bgcolor') || Color.addOpacity(link.color, 1),
 borderColor: castHoverOption(obj, 'bordercolor'),
Expand DownExpand Up@@ -289,14 +290,14 @@ module.exports = function plot(gd, calcData) {
 var hoverCenterX1 = boundingBox.right + 2 - rootBBox.left;
 var hoverCenterY = boundingBox.top + boundingBox.height / 4 - rootBBox.top;

 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix};
 d.node.fullData = d.node.trace;

 var tooltip = Fx.loneHover({
 x0: hoverCenterX0,
 x1: hoverCenterX1,
 y: hoverCenterY,
 name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
 name: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix,
 text: [
 d.node.label,
 incomingLabel + d.node.targetLinks.length,
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/table/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@

var c = require('./constants');
var d3 = require('d3');
var numberFormat = require('d3-format').format;
var gup = require('../../lib/gup');
var Drawing = require('../../components/drawing');
var svgUtil = require('../../lib/svg_text_utils');
Expand DownExpand Up@@ -534,7 +535,7 @@ function populateCellText(cellText, tableControlView, allColumnBlock, gd) {
 var suffix = latex ? '' : gridPick(d.calcdata.cells.suffix, col, row) || '';
 var format = latex ? null : gridPick(d.calcdata.cells.format, col, row) || null;

 var prefixSuffixedText = prefix + (format ? d3.format(format)(d.value) : d.value) + suffix;
 var prefixSuffixedText = prefix + (format ? numberFormat(format)(d.value) : d.value) + suffix;

 var hasWrapSplitCharacter;
 d.wrappingNeeded = !d.wrapped && !userBrokenText && !latex && (hasWrapSplitCharacter = hasWrapCharacter(prefixSuffixedText));
Expand Down

2 changes: 1 addition & 1 deletion
test/image/mocks/texttemplate_scatter.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 "Toronto",
 "Vancouver"
 ],
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:0.f}): %{customdata:.2s}",
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:~f}): %{customdata:.2s}",
 "textposition": "top center",
 "customdata": [1780000, 2930000, 675218],
 "geo": "geo"
Expand Down

3 changes: 2 additions & 1 deletion
test/jasmine/tests/axes_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
var Plotly = require('@lib/index');
var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plots = require('@src/plots/plots');
var Lib = require('@src/lib');
Expand DownExpand Up@@ -5206,7 +5207,7 @@ function getZoomOutButton(gd) {
}

function getFormatter(format) {
 return d3.time.format.utc(format);
 return utcFormat(format);
}

describe('Test Axes.getTickformat', function() {
Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/indicator_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ describe('Indicator defaults', function() {

 it('defaults to displaying relative changes in percentage', function() {
 var out = _supply({type: 'indicator', mode: 'delta', delta: {relative: true}, value: 1});
 expect(out.delta.valueformat).toBe('2%');
 expect(out.delta.valueformat).toBe('.0%');
 });

 it('should not ignore empty valueformat', function() {
Expand DownExpand Up@@ -164,7 +164,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 500,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -185,7 +185,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -208,7 +208,7 @@ describe('Indicator plot', function() {
 type: 'indicator',
 mode: 'number+delta',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 };
 figure[numberType] = {font: {size: 100}};
 Plotly.newPlot(gd, [figure], {width: 400, height: 400})
Expand Down

10 changes: 3 additions & 7 deletions
test/jasmine/tests/localize_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ var _ = Lib._;
var Registry = require('@src/registry');

var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
Expand DownExpand Up@@ -236,7 +237,7 @@ describe('localization', function() {
 expect(firstYLabel()).toBe('0~5');
 var d0 = new Date(0); // thursday, Jan 1 1970 (UTC)
 // sanity check that d0 is what we think...
 expect(d3.time.format.utc('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 expect(utcFormat('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 // full names were not overridden, so fall back on english
 expect(gd._fullLayout.xaxis._dateFormat('%a %b %A %B')(d0)).toBe('t !1 Thursday January');
 })
Expand DownExpand Up@@ -306,15 +307,10 @@ describe('localization', function() {
 .then(function() {
 expect(firstYLabel()).toBe('0p5');

 return Plotly.relayout(gd, {'yaxis.tickformat': '.3f'});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0p500');

 return Plotly.relayout(gd, {separators: null});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0D500');
 expect(firstYLabel()).toBe('0D5');
 })
 .catch(failTest)
 .then(done);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Upgrade d3 formats by archmoj · Pull Request #5023 · plotly/plotly.js · GitHub
Skip to content
Upgrade d3 formats#5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

archmoj
wants to merge
6
commits into

from

 Closed


Upgrade d3 formats
#5023
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7fb8266

apply latest d3-time-format in plotly.js


archmoj Jul 24, 2020
c3e3f54

apply latest d3-format in plotly.js


archmoj Jul 24, 2020
eafc956

update doc links for d3 formatters


archmoj Jul 24, 2020
c35aac5

need to change indicator delta auto default format


archmoj Jul 27, 2020
a53c750

need to change 0.f formatter in the mock


archmoj Jul 27, 2020
e3934d3

need to change localize test


archmoj Jul 27, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,10 @@
 "country-regex": "^1.1.0",
 "d3": "^3.5.17",
 "d3-force": "^1.2.1",
 "d3-format": "^1.4.4",
 "d3-hierarchy": "^1.1.9",
 "d3-interpolate": "^1.4.0",
 "d3-time-format": "^2.2.3",
 "delaunay-triangulate": "^1.1.6",
 "es6-promise": "^4.2.8",
 "fast-isnumeric": "^1.1.4",
Expand Down

3 changes: 2 additions & 1 deletion
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var isNumeric = require('fast-isnumeric');
var tinycolor = require('tinycolor2');

Expand DownExpand Up@@ -275,7 +276,7 @@ function makePointPath(symbolNumber, r) {

var HORZGRADIENT = {x1: 1, x2: 0, y1: 0, y2: 0};
var VERTGRADIENT = {x1: 0, x2: 0, y1: 1, y2: 0};
var stopFormatter = d3.format('~.1f');
var stopFormatter = numberFormat('~f');
var gradientInfo = {
 radial: {node: 'radialGradient'},
 radialreversed: {node: 'radialGradient', reversed: true},
Expand Down

4 changes: 2 additions & 2 deletions
src/constants/docs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,6 @@
'use strict';

module.exports = {
 FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Formatting.md#format'
 FORMAT_LINK: 'https://github.com/d3/d3-format#format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
};

2 changes: 1 addition & 1 deletion
src/lib/dates.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ var EPOCHJD = constants.EPOCHJD;

var Registry = require('../registry');

var utcFormat = d3.time.format.utc;
var utcFormat = require('d3-time-format').utcFormat;

var DATETIME_REGEXP = /^\s*(-?\d\d\d\d|\d\d)(-(\d?\d)(-(\d?\d)([ Tt]([01]?\d|2[0-3])(:([0-5]\d)(:([0-5]\d(\.\d+)?))?(Z|z|[+\-]\d\d(:?\d\d)?)?)?)?)?)?\s*$/m;
// special regex for chinese calendars to support yyyy-mmi-dd etc for intercalary months
Expand Down

7 changes: 4 additions & 3 deletions
src/lib/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@

'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var numConstants = require('../constants/numerical');
Expand DownExpand Up@@ -1077,12 +1078,12 @@ function templateFormatString(string, labels, d3locale) {
 if(format) {
 var fmt;
 if(format[0] === ':') {
 fmt = d3locale ? d3locale.numberFormat : d3.format;
 fmt = numberFormat;
 value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
 }

 if(format[0] === '|') {
 fmt = d3locale ? d3locale.timeFormat.utc : d3.time.format.utc;
 fmt = d3locale ? d3locale.utcFormat : utcFormat;
 var ms = lib.dateTime2ms(value);
 value = lib.formatDate(ms, format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''), false, fmt);
 }
Expand Down

5 changes: 3 additions & 2 deletions
src/plots/cartesian/dragbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var tinycolor = require('tinycolor2');
var supportsPassive = require('has-passive-events');

Expand DownExpand Up@@ -983,11 +984,11 @@ function getEndText(ax, end) {
 return initialVal;
 } else if(ax.type === 'log') {
 dig = Math.ceil(Math.max(0, -Math.log(diff) / Math.LN10)) + 3;
 return d3.format('.' + dig + 'g')(Math.pow(10, initialVal));
 return numberFormat('.' + dig + 'g')(Math.pow(10, initialVal));
 } else { // linear numeric (or category... but just show numbers here)
 dig = Math.floor(Math.log(Math.abs(initialVal)) / Math.LN10) -
 Math.floor(Math.log(diff) / Math.LN10) + 4;
 return d3.format('.' + String(dig) + 'g')(initialVal);
 return numberFormat('.' + String(dig) + 'g')(initialVal);
 }
}

Expand Down

6 changes: 4 additions & 2 deletions
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var Lib = require('../../lib');
Expand DownExpand Up@@ -954,13 +956,13 @@ module.exports = function setConvert(ax, fullLayout) {
 // Fall back on default format for dummy axes that don't care about formatting
 var locale = fullLayout._d3locale;
 if(ax.type === 'date') {
 ax._dateFormat = locale ? locale.timeFormat.utc : d3.time.format.utc;
 ax._dateFormat = locale ? locale.utcFormat : utcFormat;
 ax._extraFormat = fullLayout._extraFormat;
 }
 // occasionally we need _numFormat to pass through
 // even though it won't be needed by this axis
 ax._separators = fullLayout.separators;
 ax._numFormat = locale ? locale.numberFormat : d3.format;
 ax._numFormat = numberFormat;

 // and for bar charts and box plots: reset forced minimum tick spacing
 delete ax._minDtick;
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var timeFormatLocale = require('d3-time-format').timeFormatLocale;
var isNumeric = require('fast-isnumeric');

var Registry = require('../registry');
Expand DownExpand Up@@ -723,7 +724,7 @@ function getFormatter(formatObj, separators) {
 formatObj.decimal = separators.charAt(0);
 formatObj.thousands = separators.charAt(1);

 return d3.locale(formatObj);
 return timeFormatLocale(formatObj);
}

function fillMetaTextHelpers(newFullData, newFullLayout) {
Expand Down

2 changes: 1 addition & 1 deletion
src/traces/indicator/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 }
 coerce('delta.reference', traceOut.value);
 coerce('delta.relative');
 coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
 coerce('delta.valueformat', traceOut.delta.relative ? '.0%' : '');
 coerce('delta.increasing.symbol');
 coerce('delta.increasing.color');
 coerce('delta.decreasing.symbol');
Expand Down

5 changes: 3 additions & 2 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var rgba = require('color-rgba');

var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -85,7 +86,7 @@ function domainScale(height, padding, dimension, tickvals, ticktext) {
 var extent = dimensionExtent(dimension);
 if(tickvals) {
 return d3.scale.ordinal()
 .domain(tickvals.map(toText(d3.format(dimension.tickformat), ticktext)))
 .domain(tickvals.map(toText(numberFormat(dimension.tickformat), ticktext)))
 .range(tickvals
 .map(function(d) {
 var unitVal = (d - extent[0]) / (extent[1] - extent[0]);
Expand DownExpand Up@@ -272,7 +273,7 @@ function viewModel(state, callbacks, model) {

 // ensure ticktext and tickvals have same length
 if(!Array.isArray(ticktext) || !ticktext.length) {
 ticktext = tickvals.map(d3.format(dimension.tickformat));
 ticktext = tickvals.map(numberFormat(dimension.tickformat));
 } else if(ticktext.length > tickvals.length) {
 ticktext = ticktext.slice(0, tickvals.length);
 } else if(tickvals.length > ticktext.length) {
Expand Down

9 changes: 5 additions & 4 deletions
src/traces/sankey/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var render = require('./render');
var Fx = require('../../components/fx');
var Color = require('../../components/color');
Expand DownExpand Up@@ -200,7 +201,7 @@ module.exports = function plot(gd, calcData) {
 link.fullData = link.trace;
 obj = d.link.trace.link;
 var hoverCenter = hoverCenterPosition(link);
 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(link.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(link.value) + d.valueSuffix};

 hoverItems.push({
 x: hoverCenter[0],
Expand All@@ -210,7 +211,7 @@ module.exports = function plot(gd, calcData) {
 link.label || '',
 sourceLabel + link.source.label,
 targetLabel + link.target.label,
 link.concentrationscale ? concentrationLabel + d3.format('%0.2f')(link.flow.labelConcentration) : ''
 link.concentrationscale ? concentrationLabel + numberFormat('%0.2f')(link.flow.labelConcentration) : ''
 ].filter(renderableValuePresent).join('<br>'),
 color: castHoverOption(obj, 'bgcolor') || Color.addOpacity(link.color, 1),
 borderColor: castHoverOption(obj, 'bordercolor'),
Expand DownExpand Up@@ -289,14 +290,14 @@ module.exports = function plot(gd, calcData) {
 var hoverCenterX1 = boundingBox.right + 2 - rootBBox.left;
 var hoverCenterY = boundingBox.top + boundingBox.height / 4 - rootBBox.top;

 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix};
 d.node.fullData = d.node.trace;

 var tooltip = Fx.loneHover({
 x0: hoverCenterX0,
 x1: hoverCenterX1,
 y: hoverCenterY,
 name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
 name: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix,
 text: [
 d.node.label,
 incomingLabel + d.node.targetLinks.length,
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/table/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@

var c = require('./constants');
var d3 = require('d3');
var numberFormat = require('d3-format').format;
var gup = require('../../lib/gup');
var Drawing = require('../../components/drawing');
var svgUtil = require('../../lib/svg_text_utils');
Expand DownExpand Up@@ -534,7 +535,7 @@ function populateCellText(cellText, tableControlView, allColumnBlock, gd) {
 var suffix = latex ? '' : gridPick(d.calcdata.cells.suffix, col, row) || '';
 var format = latex ? null : gridPick(d.calcdata.cells.format, col, row) || null;

 var prefixSuffixedText = prefix + (format ? d3.format(format)(d.value) : d.value) + suffix;
 var prefixSuffixedText = prefix + (format ? numberFormat(format)(d.value) : d.value) + suffix;

 var hasWrapSplitCharacter;
 d.wrappingNeeded = !d.wrapped && !userBrokenText && !latex && (hasWrapSplitCharacter = hasWrapCharacter(prefixSuffixedText));
Expand Down

2 changes: 1 addition & 1 deletion
test/image/mocks/texttemplate_scatter.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 "Toronto",
 "Vancouver"
 ],
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:0.f}): %{customdata:.2s}",
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:~f}): %{customdata:.2s}",
 "textposition": "top center",
 "customdata": [1780000, 2930000, 675218],
 "geo": "geo"
Expand Down

3 changes: 2 additions & 1 deletion
test/jasmine/tests/axes_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
var Plotly = require('@lib/index');
var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plots = require('@src/plots/plots');
var Lib = require('@src/lib');
Expand DownExpand Up@@ -5206,7 +5207,7 @@ function getZoomOutButton(gd) {
}

function getFormatter(format) {
 return d3.time.format.utc(format);
 return utcFormat(format);
}

describe('Test Axes.getTickformat', function() {
Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/indicator_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ describe('Indicator defaults', function() {

 it('defaults to displaying relative changes in percentage', function() {
 var out = _supply({type: 'indicator', mode: 'delta', delta: {relative: true}, value: 1});
 expect(out.delta.valueformat).toBe('2%');
 expect(out.delta.valueformat).toBe('.0%');
 });

 it('should not ignore empty valueformat', function() {
Expand DownExpand Up@@ -164,7 +164,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 500,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -185,7 +185,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -208,7 +208,7 @@ describe('Indicator plot', function() {
 type: 'indicator',
 mode: 'number+delta',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 };
 figure[numberType] = {font: {size: 100}};
 Plotly.newPlot(gd, [figure], {width: 400, height: 400})
Expand Down

10 changes: 3 additions & 7 deletions
test/jasmine/tests/localize_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ var _ = Lib._;
var Registry = require('@src/registry');

var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
Expand DownExpand Up@@ -236,7 +237,7 @@ describe('localization', function() {
 expect(firstYLabel()).toBe('0~5');
 var d0 = new Date(0); // thursday, Jan 1 1970 (UTC)
 // sanity check that d0 is what we think...
 expect(d3.time.format.utc('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 expect(utcFormat('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 // full names were not overridden, so fall back on english
 expect(gd._fullLayout.xaxis._dateFormat('%a %b %A %B')(d0)).toBe('t !1 Thursday January');
 })
Expand DownExpand Up@@ -306,15 +307,10 @@ describe('localization', function() {
 .then(function() {
 expect(firstYLabel()).toBe('0p5');

 return Plotly.relayout(gd, {'yaxis.tickformat': '.3f'});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0p500');

 return Plotly.relayout(gd, {separators: null});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0D500');
 expect(firstYLabel()).toBe('0D5');
 })
 .catch(failTest)
 .then(done);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Upgrade d3 formats by archmoj · Pull Request #5023 · plotly/plotly.js · GitHub
Skip to content
Upgrade d3 formats#5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

archmoj
wants to merge
6
commits into

from

 Closed


Upgrade d3 formats
#5023
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7fb8266

apply latest d3-time-format in plotly.js


archmoj Jul 24, 2020
c3e3f54

apply latest d3-format in plotly.js


archmoj Jul 24, 2020
eafc956

update doc links for d3 formatters


archmoj Jul 24, 2020
c35aac5

need to change indicator delta auto default format


archmoj Jul 27, 2020
a53c750

need to change 0.f formatter in the mock


archmoj Jul 27, 2020
e3934d3

need to change localize test


archmoj Jul 27, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,10 @@
 "country-regex": "^1.1.0",
 "d3": "^3.5.17",
 "d3-force": "^1.2.1",
 "d3-format": "^1.4.4",
 "d3-hierarchy": "^1.1.9",
 "d3-interpolate": "^1.4.0",
 "d3-time-format": "^2.2.3",
 "delaunay-triangulate": "^1.1.6",
 "es6-promise": "^4.2.8",
 "fast-isnumeric": "^1.1.4",
Expand Down

3 changes: 2 additions & 1 deletion
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var isNumeric = require('fast-isnumeric');
var tinycolor = require('tinycolor2');

Expand DownExpand Up@@ -275,7 +276,7 @@ function makePointPath(symbolNumber, r) {

var HORZGRADIENT = {x1: 1, x2: 0, y1: 0, y2: 0};
var VERTGRADIENT = {x1: 0, x2: 0, y1: 1, y2: 0};
var stopFormatter = d3.format('~.1f');
var stopFormatter = numberFormat('~f');
var gradientInfo = {
 radial: {node: 'radialGradient'},
 radialreversed: {node: 'radialGradient', reversed: true},
Expand Down

4 changes: 2 additions & 2 deletions
src/constants/docs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,6 @@
'use strict';

module.exports = {
 FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Formatting.md#format'
 FORMAT_LINK: 'https://github.com/d3/d3-format#format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
};

2 changes: 1 addition & 1 deletion
src/lib/dates.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ var EPOCHJD = constants.EPOCHJD;

var Registry = require('../registry');

var utcFormat = d3.time.format.utc;
var utcFormat = require('d3-time-format').utcFormat;

var DATETIME_REGEXP = /^\s*(-?\d\d\d\d|\d\d)(-(\d?\d)(-(\d?\d)([ Tt]([01]?\d|2[0-3])(:([0-5]\d)(:([0-5]\d(\.\d+)?))?(Z|z|[+\-]\d\d(:?\d\d)?)?)?)?)?)?\s*$/m;
// special regex for chinese calendars to support yyyy-mmi-dd etc for intercalary months
Expand Down

7 changes: 4 additions & 3 deletions
src/lib/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@

'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var numConstants = require('../constants/numerical');
Expand DownExpand Up@@ -1077,12 +1078,12 @@ function templateFormatString(string, labels, d3locale) {
 if(format) {
 var fmt;
 if(format[0] === ':') {
 fmt = d3locale ? d3locale.numberFormat : d3.format;
 fmt = numberFormat;
 value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
 }

 if(format[0] === '|') {
 fmt = d3locale ? d3locale.timeFormat.utc : d3.time.format.utc;
 fmt = d3locale ? d3locale.utcFormat : utcFormat;
 var ms = lib.dateTime2ms(value);
 value = lib.formatDate(ms, format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''), false, fmt);
 }
Expand Down

5 changes: 3 additions & 2 deletions
src/plots/cartesian/dragbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var tinycolor = require('tinycolor2');
var supportsPassive = require('has-passive-events');

Expand DownExpand Up@@ -983,11 +984,11 @@ function getEndText(ax, end) {
 return initialVal;
 } else if(ax.type === 'log') {
 dig = Math.ceil(Math.max(0, -Math.log(diff) / Math.LN10)) + 3;
 return d3.format('.' + dig + 'g')(Math.pow(10, initialVal));
 return numberFormat('.' + dig + 'g')(Math.pow(10, initialVal));
 } else { // linear numeric (or category... but just show numbers here)
 dig = Math.floor(Math.log(Math.abs(initialVal)) / Math.LN10) -
 Math.floor(Math.log(diff) / Math.LN10) + 4;
 return d3.format('.' + String(dig) + 'g')(initialVal);
 return numberFormat('.' + String(dig) + 'g')(initialVal);
 }
}

Expand Down

6 changes: 4 additions & 2 deletions
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var Lib = require('../../lib');
Expand DownExpand Up@@ -954,13 +956,13 @@ module.exports = function setConvert(ax, fullLayout) {
 // Fall back on default format for dummy axes that don't care about formatting
 var locale = fullLayout._d3locale;
 if(ax.type === 'date') {
 ax._dateFormat = locale ? locale.timeFormat.utc : d3.time.format.utc;
 ax._dateFormat = locale ? locale.utcFormat : utcFormat;
 ax._extraFormat = fullLayout._extraFormat;
 }
 // occasionally we need _numFormat to pass through
 // even though it won't be needed by this axis
 ax._separators = fullLayout.separators;
 ax._numFormat = locale ? locale.numberFormat : d3.format;
 ax._numFormat = numberFormat;

 // and for bar charts and box plots: reset forced minimum tick spacing
 delete ax._minDtick;
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var timeFormatLocale = require('d3-time-format').timeFormatLocale;
var isNumeric = require('fast-isnumeric');

var Registry = require('../registry');
Expand DownExpand Up@@ -723,7 +724,7 @@ function getFormatter(formatObj, separators) {
 formatObj.decimal = separators.charAt(0);
 formatObj.thousands = separators.charAt(1);

 return d3.locale(formatObj);
 return timeFormatLocale(formatObj);
}

function fillMetaTextHelpers(newFullData, newFullLayout) {
Expand Down

2 changes: 1 addition & 1 deletion
src/traces/indicator/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 }
 coerce('delta.reference', traceOut.value);
 coerce('delta.relative');
 coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
 coerce('delta.valueformat', traceOut.delta.relative ? '.0%' : '');
 coerce('delta.increasing.symbol');
 coerce('delta.increasing.color');
 coerce('delta.decreasing.symbol');
Expand Down

5 changes: 3 additions & 2 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var rgba = require('color-rgba');

var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -85,7 +86,7 @@ function domainScale(height, padding, dimension, tickvals, ticktext) {
 var extent = dimensionExtent(dimension);
 if(tickvals) {
 return d3.scale.ordinal()
 .domain(tickvals.map(toText(d3.format(dimension.tickformat), ticktext)))
 .domain(tickvals.map(toText(numberFormat(dimension.tickformat), ticktext)))
 .range(tickvals
 .map(function(d) {
 var unitVal = (d - extent[0]) / (extent[1] - extent[0]);
Expand DownExpand Up@@ -272,7 +273,7 @@ function viewModel(state, callbacks, model) {

 // ensure ticktext and tickvals have same length
 if(!Array.isArray(ticktext) || !ticktext.length) {
 ticktext = tickvals.map(d3.format(dimension.tickformat));
 ticktext = tickvals.map(numberFormat(dimension.tickformat));
 } else if(ticktext.length > tickvals.length) {
 ticktext = ticktext.slice(0, tickvals.length);
 } else if(tickvals.length > ticktext.length) {
Expand Down

9 changes: 5 additions & 4 deletions
src/traces/sankey/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var render = require('./render');
var Fx = require('../../components/fx');
var Color = require('../../components/color');
Expand DownExpand Up@@ -200,7 +201,7 @@ module.exports = function plot(gd, calcData) {
 link.fullData = link.trace;
 obj = d.link.trace.link;
 var hoverCenter = hoverCenterPosition(link);
 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(link.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(link.value) + d.valueSuffix};

 hoverItems.push({
 x: hoverCenter[0],
Expand All@@ -210,7 +211,7 @@ module.exports = function plot(gd, calcData) {
 link.label || '',
 sourceLabel + link.source.label,
 targetLabel + link.target.label,
 link.concentrationscale ? concentrationLabel + d3.format('%0.2f')(link.flow.labelConcentration) : ''
 link.concentrationscale ? concentrationLabel + numberFormat('%0.2f')(link.flow.labelConcentration) : ''
 ].filter(renderableValuePresent).join('<br>'),
 color: castHoverOption(obj, 'bgcolor') || Color.addOpacity(link.color, 1),
 borderColor: castHoverOption(obj, 'bordercolor'),
Expand DownExpand Up@@ -289,14 +290,14 @@ module.exports = function plot(gd, calcData) {
 var hoverCenterX1 = boundingBox.right + 2 - rootBBox.left;
 var hoverCenterY = boundingBox.top + boundingBox.height / 4 - rootBBox.top;

 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix};
 d.node.fullData = d.node.trace;

 var tooltip = Fx.loneHover({
 x0: hoverCenterX0,
 x1: hoverCenterX1,
 y: hoverCenterY,
 name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
 name: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix,
 text: [
 d.node.label,
 incomingLabel + d.node.targetLinks.length,
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/table/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@

var c = require('./constants');
var d3 = require('d3');
var numberFormat = require('d3-format').format;
var gup = require('../../lib/gup');
var Drawing = require('../../components/drawing');
var svgUtil = require('../../lib/svg_text_utils');
Expand DownExpand Up@@ -534,7 +535,7 @@ function populateCellText(cellText, tableControlView, allColumnBlock, gd) {
 var suffix = latex ? '' : gridPick(d.calcdata.cells.suffix, col, row) || '';
 var format = latex ? null : gridPick(d.calcdata.cells.format, col, row) || null;

 var prefixSuffixedText = prefix + (format ? d3.format(format)(d.value) : d.value) + suffix;
 var prefixSuffixedText = prefix + (format ? numberFormat(format)(d.value) : d.value) + suffix;

 var hasWrapSplitCharacter;
 d.wrappingNeeded = !d.wrapped && !userBrokenText && !latex && (hasWrapSplitCharacter = hasWrapCharacter(prefixSuffixedText));
Expand Down

2 changes: 1 addition & 1 deletion
test/image/mocks/texttemplate_scatter.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 "Toronto",
 "Vancouver"
 ],
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:0.f}): %{customdata:.2s}",
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:~f}): %{customdata:.2s}",
 "textposition": "top center",
 "customdata": [1780000, 2930000, 675218],
 "geo": "geo"
Expand Down

3 changes: 2 additions & 1 deletion
test/jasmine/tests/axes_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
var Plotly = require('@lib/index');
var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plots = require('@src/plots/plots');
var Lib = require('@src/lib');
Expand DownExpand Up@@ -5206,7 +5207,7 @@ function getZoomOutButton(gd) {
}

function getFormatter(format) {
 return d3.time.format.utc(format);
 return utcFormat(format);
}

describe('Test Axes.getTickformat', function() {
Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/indicator_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ describe('Indicator defaults', function() {

 it('defaults to displaying relative changes in percentage', function() {
 var out = _supply({type: 'indicator', mode: 'delta', delta: {relative: true}, value: 1});
 expect(out.delta.valueformat).toBe('2%');
 expect(out.delta.valueformat).toBe('.0%');
 });

 it('should not ignore empty valueformat', function() {
Expand DownExpand Up@@ -164,7 +164,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 500,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -185,7 +185,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -208,7 +208,7 @@ describe('Indicator plot', function() {
 type: 'indicator',
 mode: 'number+delta',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 };
 figure[numberType] = {font: {size: 100}};
 Plotly.newPlot(gd, [figure], {width: 400, height: 400})
Expand Down

10 changes: 3 additions & 7 deletions
test/jasmine/tests/localize_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ var _ = Lib._;
var Registry = require('@src/registry');

var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
Expand DownExpand Up@@ -236,7 +237,7 @@ describe('localization', function() {
 expect(firstYLabel()).toBe('0~5');
 var d0 = new Date(0); // thursday, Jan 1 1970 (UTC)
 // sanity check that d0 is what we think...
 expect(d3.time.format.utc('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 expect(utcFormat('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 // full names were not overridden, so fall back on english
 expect(gd._fullLayout.xaxis._dateFormat('%a %b %A %B')(d0)).toBe('t !1 Thursday January');
 })
Expand DownExpand Up@@ -306,15 +307,10 @@ describe('localization', function() {
 .then(function() {
 expect(firstYLabel()).toBe('0p5');

 return Plotly.relayout(gd, {'yaxis.tickformat': '.3f'});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0p500');

 return Plotly.relayout(gd, {separators: null});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0D500');
 expect(firstYLabel()).toBe('0D5');
 })
 .catch(failTest)
 .then(done);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Upgrade d3 formats by archmoj · Pull Request #5023 · plotly/plotly.js · GitHub
Skip to content
Upgrade d3 formats#5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

archmoj
wants to merge
6
commits into

from

 Closed


Upgrade d3 formats
#5023
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7fb8266

apply latest d3-time-format in plotly.js


archmoj Jul 24, 2020
c3e3f54

apply latest d3-format in plotly.js


archmoj Jul 24, 2020
eafc956

update doc links for d3 formatters


archmoj Jul 24, 2020
c35aac5

need to change indicator delta auto default format


archmoj Jul 27, 2020
a53c750

need to change 0.f formatter in the mock


archmoj Jul 27, 2020
e3934d3

need to change localize test


archmoj Jul 27, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,10 @@
 "country-regex": "^1.1.0",
 "d3": "^3.5.17",
 "d3-force": "^1.2.1",
 "d3-format": "^1.4.4",
 "d3-hierarchy": "^1.1.9",
 "d3-interpolate": "^1.4.0",
 "d3-time-format": "^2.2.3",
 "delaunay-triangulate": "^1.1.6",
 "es6-promise": "^4.2.8",
 "fast-isnumeric": "^1.1.4",
Expand Down

3 changes: 2 additions & 1 deletion
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var isNumeric = require('fast-isnumeric');
var tinycolor = require('tinycolor2');

Expand DownExpand Up@@ -275,7 +276,7 @@ function makePointPath(symbolNumber, r) {

var HORZGRADIENT = {x1: 1, x2: 0, y1: 0, y2: 0};
var VERTGRADIENT = {x1: 0, x2: 0, y1: 1, y2: 0};
var stopFormatter = d3.format('~.1f');
var stopFormatter = numberFormat('~f');
var gradientInfo = {
 radial: {node: 'radialGradient'},
 radialreversed: {node: 'radialGradient', reversed: true},
Expand Down

4 changes: 2 additions & 2 deletions
src/constants/docs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,6 @@
'use strict';

module.exports = {
 FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Formatting.md#format'
 FORMAT_LINK: 'https://github.com/d3/d3-format#format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
};

2 changes: 1 addition & 1 deletion
src/lib/dates.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ var EPOCHJD = constants.EPOCHJD;

var Registry = require('../registry');

var utcFormat = d3.time.format.utc;
var utcFormat = require('d3-time-format').utcFormat;

var DATETIME_REGEXP = /^\s*(-?\d\d\d\d|\d\d)(-(\d?\d)(-(\d?\d)([ Tt]([01]?\d|2[0-3])(:([0-5]\d)(:([0-5]\d(\.\d+)?))?(Z|z|[+\-]\d\d(:?\d\d)?)?)?)?)?)?\s*$/m;
// special regex for chinese calendars to support yyyy-mmi-dd etc for intercalary months
Expand Down

7 changes: 4 additions & 3 deletions
src/lib/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@

'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var numConstants = require('../constants/numerical');
Expand DownExpand Up@@ -1077,12 +1078,12 @@ function templateFormatString(string, labels, d3locale) {
 if(format) {
 var fmt;
 if(format[0] === ':') {
 fmt = d3locale ? d3locale.numberFormat : d3.format;
 fmt = numberFormat;
 value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
 }

 if(format[0] === '|') {
 fmt = d3locale ? d3locale.timeFormat.utc : d3.time.format.utc;
 fmt = d3locale ? d3locale.utcFormat : utcFormat;
 var ms = lib.dateTime2ms(value);
 value = lib.formatDate(ms, format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''), false, fmt);
 }
Expand Down

5 changes: 3 additions & 2 deletions
src/plots/cartesian/dragbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var tinycolor = require('tinycolor2');
var supportsPassive = require('has-passive-events');

Expand DownExpand Up@@ -983,11 +984,11 @@ function getEndText(ax, end) {
 return initialVal;
 } else if(ax.type === 'log') {
 dig = Math.ceil(Math.max(0, -Math.log(diff) / Math.LN10)) + 3;
 return d3.format('.' + dig + 'g')(Math.pow(10, initialVal));
 return numberFormat('.' + dig + 'g')(Math.pow(10, initialVal));
 } else { // linear numeric (or category... but just show numbers here)
 dig = Math.floor(Math.log(Math.abs(initialVal)) / Math.LN10) -
 Math.floor(Math.log(diff) / Math.LN10) + 4;
 return d3.format('.' + String(dig) + 'g')(initialVal);
 return numberFormat('.' + String(dig) + 'g')(initialVal);
 }
}

Expand Down

6 changes: 4 additions & 2 deletions
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var Lib = require('../../lib');
Expand DownExpand Up@@ -954,13 +956,13 @@ module.exports = function setConvert(ax, fullLayout) {
 // Fall back on default format for dummy axes that don't care about formatting
 var locale = fullLayout._d3locale;
 if(ax.type === 'date') {
 ax._dateFormat = locale ? locale.timeFormat.utc : d3.time.format.utc;
 ax._dateFormat = locale ? locale.utcFormat : utcFormat;
 ax._extraFormat = fullLayout._extraFormat;
 }
 // occasionally we need _numFormat to pass through
 // even though it won't be needed by this axis
 ax._separators = fullLayout.separators;
 ax._numFormat = locale ? locale.numberFormat : d3.format;
 ax._numFormat = numberFormat;

 // and for bar charts and box plots: reset forced minimum tick spacing
 delete ax._minDtick;
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var timeFormatLocale = require('d3-time-format').timeFormatLocale;
var isNumeric = require('fast-isnumeric');

var Registry = require('../registry');
Expand DownExpand Up@@ -723,7 +724,7 @@ function getFormatter(formatObj, separators) {
 formatObj.decimal = separators.charAt(0);
 formatObj.thousands = separators.charAt(1);

 return d3.locale(formatObj);
 return timeFormatLocale(formatObj);
}

function fillMetaTextHelpers(newFullData, newFullLayout) {
Expand Down

2 changes: 1 addition & 1 deletion
src/traces/indicator/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 }
 coerce('delta.reference', traceOut.value);
 coerce('delta.relative');
 coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
 coerce('delta.valueformat', traceOut.delta.relative ? '.0%' : '');
 coerce('delta.increasing.symbol');
 coerce('delta.increasing.color');
 coerce('delta.decreasing.symbol');
Expand Down

5 changes: 3 additions & 2 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var rgba = require('color-rgba');

var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -85,7 +86,7 @@ function domainScale(height, padding, dimension, tickvals, ticktext) {
 var extent = dimensionExtent(dimension);
 if(tickvals) {
 return d3.scale.ordinal()
 .domain(tickvals.map(toText(d3.format(dimension.tickformat), ticktext)))
 .domain(tickvals.map(toText(numberFormat(dimension.tickformat), ticktext)))
 .range(tickvals
 .map(function(d) {
 var unitVal = (d - extent[0]) / (extent[1] - extent[0]);
Expand DownExpand Up@@ -272,7 +273,7 @@ function viewModel(state, callbacks, model) {

 // ensure ticktext and tickvals have same length
 if(!Array.isArray(ticktext) || !ticktext.length) {
 ticktext = tickvals.map(d3.format(dimension.tickformat));
 ticktext = tickvals.map(numberFormat(dimension.tickformat));
 } else if(ticktext.length > tickvals.length) {
 ticktext = ticktext.slice(0, tickvals.length);
 } else if(tickvals.length > ticktext.length) {
Expand Down

9 changes: 5 additions & 4 deletions
src/traces/sankey/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var render = require('./render');
var Fx = require('../../components/fx');
var Color = require('../../components/color');
Expand DownExpand Up@@ -200,7 +201,7 @@ module.exports = function plot(gd, calcData) {
 link.fullData = link.trace;
 obj = d.link.trace.link;
 var hoverCenter = hoverCenterPosition(link);
 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(link.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(link.value) + d.valueSuffix};

 hoverItems.push({
 x: hoverCenter[0],
Expand All@@ -210,7 +211,7 @@ module.exports = function plot(gd, calcData) {
 link.label || '',
 sourceLabel + link.source.label,
 targetLabel + link.target.label,
 link.concentrationscale ? concentrationLabel + d3.format('%0.2f')(link.flow.labelConcentration) : ''
 link.concentrationscale ? concentrationLabel + numberFormat('%0.2f')(link.flow.labelConcentration) : ''
 ].filter(renderableValuePresent).join('<br>'),
 color: castHoverOption(obj, 'bgcolor') || Color.addOpacity(link.color, 1),
 borderColor: castHoverOption(obj, 'bordercolor'),
Expand DownExpand Up@@ -289,14 +290,14 @@ module.exports = function plot(gd, calcData) {
 var hoverCenterX1 = boundingBox.right + 2 - rootBBox.left;
 var hoverCenterY = boundingBox.top + boundingBox.height / 4 - rootBBox.top;

 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix};
 d.node.fullData = d.node.trace;

 var tooltip = Fx.loneHover({
 x0: hoverCenterX0,
 x1: hoverCenterX1,
 y: hoverCenterY,
 name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
 name: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix,
 text: [
 d.node.label,
 incomingLabel + d.node.targetLinks.length,
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/table/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@

var c = require('./constants');
var d3 = require('d3');
var numberFormat = require('d3-format').format;
var gup = require('../../lib/gup');
var Drawing = require('../../components/drawing');
var svgUtil = require('../../lib/svg_text_utils');
Expand DownExpand Up@@ -534,7 +535,7 @@ function populateCellText(cellText, tableControlView, allColumnBlock, gd) {
 var suffix = latex ? '' : gridPick(d.calcdata.cells.suffix, col, row) || '';
 var format = latex ? null : gridPick(d.calcdata.cells.format, col, row) || null;

 var prefixSuffixedText = prefix + (format ? d3.format(format)(d.value) : d.value) + suffix;
 var prefixSuffixedText = prefix + (format ? numberFormat(format)(d.value) : d.value) + suffix;

 var hasWrapSplitCharacter;
 d.wrappingNeeded = !d.wrapped && !userBrokenText && !latex && (hasWrapSplitCharacter = hasWrapCharacter(prefixSuffixedText));
Expand Down

2 changes: 1 addition & 1 deletion
test/image/mocks/texttemplate_scatter.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 "Toronto",
 "Vancouver"
 ],
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:0.f}): %{customdata:.2s}",
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:~f}): %{customdata:.2s}",
 "textposition": "top center",
 "customdata": [1780000, 2930000, 675218],
 "geo": "geo"
Expand Down

3 changes: 2 additions & 1 deletion
test/jasmine/tests/axes_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
var Plotly = require('@lib/index');
var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plots = require('@src/plots/plots');
var Lib = require('@src/lib');
Expand DownExpand Up@@ -5206,7 +5207,7 @@ function getZoomOutButton(gd) {
}

function getFormatter(format) {
 return d3.time.format.utc(format);
 return utcFormat(format);
}

describe('Test Axes.getTickformat', function() {
Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/indicator_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ describe('Indicator defaults', function() {

 it('defaults to displaying relative changes in percentage', function() {
 var out = _supply({type: 'indicator', mode: 'delta', delta: {relative: true}, value: 1});
 expect(out.delta.valueformat).toBe('2%');
 expect(out.delta.valueformat).toBe('.0%');
 });

 it('should not ignore empty valueformat', function() {
Expand DownExpand Up@@ -164,7 +164,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 500,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -185,7 +185,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -208,7 +208,7 @@ describe('Indicator plot', function() {
 type: 'indicator',
 mode: 'number+delta',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 };
 figure[numberType] = {font: {size: 100}};
 Plotly.newPlot(gd, [figure], {width: 400, height: 400})
Expand Down

10 changes: 3 additions & 7 deletions
test/jasmine/tests/localize_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ var _ = Lib._;
var Registry = require('@src/registry');

var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
Expand DownExpand Up@@ -236,7 +237,7 @@ describe('localization', function() {
 expect(firstYLabel()).toBe('0~5');
 var d0 = new Date(0); // thursday, Jan 1 1970 (UTC)
 // sanity check that d0 is what we think...
 expect(d3.time.format.utc('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 expect(utcFormat('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 // full names were not overridden, so fall back on english
 expect(gd._fullLayout.xaxis._dateFormat('%a %b %A %B')(d0)).toBe('t !1 Thursday January');
 })
Expand DownExpand Up@@ -306,15 +307,10 @@ describe('localization', function() {
 .then(function() {
 expect(firstYLabel()).toBe('0p5');

 return Plotly.relayout(gd, {'yaxis.tickformat': '.3f'});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0p500');

 return Plotly.relayout(gd, {separators: null});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0D500');
 expect(firstYLabel()).toBe('0D5');
 })
 .catch(failTest)
 .then(done);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Upgrade d3 formats by archmoj · Pull Request #5023 · plotly/plotly.js · GitHub
Skip to content
Upgrade d3 formats#5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

archmoj
wants to merge
6
commits into

from

 Closed


Upgrade d3 formats
#5023
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7fb8266

apply latest d3-time-format in plotly.js


archmoj Jul 24, 2020
c3e3f54

apply latest d3-format in plotly.js


archmoj Jul 24, 2020
eafc956

update doc links for d3 formatters


archmoj Jul 24, 2020
c35aac5

need to change indicator delta auto default format


archmoj Jul 27, 2020
a53c750

need to change 0.f formatter in the mock


archmoj Jul 27, 2020
e3934d3

need to change localize test


archmoj Jul 27, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,10 @@
 "country-regex": "^1.1.0",
 "d3": "^3.5.17",
 "d3-force": "^1.2.1",
 "d3-format": "^1.4.4",
 "d3-hierarchy": "^1.1.9",
 "d3-interpolate": "^1.4.0",
 "d3-time-format": "^2.2.3",
 "delaunay-triangulate": "^1.1.6",
 "es6-promise": "^4.2.8",
 "fast-isnumeric": "^1.1.4",
Expand Down

3 changes: 2 additions & 1 deletion
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var isNumeric = require('fast-isnumeric');
var tinycolor = require('tinycolor2');

Expand DownExpand Up@@ -275,7 +276,7 @@ function makePointPath(symbolNumber, r) {

var HORZGRADIENT = {x1: 1, x2: 0, y1: 0, y2: 0};
var VERTGRADIENT = {x1: 0, x2: 0, y1: 1, y2: 0};
var stopFormatter = d3.format('~.1f');
var stopFormatter = numberFormat('~f');
var gradientInfo = {
 radial: {node: 'radialGradient'},
 radialreversed: {node: 'radialGradient', reversed: true},
Expand Down

4 changes: 2 additions & 2 deletions
src/constants/docs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,6 @@
'use strict';

module.exports = {
 FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Formatting.md#format'
 FORMAT_LINK: 'https://github.com/d3/d3-format#format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
};

2 changes: 1 addition & 1 deletion
src/lib/dates.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ var EPOCHJD = constants.EPOCHJD;

var Registry = require('../registry');

var utcFormat = d3.time.format.utc;
var utcFormat = require('d3-time-format').utcFormat;

var DATETIME_REGEXP = /^\s*(-?\d\d\d\d|\d\d)(-(\d?\d)(-(\d?\d)([ Tt]([01]?\d|2[0-3])(:([0-5]\d)(:([0-5]\d(\.\d+)?))?(Z|z|[+\-]\d\d(:?\d\d)?)?)?)?)?)?\s*$/m;
// special regex for chinese calendars to support yyyy-mmi-dd etc for intercalary months
Expand Down

7 changes: 4 additions & 3 deletions
src/lib/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@

'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var numConstants = require('../constants/numerical');
Expand DownExpand Up@@ -1077,12 +1078,12 @@ function templateFormatString(string, labels, d3locale) {
 if(format) {
 var fmt;
 if(format[0] === ':') {
 fmt = d3locale ? d3locale.numberFormat : d3.format;
 fmt = numberFormat;
 value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
 }

 if(format[0] === '|') {
 fmt = d3locale ? d3locale.timeFormat.utc : d3.time.format.utc;
 fmt = d3locale ? d3locale.utcFormat : utcFormat;
 var ms = lib.dateTime2ms(value);
 value = lib.formatDate(ms, format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''), false, fmt);
 }
Expand Down

5 changes: 3 additions & 2 deletions
src/plots/cartesian/dragbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var tinycolor = require('tinycolor2');
var supportsPassive = require('has-passive-events');

Expand DownExpand Up@@ -983,11 +984,11 @@ function getEndText(ax, end) {
 return initialVal;
 } else if(ax.type === 'log') {
 dig = Math.ceil(Math.max(0, -Math.log(diff) / Math.LN10)) + 3;
 return d3.format('.' + dig + 'g')(Math.pow(10, initialVal));
 return numberFormat('.' + dig + 'g')(Math.pow(10, initialVal));
 } else { // linear numeric (or category... but just show numbers here)
 dig = Math.floor(Math.log(Math.abs(initialVal)) / Math.LN10) -
 Math.floor(Math.log(diff) / Math.LN10) + 4;
 return d3.format('.' + String(dig) + 'g')(initialVal);
 return numberFormat('.' + String(dig) + 'g')(initialVal);
 }
}

Expand Down

6 changes: 4 additions & 2 deletions
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var Lib = require('../../lib');
Expand DownExpand Up@@ -954,13 +956,13 @@ module.exports = function setConvert(ax, fullLayout) {
 // Fall back on default format for dummy axes that don't care about formatting
 var locale = fullLayout._d3locale;
 if(ax.type === 'date') {
 ax._dateFormat = locale ? locale.timeFormat.utc : d3.time.format.utc;
 ax._dateFormat = locale ? locale.utcFormat : utcFormat;
 ax._extraFormat = fullLayout._extraFormat;
 }
 // occasionally we need _numFormat to pass through
 // even though it won't be needed by this axis
 ax._separators = fullLayout.separators;
 ax._numFormat = locale ? locale.numberFormat : d3.format;
 ax._numFormat = numberFormat;

 // and for bar charts and box plots: reset forced minimum tick spacing
 delete ax._minDtick;
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var timeFormatLocale = require('d3-time-format').timeFormatLocale;
var isNumeric = require('fast-isnumeric');

var Registry = require('../registry');
Expand DownExpand Up@@ -723,7 +724,7 @@ function getFormatter(formatObj, separators) {
 formatObj.decimal = separators.charAt(0);
 formatObj.thousands = separators.charAt(1);

 return d3.locale(formatObj);
 return timeFormatLocale(formatObj);
}

function fillMetaTextHelpers(newFullData, newFullLayout) {
Expand Down

2 changes: 1 addition & 1 deletion
src/traces/indicator/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 }
 coerce('delta.reference', traceOut.value);
 coerce('delta.relative');
 coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
 coerce('delta.valueformat', traceOut.delta.relative ? '.0%' : '');
 coerce('delta.increasing.symbol');
 coerce('delta.increasing.color');
 coerce('delta.decreasing.symbol');
Expand Down

5 changes: 3 additions & 2 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var rgba = require('color-rgba');

var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -85,7 +86,7 @@ function domainScale(height, padding, dimension, tickvals, ticktext) {
 var extent = dimensionExtent(dimension);
 if(tickvals) {
 return d3.scale.ordinal()
 .domain(tickvals.map(toText(d3.format(dimension.tickformat), ticktext)))
 .domain(tickvals.map(toText(numberFormat(dimension.tickformat), ticktext)))
 .range(tickvals
 .map(function(d) {
 var unitVal = (d - extent[0]) / (extent[1] - extent[0]);
Expand DownExpand Up@@ -272,7 +273,7 @@ function viewModel(state, callbacks, model) {

 // ensure ticktext and tickvals have same length
 if(!Array.isArray(ticktext) || !ticktext.length) {
 ticktext = tickvals.map(d3.format(dimension.tickformat));
 ticktext = tickvals.map(numberFormat(dimension.tickformat));
 } else if(ticktext.length > tickvals.length) {
 ticktext = ticktext.slice(0, tickvals.length);
 } else if(tickvals.length > ticktext.length) {
Expand Down

9 changes: 5 additions & 4 deletions
src/traces/sankey/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var render = require('./render');
var Fx = require('../../components/fx');
var Color = require('../../components/color');
Expand DownExpand Up@@ -200,7 +201,7 @@ module.exports = function plot(gd, calcData) {
 link.fullData = link.trace;
 obj = d.link.trace.link;
 var hoverCenter = hoverCenterPosition(link);
 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(link.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(link.value) + d.valueSuffix};

 hoverItems.push({
 x: hoverCenter[0],
Expand All@@ -210,7 +211,7 @@ module.exports = function plot(gd, calcData) {
 link.label || '',
 sourceLabel + link.source.label,
 targetLabel + link.target.label,
 link.concentrationscale ? concentrationLabel + d3.format('%0.2f')(link.flow.labelConcentration) : ''
 link.concentrationscale ? concentrationLabel + numberFormat('%0.2f')(link.flow.labelConcentration) : ''
 ].filter(renderableValuePresent).join('<br>'),
 color: castHoverOption(obj, 'bgcolor') || Color.addOpacity(link.color, 1),
 borderColor: castHoverOption(obj, 'bordercolor'),
Expand DownExpand Up@@ -289,14 +290,14 @@ module.exports = function plot(gd, calcData) {
 var hoverCenterX1 = boundingBox.right + 2 - rootBBox.left;
 var hoverCenterY = boundingBox.top + boundingBox.height / 4 - rootBBox.top;

 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix};
 d.node.fullData = d.node.trace;

 var tooltip = Fx.loneHover({
 x0: hoverCenterX0,
 x1: hoverCenterX1,
 y: hoverCenterY,
 name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
 name: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix,
 text: [
 d.node.label,
 incomingLabel + d.node.targetLinks.length,
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/table/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@

var c = require('./constants');
var d3 = require('d3');
var numberFormat = require('d3-format').format;
var gup = require('../../lib/gup');
var Drawing = require('../../components/drawing');
var svgUtil = require('../../lib/svg_text_utils');
Expand DownExpand Up@@ -534,7 +535,7 @@ function populateCellText(cellText, tableControlView, allColumnBlock, gd) {
 var suffix = latex ? '' : gridPick(d.calcdata.cells.suffix, col, row) || '';
 var format = latex ? null : gridPick(d.calcdata.cells.format, col, row) || null;

 var prefixSuffixedText = prefix + (format ? d3.format(format)(d.value) : d.value) + suffix;
 var prefixSuffixedText = prefix + (format ? numberFormat(format)(d.value) : d.value) + suffix;

 var hasWrapSplitCharacter;
 d.wrappingNeeded = !d.wrapped && !userBrokenText && !latex && (hasWrapSplitCharacter = hasWrapCharacter(prefixSuffixedText));
Expand Down

2 changes: 1 addition & 1 deletion
test/image/mocks/texttemplate_scatter.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 "Toronto",
 "Vancouver"
 ],
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:0.f}): %{customdata:.2s}",
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:~f}): %{customdata:.2s}",
 "textposition": "top center",
 "customdata": [1780000, 2930000, 675218],
 "geo": "geo"
Expand Down

3 changes: 2 additions & 1 deletion
test/jasmine/tests/axes_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
var Plotly = require('@lib/index');
var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plots = require('@src/plots/plots');
var Lib = require('@src/lib');
Expand DownExpand Up@@ -5206,7 +5207,7 @@ function getZoomOutButton(gd) {
}

function getFormatter(format) {
 return d3.time.format.utc(format);
 return utcFormat(format);
}

describe('Test Axes.getTickformat', function() {
Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/indicator_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ describe('Indicator defaults', function() {

 it('defaults to displaying relative changes in percentage', function() {
 var out = _supply({type: 'indicator', mode: 'delta', delta: {relative: true}, value: 1});
 expect(out.delta.valueformat).toBe('2%');
 expect(out.delta.valueformat).toBe('.0%');
 });

 it('should not ignore empty valueformat', function() {
Expand DownExpand Up@@ -164,7 +164,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 500,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -185,7 +185,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -208,7 +208,7 @@ describe('Indicator plot', function() {
 type: 'indicator',
 mode: 'number+delta',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 };
 figure[numberType] = {font: {size: 100}};
 Plotly.newPlot(gd, [figure], {width: 400, height: 400})
Expand Down

10 changes: 3 additions & 7 deletions
test/jasmine/tests/localize_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ var _ = Lib._;
var Registry = require('@src/registry');

var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
Expand DownExpand Up@@ -236,7 +237,7 @@ describe('localization', function() {
 expect(firstYLabel()).toBe('0~5');
 var d0 = new Date(0); // thursday, Jan 1 1970 (UTC)
 // sanity check that d0 is what we think...
 expect(d3.time.format.utc('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 expect(utcFormat('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 // full names were not overridden, so fall back on english
 expect(gd._fullLayout.xaxis._dateFormat('%a %b %A %B')(d0)).toBe('t !1 Thursday January');
 })
Expand DownExpand Up@@ -306,15 +307,10 @@ describe('localization', function() {
 .then(function() {
 expect(firstYLabel()).toBe('0p5');

 return Plotly.relayout(gd, {'yaxis.tickformat': '.3f'});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0p500');

 return Plotly.relayout(gd, {separators: null});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0D500');
 expect(firstYLabel()).toBe('0D5');
 })
 .catch(failTest)
 .then(done);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Upgrade d3 formats by archmoj · Pull Request #5023 · plotly/plotly.js · GitHub
Skip to content
Upgrade d3 formats#5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

archmoj
wants to merge
6
commits into

from

 Closed


Upgrade d3 formats
#5023
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7fb8266

apply latest d3-time-format in plotly.js


archmoj Jul 24, 2020
c3e3f54

apply latest d3-format in plotly.js


archmoj Jul 24, 2020
eafc956

update doc links for d3 formatters


archmoj Jul 24, 2020
c35aac5

need to change indicator delta auto default format


archmoj Jul 27, 2020
a53c750

need to change 0.f formatter in the mock


archmoj Jul 27, 2020
e3934d3

need to change localize test


archmoj Jul 27, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,10 @@
 "country-regex": "^1.1.0",
 "d3": "^3.5.17",
 "d3-force": "^1.2.1",
 "d3-format": "^1.4.4",
 "d3-hierarchy": "^1.1.9",
 "d3-interpolate": "^1.4.0",
 "d3-time-format": "^2.2.3",
 "delaunay-triangulate": "^1.1.6",
 "es6-promise": "^4.2.8",
 "fast-isnumeric": "^1.1.4",
Expand Down

3 changes: 2 additions & 1 deletion
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var isNumeric = require('fast-isnumeric');
var tinycolor = require('tinycolor2');

Expand DownExpand Up@@ -275,7 +276,7 @@ function makePointPath(symbolNumber, r) {

var HORZGRADIENT = {x1: 1, x2: 0, y1: 0, y2: 0};
var VERTGRADIENT = {x1: 0, x2: 0, y1: 1, y2: 0};
var stopFormatter = d3.format('~.1f');
var stopFormatter = numberFormat('~f');
var gradientInfo = {
 radial: {node: 'radialGradient'},
 radialreversed: {node: 'radialGradient', reversed: true},
Expand Down

4 changes: 2 additions & 2 deletions
src/constants/docs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,6 @@
'use strict';

module.exports = {
 FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Formatting.md#format'
 FORMAT_LINK: 'https://github.com/d3/d3-format#format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
};

2 changes: 1 addition & 1 deletion
src/lib/dates.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ var EPOCHJD = constants.EPOCHJD;

var Registry = require('../registry');

var utcFormat = d3.time.format.utc;
var utcFormat = require('d3-time-format').utcFormat;

var DATETIME_REGEXP = /^\s*(-?\d\d\d\d|\d\d)(-(\d?\d)(-(\d?\d)([ Tt]([01]?\d|2[0-3])(:([0-5]\d)(:([0-5]\d(\.\d+)?))?(Z|z|[+\-]\d\d(:?\d\d)?)?)?)?)?)?\s*$/m;
// special regex for chinese calendars to support yyyy-mmi-dd etc for intercalary months
Expand Down

7 changes: 4 additions & 3 deletions
src/lib/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@

'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var numConstants = require('../constants/numerical');
Expand DownExpand Up@@ -1077,12 +1078,12 @@ function templateFormatString(string, labels, d3locale) {
 if(format) {
 var fmt;
 if(format[0] === ':') {
 fmt = d3locale ? d3locale.numberFormat : d3.format;
 fmt = numberFormat;
 value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
 }

 if(format[0] === '|') {
 fmt = d3locale ? d3locale.timeFormat.utc : d3.time.format.utc;
 fmt = d3locale ? d3locale.utcFormat : utcFormat;
 var ms = lib.dateTime2ms(value);
 value = lib.formatDate(ms, format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''), false, fmt);
 }
Expand Down

5 changes: 3 additions & 2 deletions
src/plots/cartesian/dragbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var tinycolor = require('tinycolor2');
var supportsPassive = require('has-passive-events');

Expand DownExpand Up@@ -983,11 +984,11 @@ function getEndText(ax, end) {
 return initialVal;
 } else if(ax.type === 'log') {
 dig = Math.ceil(Math.max(0, -Math.log(diff) / Math.LN10)) + 3;
 return d3.format('.' + dig + 'g')(Math.pow(10, initialVal));
 return numberFormat('.' + dig + 'g')(Math.pow(10, initialVal));
 } else { // linear numeric (or category... but just show numbers here)
 dig = Math.floor(Math.log(Math.abs(initialVal)) / Math.LN10) -
 Math.floor(Math.log(diff) / Math.LN10) + 4;
 return d3.format('.' + String(dig) + 'g')(initialVal);
 return numberFormat('.' + String(dig) + 'g')(initialVal);
 }
}

Expand Down

6 changes: 4 additions & 2 deletions
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var Lib = require('../../lib');
Expand DownExpand Up@@ -954,13 +956,13 @@ module.exports = function setConvert(ax, fullLayout) {
 // Fall back on default format for dummy axes that don't care about formatting
 var locale = fullLayout._d3locale;
 if(ax.type === 'date') {
 ax._dateFormat = locale ? locale.timeFormat.utc : d3.time.format.utc;
 ax._dateFormat = locale ? locale.utcFormat : utcFormat;
 ax._extraFormat = fullLayout._extraFormat;
 }
 // occasionally we need _numFormat to pass through
 // even though it won't be needed by this axis
 ax._separators = fullLayout.separators;
 ax._numFormat = locale ? locale.numberFormat : d3.format;
 ax._numFormat = numberFormat;

 // and for bar charts and box plots: reset forced minimum tick spacing
 delete ax._minDtick;
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var timeFormatLocale = require('d3-time-format').timeFormatLocale;
var isNumeric = require('fast-isnumeric');

var Registry = require('../registry');
Expand DownExpand Up@@ -723,7 +724,7 @@ function getFormatter(formatObj, separators) {
 formatObj.decimal = separators.charAt(0);
 formatObj.thousands = separators.charAt(1);

 return d3.locale(formatObj);
 return timeFormatLocale(formatObj);
}

function fillMetaTextHelpers(newFullData, newFullLayout) {
Expand Down

2 changes: 1 addition & 1 deletion
src/traces/indicator/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 }
 coerce('delta.reference', traceOut.value);
 coerce('delta.relative');
 coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
 coerce('delta.valueformat', traceOut.delta.relative ? '.0%' : '');
 coerce('delta.increasing.symbol');
 coerce('delta.increasing.color');
 coerce('delta.decreasing.symbol');
Expand Down

5 changes: 3 additions & 2 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var rgba = require('color-rgba');

var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -85,7 +86,7 @@ function domainScale(height, padding, dimension, tickvals, ticktext) {
 var extent = dimensionExtent(dimension);
 if(tickvals) {
 return d3.scale.ordinal()
 .domain(tickvals.map(toText(d3.format(dimension.tickformat), ticktext)))
 .domain(tickvals.map(toText(numberFormat(dimension.tickformat), ticktext)))
 .range(tickvals
 .map(function(d) {
 var unitVal = (d - extent[0]) / (extent[1] - extent[0]);
Expand DownExpand Up@@ -272,7 +273,7 @@ function viewModel(state, callbacks, model) {

 // ensure ticktext and tickvals have same length
 if(!Array.isArray(ticktext) || !ticktext.length) {
 ticktext = tickvals.map(d3.format(dimension.tickformat));
 ticktext = tickvals.map(numberFormat(dimension.tickformat));
 } else if(ticktext.length > tickvals.length) {
 ticktext = ticktext.slice(0, tickvals.length);
 } else if(tickvals.length > ticktext.length) {
Expand Down

9 changes: 5 additions & 4 deletions
src/traces/sankey/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var render = require('./render');
var Fx = require('../../components/fx');
var Color = require('../../components/color');
Expand DownExpand Up@@ -200,7 +201,7 @@ module.exports = function plot(gd, calcData) {
 link.fullData = link.trace;
 obj = d.link.trace.link;
 var hoverCenter = hoverCenterPosition(link);
 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(link.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(link.value) + d.valueSuffix};

 hoverItems.push({
 x: hoverCenter[0],
Expand All@@ -210,7 +211,7 @@ module.exports = function plot(gd, calcData) {
 link.label || '',
 sourceLabel + link.source.label,
 targetLabel + link.target.label,
 link.concentrationscale ? concentrationLabel + d3.format('%0.2f')(link.flow.labelConcentration) : ''
 link.concentrationscale ? concentrationLabel + numberFormat('%0.2f')(link.flow.labelConcentration) : ''
 ].filter(renderableValuePresent).join('<br>'),
 color: castHoverOption(obj, 'bgcolor') || Color.addOpacity(link.color, 1),
 borderColor: castHoverOption(obj, 'bordercolor'),
Expand DownExpand Up@@ -289,14 +290,14 @@ module.exports = function plot(gd, calcData) {
 var hoverCenterX1 = boundingBox.right + 2 - rootBBox.left;
 var hoverCenterY = boundingBox.top + boundingBox.height / 4 - rootBBox.top;

 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix};
 d.node.fullData = d.node.trace;

 var tooltip = Fx.loneHover({
 x0: hoverCenterX0,
 x1: hoverCenterX1,
 y: hoverCenterY,
 name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
 name: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix,
 text: [
 d.node.label,
 incomingLabel + d.node.targetLinks.length,
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/table/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@

var c = require('./constants');
var d3 = require('d3');
var numberFormat = require('d3-format').format;
var gup = require('../../lib/gup');
var Drawing = require('../../components/drawing');
var svgUtil = require('../../lib/svg_text_utils');
Expand DownExpand Up@@ -534,7 +535,7 @@ function populateCellText(cellText, tableControlView, allColumnBlock, gd) {
 var suffix = latex ? '' : gridPick(d.calcdata.cells.suffix, col, row) || '';
 var format = latex ? null : gridPick(d.calcdata.cells.format, col, row) || null;

 var prefixSuffixedText = prefix + (format ? d3.format(format)(d.value) : d.value) + suffix;
 var prefixSuffixedText = prefix + (format ? numberFormat(format)(d.value) : d.value) + suffix;

 var hasWrapSplitCharacter;
 d.wrappingNeeded = !d.wrapped && !userBrokenText && !latex && (hasWrapSplitCharacter = hasWrapCharacter(prefixSuffixedText));
Expand Down

2 changes: 1 addition & 1 deletion
test/image/mocks/texttemplate_scatter.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 "Toronto",
 "Vancouver"
 ],
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:0.f}): %{customdata:.2s}",
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:~f}): %{customdata:.2s}",
 "textposition": "top center",
 "customdata": [1780000, 2930000, 675218],
 "geo": "geo"
Expand Down

3 changes: 2 additions & 1 deletion
test/jasmine/tests/axes_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
var Plotly = require('@lib/index');
var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plots = require('@src/plots/plots');
var Lib = require('@src/lib');
Expand DownExpand Up@@ -5206,7 +5207,7 @@ function getZoomOutButton(gd) {
}

function getFormatter(format) {
 return d3.time.format.utc(format);
 return utcFormat(format);
}

describe('Test Axes.getTickformat', function() {
Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/indicator_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ describe('Indicator defaults', function() {

 it('defaults to displaying relative changes in percentage', function() {
 var out = _supply({type: 'indicator', mode: 'delta', delta: {relative: true}, value: 1});
 expect(out.delta.valueformat).toBe('2%');
 expect(out.delta.valueformat).toBe('.0%');
 });

 it('should not ignore empty valueformat', function() {
Expand DownExpand Up@@ -164,7 +164,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 500,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -185,7 +185,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -208,7 +208,7 @@ describe('Indicator plot', function() {
 type: 'indicator',
 mode: 'number+delta',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 };
 figure[numberType] = {font: {size: 100}};
 Plotly.newPlot(gd, [figure], {width: 400, height: 400})
Expand Down

10 changes: 3 additions & 7 deletions
test/jasmine/tests/localize_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ var _ = Lib._;
var Registry = require('@src/registry');

var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
Expand DownExpand Up@@ -236,7 +237,7 @@ describe('localization', function() {
 expect(firstYLabel()).toBe('0~5');
 var d0 = new Date(0); // thursday, Jan 1 1970 (UTC)
 // sanity check that d0 is what we think...
 expect(d3.time.format.utc('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 expect(utcFormat('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 // full names were not overridden, so fall back on english
 expect(gd._fullLayout.xaxis._dateFormat('%a %b %A %B')(d0)).toBe('t !1 Thursday January');
 })
Expand DownExpand Up@@ -306,15 +307,10 @@ describe('localization', function() {
 .then(function() {
 expect(firstYLabel()).toBe('0p5');

 return Plotly.relayout(gd, {'yaxis.tickformat': '.3f'});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0p500');

 return Plotly.relayout(gd, {separators: null});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0D500');
 expect(firstYLabel()).toBe('0D5');
 })
 .catch(failTest)
 .then(done);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Upgrade d3 formats by archmoj · Pull Request #5023 · plotly/plotly.js · GitHub
Skip to content
Upgrade d3 formats#5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

archmoj
wants to merge
6
commits into

from

 Closed


Upgrade d3 formats
#5023
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7fb8266

apply latest d3-time-format in plotly.js


archmoj Jul 24, 2020
c3e3f54

apply latest d3-format in plotly.js


archmoj Jul 24, 2020
eafc956

update doc links for d3 formatters


archmoj Jul 24, 2020
c35aac5

need to change indicator delta auto default format


archmoj Jul 27, 2020
a53c750

need to change 0.f formatter in the mock


archmoj Jul 27, 2020
e3934d3

need to change localize test


archmoj Jul 27, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
package-lock.json

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,10 @@
 "country-regex": "^1.1.0",
 "d3": "^3.5.17",
 "d3-force": "^1.2.1",
 "d3-format": "^1.4.4",
 "d3-hierarchy": "^1.1.9",
 "d3-interpolate": "^1.4.0",
 "d3-time-format": "^2.2.3",
 "delaunay-triangulate": "^1.1.6",
 "es6-promise": "^4.2.8",
 "fast-isnumeric": "^1.1.4",
Expand Down

3 changes: 2 additions & 1 deletion
src/components/drawing/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var isNumeric = require('fast-isnumeric');
var tinycolor = require('tinycolor2');

Expand DownExpand Up@@ -275,7 +276,7 @@ function makePointPath(symbolNumber, r) {

var HORZGRADIENT = {x1: 1, x2: 0, y1: 0, y2: 0};
var VERTGRADIENT = {x1: 0, x2: 0, y1: 1, y2: 0};
var stopFormatter = d3.format('~.1f');
var stopFormatter = numberFormat('~f');
var gradientInfo = {
 radial: {node: 'radialGradient'},
 radialreversed: {node: 'radialGradient', reversed: true},
Expand Down

4 changes: 2 additions & 2 deletions
src/constants/docs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,6 @@
'use strict';

module.exports = {
 FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Formatting.md#format'
 FORMAT_LINK: 'https://github.com/d3/d3-format#format',
 DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
};

2 changes: 1 addition & 1 deletion
src/lib/dates.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ var EPOCHJD = constants.EPOCHJD;

var Registry = require('../registry');

var utcFormat = d3.time.format.utc;
var utcFormat = require('d3-time-format').utcFormat;

var DATETIME_REGEXP = /^\s*(-?\d\d\d\d|\d\d)(-(\d?\d)(-(\d?\d)([ Tt]([01]?\d|2[0-3])(:([0-5]\d)(:([0-5]\d(\.\d+)?))?(Z|z|[+\-]\d\d(:?\d\d)?)?)?)?)?)?\s*$/m;
// special regex for chinese calendars to support yyyy-mmi-dd etc for intercalary months
Expand Down

7 changes: 4 additions & 3 deletions
src/lib/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@

'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var numConstants = require('../constants/numerical');
Expand DownExpand Up@@ -1077,12 +1078,12 @@ function templateFormatString(string, labels, d3locale) {
 if(format) {
 var fmt;
 if(format[0] === ':') {
 fmt = d3locale ? d3locale.numberFormat : d3.format;
 fmt = numberFormat;
 value = fmt(format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''))(value);
 }

 if(format[0] === '|') {
 fmt = d3locale ? d3locale.timeFormat.utc : d3.time.format.utc;
 fmt = d3locale ? d3locale.utcFormat : utcFormat;
 var ms = lib.dateTime2ms(value);
 value = lib.formatDate(ms, format.replace(TEMPLATE_STRING_FORMAT_SEPARATOR, ''), false, fmt);
 }
Expand Down

5 changes: 3 additions & 2 deletions
src/plots/cartesian/dragbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var tinycolor = require('tinycolor2');
var supportsPassive = require('has-passive-events');

Expand DownExpand Up@@ -983,11 +984,11 @@ function getEndText(ax, end) {
 return initialVal;
 } else if(ax.type === 'log') {
 dig = Math.ceil(Math.max(0, -Math.log(diff) / Math.LN10)) + 3;
 return d3.format('.' + dig + 'g')(Math.pow(10, initialVal));
 return numberFormat('.' + dig + 'g')(Math.pow(10, initialVal));
 } else { // linear numeric (or category... but just show numbers here)
 dig = Math.floor(Math.log(Math.abs(initialVal)) / Math.LN10) -
 Math.floor(Math.log(diff) / Math.LN10) + 4;
 return d3.format('.' + String(dig) + 'g')(initialVal);
 return numberFormat('.' + String(dig) + 'g')(initialVal);
 }
}

Expand Down

6 changes: 4 additions & 2 deletions
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var utcFormat = require('d3-time-format').utcFormat;
var isNumeric = require('fast-isnumeric');

var Lib = require('../../lib');
Expand DownExpand Up@@ -954,13 +956,13 @@ module.exports = function setConvert(ax, fullLayout) {
 // Fall back on default format for dummy axes that don't care about formatting
 var locale = fullLayout._d3locale;
 if(ax.type === 'date') {
 ax._dateFormat = locale ? locale.timeFormat.utc : d3.time.format.utc;
 ax._dateFormat = locale ? locale.utcFormat : utcFormat;
 ax._extraFormat = fullLayout._extraFormat;
 }
 // occasionally we need _numFormat to pass through
 // even though it won't be needed by this axis
 ax._separators = fullLayout.separators;
 ax._numFormat = locale ? locale.numberFormat : d3.format;
 ax._numFormat = numberFormat;

 // and for bar charts and box plots: reset forced minimum tick spacing
 delete ax._minDtick;
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var timeFormatLocale = require('d3-time-format').timeFormatLocale;
var isNumeric = require('fast-isnumeric');

var Registry = require('../registry');
Expand DownExpand Up@@ -723,7 +724,7 @@ function getFormatter(formatObj, separators) {
 formatObj.decimal = separators.charAt(0);
 formatObj.thousands = separators.charAt(1);

 return d3.locale(formatObj);
 return timeFormatLocale(formatObj);
}

function fillMetaTextHelpers(newFullData, newFullLayout) {
Expand Down

2 changes: 1 addition & 1 deletion
src/traces/indicator/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 }
 coerce('delta.reference', traceOut.value);
 coerce('delta.relative');
 coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
 coerce('delta.valueformat', traceOut.delta.relative ? '.0%' : '');
 coerce('delta.increasing.symbol');
 coerce('delta.increasing.color');
 coerce('delta.decreasing.symbol');
Expand Down

5 changes: 3 additions & 2 deletions
src/traces/parcoords/parcoords.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var rgba = require('color-rgba');

var Axes = require('../../plots/cartesian/axes');
Expand DownExpand Up@@ -85,7 +86,7 @@ function domainScale(height, padding, dimension, tickvals, ticktext) {
 var extent = dimensionExtent(dimension);
 if(tickvals) {
 return d3.scale.ordinal()
 .domain(tickvals.map(toText(d3.format(dimension.tickformat), ticktext)))
 .domain(tickvals.map(toText(numberFormat(dimension.tickformat), ticktext)))
 .range(tickvals
 .map(function(d) {
 var unitVal = (d - extent[0]) / (extent[1] - extent[0]);
Expand DownExpand Up@@ -272,7 +273,7 @@ function viewModel(state, callbacks, model) {

 // ensure ticktext and tickvals have same length
 if(!Array.isArray(ticktext) || !ticktext.length) {
 ticktext = tickvals.map(d3.format(dimension.tickformat));
 ticktext = tickvals.map(numberFormat(dimension.tickformat));
 } else if(ticktext.length > tickvals.length) {
 ticktext = ticktext.slice(0, tickvals.length);
 } else if(tickvals.length > ticktext.length) {
Expand Down

9 changes: 5 additions & 4 deletions
src/traces/sankey/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
'use strict';

var d3 = require('d3');
var numberFormat = require('d3-format').format;
var render = require('./render');
var Fx = require('../../components/fx');
var Color = require('../../components/color');
Expand DownExpand Up@@ -200,7 +201,7 @@ module.exports = function plot(gd, calcData) {
 link.fullData = link.trace;
 obj = d.link.trace.link;
 var hoverCenter = hoverCenterPosition(link);
 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(link.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(link.value) + d.valueSuffix};

 hoverItems.push({
 x: hoverCenter[0],
Expand All@@ -210,7 +211,7 @@ module.exports = function plot(gd, calcData) {
 link.label || '',
 sourceLabel + link.source.label,
 targetLabel + link.target.label,
 link.concentrationscale ? concentrationLabel + d3.format('%0.2f')(link.flow.labelConcentration) : ''
 link.concentrationscale ? concentrationLabel + numberFormat('%0.2f')(link.flow.labelConcentration) : ''
 ].filter(renderableValuePresent).join('<br>'),
 color: castHoverOption(obj, 'bgcolor') || Color.addOpacity(link.color, 1),
 borderColor: castHoverOption(obj, 'bordercolor'),
Expand DownExpand Up@@ -289,14 +290,14 @@ module.exports = function plot(gd, calcData) {
 var hoverCenterX1 = boundingBox.right + 2 - rootBBox.left;
 var hoverCenterY = boundingBox.top + boundingBox.height / 4 - rootBBox.top;

 var hovertemplateLabels = {valueLabel: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix};
 var hovertemplateLabels = {valueLabel: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix};
 d.node.fullData = d.node.trace;

 var tooltip = Fx.loneHover({
 x0: hoverCenterX0,
 x1: hoverCenterX1,
 y: hoverCenterY,
 name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
 name: numberFormat(d.valueFormat)(d.node.value) + d.valueSuffix,
 text: [
 d.node.label,
 incomingLabel + d.node.targetLinks.length,
Expand Down

3 changes: 2 additions & 1 deletion
src/traces/table/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@

var c = require('./constants');
var d3 = require('d3');
var numberFormat = require('d3-format').format;
var gup = require('../../lib/gup');
var Drawing = require('../../components/drawing');
var svgUtil = require('../../lib/svg_text_utils');
Expand DownExpand Up@@ -534,7 +535,7 @@ function populateCellText(cellText, tableControlView, allColumnBlock, gd) {
 var suffix = latex ? '' : gridPick(d.calcdata.cells.suffix, col, row) || '';
 var format = latex ? null : gridPick(d.calcdata.cells.format, col, row) || null;

 var prefixSuffixedText = prefix + (format ? d3.format(format)(d.value) : d.value) + suffix;
 var prefixSuffixedText = prefix + (format ? numberFormat(format)(d.value) : d.value) + suffix;

 var hasWrapSplitCharacter;
 d.wrappingNeeded = !d.wrapped && !userBrokenText && !latex && (hasWrapSplitCharacter = hasWrapCharacter(prefixSuffixedText));
Expand Down

2 changes: 1 addition & 1 deletion
test/image/mocks/texttemplate_scatter.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@
 "Toronto",
 "Vancouver"
 ],
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:0.f}): %{customdata:.2s}",
 "texttemplate": "%{text}: (%{lon:.0f}, %{lat:~f}): %{customdata:.2s}",
 "textposition": "top center",
 "customdata": [1780000, 2930000, 675218],
 "geo": "geo"
Expand Down

3 changes: 2 additions & 1 deletion
test/jasmine/tests/axes_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
var Plotly = require('@lib/index');
var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plots = require('@src/plots/plots');
var Lib = require('@src/lib');
Expand DownExpand Up@@ -5206,7 +5207,7 @@ function getZoomOutButton(gd) {
}

function getFormatter(format) {
 return d3.time.format.utc(format);
 return utcFormat(format);
}

describe('Test Axes.getTickformat', function() {
Expand Down

8 changes: 4 additions & 4 deletions
test/jasmine/tests/indicator_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ describe('Indicator defaults', function() {

 it('defaults to displaying relative changes in percentage', function() {
 var out = _supply({type: 'indicator', mode: 'delta', delta: {relative: true}, value: 1});
 expect(out.delta.valueformat).toBe('2%');
 expect(out.delta.valueformat).toBe('.0%');
 });

 it('should not ignore empty valueformat', function() {
Expand DownExpand Up@@ -164,7 +164,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 500,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -185,7 +185,7 @@ describe('Indicator plot', function() {
 Plotly.newPlot(gd, [{
 type: 'indicator',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 }], {width: 400, height: 400})
 .then(function() {
 checkNumbersScale(1, 'initialy at normal scale');
Expand All@@ -208,7 +208,7 @@ describe('Indicator plot', function() {
 type: 'indicator',
 mode: 'number+delta',
 value: 1,
 number: {valueformat: '0.f'}
 number: {valueformat: '~f'}
 };
 figure[numberType] = {font: {size: 100}};
 Plotly.newPlot(gd, [figure], {width: 400, height: 400})
Expand Down

10 changes: 3 additions & 7 deletions
test/jasmine/tests/localize_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ var _ = Lib._;
var Registry = require('@src/registry');

var d3 = require('d3');
var utcFormat = require('d3-time-format').utcFormat;

var Plotly = require('@lib');
var createGraphDiv = require('../assets/create_graph_div');
Expand DownExpand Up@@ -236,7 +237,7 @@ describe('localization', function() {
 expect(firstYLabel()).toBe('0~5');
 var d0 = new Date(0); // thursday, Jan 1 1970 (UTC)
 // sanity check that d0 is what we think...
 expect(d3.time.format.utc('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 expect(utcFormat('%a %b %A %B')(d0)).toBe('Thu Jan Thursday January');
 // full names were not overridden, so fall back on english
 expect(gd._fullLayout.xaxis._dateFormat('%a %b %A %B')(d0)).toBe('t !1 Thursday January');
 })
Expand DownExpand Up@@ -306,15 +307,10 @@ describe('localization', function() {
 .then(function() {
 expect(firstYLabel()).toBe('0p5');

 return Plotly.relayout(gd, {'yaxis.tickformat': '.3f'});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0p500');

 return Plotly.relayout(gd, {separators: null});
 })
 .then(function() {
 expect(firstYLabel()).toBe('0D500');
 expect(firstYLabel()).toBe('0D5');
 })
 .catch(failTest)
 .then(done);
Expand Down