Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/colorbar/draw.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -706,6 +706,7 @@ function mockColorBarAxis(gd, opts, zrange) {
font: fullLayout.font,
noHover: true,
noTickson: true,
noTicklabelmode: true,
calendar: fullLayout.calendar // not really necessary (yet?)
};

Expand Down
90 changes: 89 additions & 1 deletion src/plots/cartesian/axes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -620,6 +620,15 @@ axes.calcTicks = function calcTicks(ax, opts) {

generateTicks();

var isPeriod = ax.ticklabelmode === 'period';
if(isPeriod) {
// add one label to show pre tick0 period
tickVals.unshift({
minor: false,
value: axes.tickIncrement(tickVals[0].value, ax.dtick, !axrev, ax.caldendar)
});
}

if(ax.rangebreaks) {
// replace ticks inside breaks that would get a tick
// and reduce ticks
Expand DownExpand Up@@ -681,6 +690,32 @@ axes.calcTicks = function calcTicks(ax, opts) {
ax._prevDateHead = '';
ax._inCalcTicks = true;

var minRange = Math.min(rng[0], rng[1]);
var maxRange = Math.max(rng[0], rng[1]);

var definedDelta;
if(isPeriod && ax.tickformat) {
var _has = function(str) {
return ax.tickformat.indexOf(str) !== -1;
};

if(
!_has('%f') &&
!_has('%H') &&
!_has('%I') &&
!_has('%L') &&
!_has('%Q') &&
!_has('%S') &&
!_has('%s') &&
!_has('%X')
) {
if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
}
}

var removedPreTick0Label = false;
var ticksOut = new Array(tickVals.length);
for(var i = 0; i < tickVals.length; i++) {
var _minor = tickVals[i].minor;
Expand All@@ -692,6 +727,46 @@ axes.calcTicks = function calcTicks(ax, opts) {
false, // hover
_minor // noSuffixPrefix
);

if(isPeriod) {
var v = tickVals[i].value;

var a = i;
var b = i + 1;
if(i < tickVals.length - 1) {
a = i;
b = i + 1;
} else {
a = i - 1;
b = i;
}

var A = tickVals[a].value;
var B = tickVals[b].value;

var delta = definedDelta || Math.abs(B - A);
var half = axrev ? -0.5 : 0.5;
if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
v += half * ONEAVGYEAR;
} else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
v += half * ONEAVGMONTH;
} else if(delta >= ONEDAY) {
v += half * ONEDAY;
}

ticksOut[i].periodX = v;

if(v > maxRange || v < minRange) { // hide label if outside the range
ticksOut[i].text = '';
if(i === 0) removedPreTick0Label = true;
}
}
}

if(removedPreTick0Label && ticksOut.length > 1) {
// redo tick0 text
ax._prevDateHead = '';
ticksOut[1].text = axes.tickText(ax, tickVals[1].value).text;
}

ax._inCalcTicks = false;
Expand DownExpand Up@@ -1785,6 +1860,10 @@ axes.drawOne = function(gd, ax, opts) {
if(!ax.visible) return;

var transFn = axes.makeTransFn(ax);
var transTickLabelFn = ax.ticklabelmode === 'period' ?
axes.makeTransPeriodFn(ax) :
axes.makeTransFn(ax);

var tickVals;
// We remove zero lines, grid lines, and inside ticks if they're within 1px of the end
// The key case here is removing zero lines when the axis bound is zero
Expand DownExpand Up@@ -1903,7 +1982,7 @@ axes.drawOne = function(gd, ax, opts) {
return axes.drawLabels(gd, ax, {
vals: vals,
layer: mainAxLayer,
transFn: transFn,
transFn: transTickLabelFn,
labelFns: axes.makeLabelFns(ax, mainLinePosition)
});
});
Expand DownExpand Up@@ -2213,6 +2292,14 @@ axes.makeTransFn = function(ax) {
function(d) { return 'translate(0,' + (offset + ax.l2p(d.x)) + ')'; };
};

axes.makeTransPeriodFn = function(ax) {
var axLetter = ax._id.charAt(0);
var offset = ax._offset;
return axLetter === 'x' ?
function(d) { return 'translate(' + (offset + ax.l2p(d.periodX)) + ',0)'; } :
function(d) { return 'translate(0,' + (offset + ax.l2p(d.periodX)) + ')'; };
};

/**
* Make axis tick path string
*
Expand DownExpand Up@@ -2511,6 +2598,7 @@ axes.drawLabels = function(gd, ax, opts) {
var axLetter = axId.charAt(0);
var cls = opts.cls || axId + 'tick';
var vals = opts.vals;

var labelFns = opts.labelFns;
var tickAngle = opts.secondary ? 0 : ax.tickangle;
var prevAngle = (ax._prevTickAngles || {})[cls];
Expand Down
2 changes: 2 additions & 0 deletions src/plots/cartesian/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
}

if(axType === 'date') {
if(!options.noTicklabelmode) coerce('ticklabelmode');

handleArrayContainerDefaults(containerIn, containerOut, {
name: 'rangebreaks',
inclusionAttr: 'enabled',
Expand Down
14 changes: 14 additions & 0 deletions src/plots/cartesian/layout_attributes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,20 @@ module.exports = {
'to the left/bottom of labels.'
].join(' ')
},
ticklabelmode: {
valType: 'enumerated',
values: ['instant', 'period'],
dflt: 'instant',
role: 'info',
editType: 'ticks',
description: [
'Determines where tick labels are drawn with respect to their',
'corresponding ticks and grid lines.',
'Only has an effect for axes of `type` *date*',
'When set to *period*, tick labels are drawn in the middle of the period',
'between ticks.'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually not quite the desired behaviour: if the ticks are spaced every 2 months and the labels are Jan and Mar, the Jan label should appear on Jan 15, not on Feb 1.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's an example... https://codepen.io/nicolaskruchten/pen/ZEQRBWw?editors=0010

In "instant" mode we see 4 "month" labels spaced two months apart. In "period" mode we probably should see only 3 labels, but they should remain Jan/Mar/May, and they should be positioned on Jan 15, Mar 15, May 15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a clearer codepen in the original issue

].join(' ')
},
mirror: {
valType: 'enumerated',
values: [true, 'ticks', false, 'all', 'allticks'],
Expand Down
1 change: 1 addition & 0 deletions src/plots/gl3d/layout/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
data: options.data,
showGrid: true,
noTickson: true,
noTicklabelmode: true,
bgColor: options.bgColor,
calendar: options.calendar
},
Expand Down
Binary file addedtest/image/baselines/date_axes_period.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/date_axes_period2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions test/image/mocks/date_axes_period.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
{
"data": [
{
"x": [
"1900-01-01",
"2000-01-01",
"2100-01-01"
],
"y": [1, 3, 2]
},
{
"x": [
"2013-05-01",
"2013-09-01",
"2014-01-01"
],
"y": [1, 3, 2],
"xaxis": "x2",
"yaxis": "y2"
},
{
"x": [
"2013-11-17",
"2013-12-15",
"2014-01-12"
],
"y": [1, 3, 2],
"xaxis": "x3",
"yaxis": "y3"
},
{
"x": [
"2013-01-01",
"2013-01-02",
"2013-01-03"
],
"y": [1, 3, 2],
"xaxis": "x4",
"yaxis": "y4"
},
{
"x": [
"2013-07-01 18:00",
"2013-07-02 00:00",
"2013-07-02 06:00"
],
"y": [1, 3, 2],
"xaxis": "x5",
"yaxis": "y5"
},
{
"x": [
"2013-01-01 23:59",
"2013-01-02 00:00",
"2013-01-02 00:01"
],
"y": [1, 3, 2],
"xaxis": "x6",
"yaxis": "y6"
},
{
"x": [
"2013-07-01 23:59:59",
"2013-07-02 00:00:00",
"2013-07-02 00:00:01"
],
"y": [1, 3, 2],
"xaxis": "x7",
"yaxis": "y7"
}
],
"layout": {
"showlegend": false,
"width": 600,
"height": 500,
"yaxis": {"domain": [0, 0.04]},
"yaxis2": {"domain": [0.16, 0.2]},
"yaxis3": {"domain": [0.32, 0.36]},
"yaxis4": {"domain": [0.48, 0.52]},
"yaxis5": {"domain": [0.64, 0.68]},
"yaxis6": {"domain": [0.80, 0.84]},
"yaxis7": {"domain": [0.96, 1]},
"xaxis": {"ticklabelmode": "period"},
"xaxis2": {"ticklabelmode": "period", "anchor": "y2"},
"xaxis3": {"ticklabelmode": "period", "anchor": "y3"},
"xaxis4": {"ticklabelmode": "period", "anchor": "y4"},
"xaxis5": {"ticklabelmode": "period", "anchor": "y5"},
"xaxis6": {"ticklabelmode": "period", "anchor": "y6"},
"xaxis7": {"ticklabelmode": "period", "anchor": "y7"}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/colorbar/draw.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -706,6 +706,7 @@ function mockColorBarAxis(gd, opts, zrange) {
font: fullLayout.font,
noHover: true,
noTickson: true,
noTicklabelmode: true,
calendar: fullLayout.calendar // not really necessary (yet?)
};

Expand Down
90 changes: 89 additions & 1 deletion src/plots/cartesian/axes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -620,6 +620,15 @@ axes.calcTicks = function calcTicks(ax, opts) {

generateTicks();

var isPeriod = ax.ticklabelmode === 'period';
if(isPeriod) {
// add one label to show pre tick0 period
tickVals.unshift({
minor: false,
value: axes.tickIncrement(tickVals[0].value, ax.dtick, !axrev, ax.caldendar)
});
}

if(ax.rangebreaks) {
// replace ticks inside breaks that would get a tick
// and reduce ticks
Expand DownExpand Up@@ -681,6 +690,32 @@ axes.calcTicks = function calcTicks(ax, opts) {
ax._prevDateHead = '';
ax._inCalcTicks = true;

var minRange = Math.min(rng[0], rng[1]);
var maxRange = Math.max(rng[0], rng[1]);

var definedDelta;
if(isPeriod && ax.tickformat) {
var _has = function(str) {
return ax.tickformat.indexOf(str) !== -1;
};

if(
!_has('%f') &&
!_has('%H') &&
!_has('%I') &&
!_has('%L') &&
!_has('%Q') &&
!_has('%S') &&
!_has('%s') &&
!_has('%X')
) {
if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
}
}

var removedPreTick0Label = false;
var ticksOut = new Array(tickVals.length);
for(var i = 0; i < tickVals.length; i++) {
var _minor = tickVals[i].minor;
Expand All@@ -692,6 +727,46 @@ axes.calcTicks = function calcTicks(ax, opts) {
false, // hover
_minor // noSuffixPrefix
);

if(isPeriod) {
var v = tickVals[i].value;

var a = i;
var b = i + 1;
if(i < tickVals.length - 1) {
a = i;
b = i + 1;
} else {
a = i - 1;
b = i;
}

var A = tickVals[a].value;
var B = tickVals[b].value;

var delta = definedDelta || Math.abs(B - A);
var half = axrev ? -0.5 : 0.5;
if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
v += half * ONEAVGYEAR;
} else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
v += half * ONEAVGMONTH;
} else if(delta >= ONEDAY) {
v += half * ONEDAY;
}

ticksOut[i].periodX = v;

if(v > maxRange || v < minRange) { // hide label if outside the range
ticksOut[i].text = '';
if(i === 0) removedPreTick0Label = true;
}
}
}

if(removedPreTick0Label && ticksOut.length > 1) {
// redo tick0 text
ax._prevDateHead = '';
ticksOut[1].text = axes.tickText(ax, tickVals[1].value).text;
}

ax._inCalcTicks = false;
Expand DownExpand Up@@ -1785,6 +1860,10 @@ axes.drawOne = function(gd, ax, opts) {
if(!ax.visible) return;

var transFn = axes.makeTransFn(ax);
var transTickLabelFn = ax.ticklabelmode === 'period' ?
axes.makeTransPeriodFn(ax) :
axes.makeTransFn(ax);

var tickVals;
// We remove zero lines, grid lines, and inside ticks if they're within 1px of the end
// The key case here is removing zero lines when the axis bound is zero
Expand DownExpand Up@@ -1903,7 +1982,7 @@ axes.drawOne = function(gd, ax, opts) {
return axes.drawLabels(gd, ax, {
vals: vals,
layer: mainAxLayer,
transFn: transFn,
transFn: transTickLabelFn,
labelFns: axes.makeLabelFns(ax, mainLinePosition)
});
});
Expand DownExpand Up@@ -2213,6 +2292,14 @@ axes.makeTransFn = function(ax) {
function(d) { return 'translate(0,' + (offset + ax.l2p(d.x)) + ')'; };
};

axes.makeTransPeriodFn = function(ax) {
var axLetter = ax._id.charAt(0);
var offset = ax._offset;
return axLetter === 'x' ?
function(d) { return 'translate(' + (offset + ax.l2p(d.periodX)) + ',0)'; } :
function(d) { return 'translate(0,' + (offset + ax.l2p(d.periodX)) + ')'; };
};

/**
* Make axis tick path string
*
Expand DownExpand Up@@ -2511,6 +2598,7 @@ axes.drawLabels = function(gd, ax, opts) {
var axLetter = axId.charAt(0);
var cls = opts.cls || axId + 'tick';
var vals = opts.vals;

var labelFns = opts.labelFns;
var tickAngle = opts.secondary ? 0 : ax.tickangle;
var prevAngle = (ax._prevTickAngles || {})[cls];
Expand Down
2 changes: 2 additions & 0 deletions src/plots/cartesian/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
}

if(axType === 'date') {
if(!options.noTicklabelmode) coerce('ticklabelmode');

handleArrayContainerDefaults(containerIn, containerOut, {
name: 'rangebreaks',
inclusionAttr: 'enabled',
Expand Down
14 changes: 14 additions & 0 deletions src/plots/cartesian/layout_attributes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,20 @@ module.exports = {
'to the left/bottom of labels.'
].join(' ')
},
ticklabelmode: {
valType: 'enumerated',
values: ['instant', 'period'],
dflt: 'instant',
role: 'info',
editType: 'ticks',
description: [
'Determines where tick labels are drawn with respect to their',
'corresponding ticks and grid lines.',
'Only has an effect for axes of `type` *date*',
'When set to *period*, tick labels are drawn in the middle of the period',
'between ticks.'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually not quite the desired behaviour: if the ticks are spaced every 2 months and the labels are Jan and Mar, the Jan label should appear on Jan 15, not on Feb 1.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's an example... https://codepen.io/nicolaskruchten/pen/ZEQRBWw?editors=0010

In "instant" mode we see 4 "month" labels spaced two months apart. In "period" mode we probably should see only 3 labels, but they should remain Jan/Mar/May, and they should be positioned on Jan 15, Mar 15, May 15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a clearer codepen in the original issue

].join(' ')
},
mirror: {
valType: 'enumerated',
values: [true, 'ticks', false, 'all', 'allticks'],
Expand Down
1 change: 1 addition & 0 deletions src/plots/gl3d/layout/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
data: options.data,
showGrid: true,
noTickson: true,
noTicklabelmode: true,
bgColor: options.bgColor,
calendar: options.calendar
},
Expand Down
Binary file addedtest/image/baselines/date_axes_period.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/date_axes_period2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions test/image/mocks/date_axes_period.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
{
"data": [
{
"x": [
"1900-01-01",
"2000-01-01",
"2100-01-01"
],
"y": [1, 3, 2]
},
{
"x": [
"2013-05-01",
"2013-09-01",
"2014-01-01"
],
"y": [1, 3, 2],
"xaxis": "x2",
"yaxis": "y2"
},
{
"x": [
"2013-11-17",
"2013-12-15",
"2014-01-12"
],
"y": [1, 3, 2],
"xaxis": "x3",
"yaxis": "y3"
},
{
"x": [
"2013-01-01",
"2013-01-02",
"2013-01-03"
],
"y": [1, 3, 2],
"xaxis": "x4",
"yaxis": "y4"
},
{
"x": [
"2013-07-01 18:00",
"2013-07-02 00:00",
"2013-07-02 06:00"
],
"y": [1, 3, 2],
"xaxis": "x5",
"yaxis": "y5"
},
{
"x": [
"2013-01-01 23:59",
"2013-01-02 00:00",
"2013-01-02 00:01"
],
"y": [1, 3, 2],
"xaxis": "x6",
"yaxis": "y6"
},
{
"x": [
"2013-07-01 23:59:59",
"2013-07-02 00:00:00",
"2013-07-02 00:00:01"
],
"y": [1, 3, 2],
"xaxis": "x7",
"yaxis": "y7"
}
],
"layout": {
"showlegend": false,
"width": 600,
"height": 500,
"yaxis": {"domain": [0, 0.04]},
"yaxis2": {"domain": [0.16, 0.2]},
"yaxis3": {"domain": [0.32, 0.36]},
"yaxis4": {"domain": [0.48, 0.52]},
"yaxis5": {"domain": [0.64, 0.68]},
"yaxis6": {"domain": [0.80, 0.84]},
"yaxis7": {"domain": [0.96, 1]},
"xaxis": {"ticklabelmode": "period"},
"xaxis2": {"ticklabelmode": "period", "anchor": "y2"},
"xaxis3": {"ticklabelmode": "period", "anchor": "y3"},
"xaxis4": {"ticklabelmode": "period", "anchor": "y4"},
"xaxis5": {"ticklabelmode": "period", "anchor": "y5"},
"xaxis6": {"ticklabelmode": "period", "anchor": "y6"},
"xaxis7": {"ticklabelmode": "period", "anchor": "y7"}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/colorbar/draw.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -706,6 +706,7 @@ function mockColorBarAxis(gd, opts, zrange) {
font: fullLayout.font,
noHover: true,
noTickson: true,
noTicklabelmode: true,
calendar: fullLayout.calendar // not really necessary (yet?)
};

Expand Down
90 changes: 89 additions & 1 deletion src/plots/cartesian/axes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -620,6 +620,15 @@ axes.calcTicks = function calcTicks(ax, opts) {

generateTicks();

var isPeriod = ax.ticklabelmode === 'period';
if(isPeriod) {
// add one label to show pre tick0 period
tickVals.unshift({
minor: false,
value: axes.tickIncrement(tickVals[0].value, ax.dtick, !axrev, ax.caldendar)
});
}

if(ax.rangebreaks) {
// replace ticks inside breaks that would get a tick
// and reduce ticks
Expand DownExpand Up@@ -681,6 +690,32 @@ axes.calcTicks = function calcTicks(ax, opts) {
ax._prevDateHead = '';
ax._inCalcTicks = true;

var minRange = Math.min(rng[0], rng[1]);
var maxRange = Math.max(rng[0], rng[1]);

var definedDelta;
if(isPeriod && ax.tickformat) {
var _has = function(str) {
return ax.tickformat.indexOf(str) !== -1;
};

if(
!_has('%f') &&
!_has('%H') &&
!_has('%I') &&
!_has('%L') &&
!_has('%Q') &&
!_has('%S') &&
!_has('%s') &&
!_has('%X')
) {
if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
}
}

var removedPreTick0Label = false;
var ticksOut = new Array(tickVals.length);
for(var i = 0; i < tickVals.length; i++) {
var _minor = tickVals[i].minor;
Expand All@@ -692,6 +727,46 @@ axes.calcTicks = function calcTicks(ax, opts) {
false, // hover
_minor // noSuffixPrefix
);

if(isPeriod) {
var v = tickVals[i].value;

var a = i;
var b = i + 1;
if(i < tickVals.length - 1) {
a = i;
b = i + 1;
} else {
a = i - 1;
b = i;
}

var A = tickVals[a].value;
var B = tickVals[b].value;

var delta = definedDelta || Math.abs(B - A);
var half = axrev ? -0.5 : 0.5;
if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
v += half * ONEAVGYEAR;
} else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
v += half * ONEAVGMONTH;
} else if(delta >= ONEDAY) {
v += half * ONEDAY;
}

ticksOut[i].periodX = v;

if(v > maxRange || v < minRange) { // hide label if outside the range
ticksOut[i].text = '';
if(i === 0) removedPreTick0Label = true;
}
}
}

if(removedPreTick0Label && ticksOut.length > 1) {
// redo tick0 text
ax._prevDateHead = '';
ticksOut[1].text = axes.tickText(ax, tickVals[1].value).text;
}

ax._inCalcTicks = false;
Expand DownExpand Up@@ -1785,6 +1860,10 @@ axes.drawOne = function(gd, ax, opts) {
if(!ax.visible) return;

var transFn = axes.makeTransFn(ax);
var transTickLabelFn = ax.ticklabelmode === 'period' ?
axes.makeTransPeriodFn(ax) :
axes.makeTransFn(ax);

var tickVals;
// We remove zero lines, grid lines, and inside ticks if they're within 1px of the end
// The key case here is removing zero lines when the axis bound is zero
Expand DownExpand Up@@ -1903,7 +1982,7 @@ axes.drawOne = function(gd, ax, opts) {
return axes.drawLabels(gd, ax, {
vals: vals,
layer: mainAxLayer,
transFn: transFn,
transFn: transTickLabelFn,
labelFns: axes.makeLabelFns(ax, mainLinePosition)
});
});
Expand DownExpand Up@@ -2213,6 +2292,14 @@ axes.makeTransFn = function(ax) {
function(d) { return 'translate(0,' + (offset + ax.l2p(d.x)) + ')'; };
};

axes.makeTransPeriodFn = function(ax) {
var axLetter = ax._id.charAt(0);
var offset = ax._offset;
return axLetter === 'x' ?
function(d) { return 'translate(' + (offset + ax.l2p(d.periodX)) + ',0)'; } :
function(d) { return 'translate(0,' + (offset + ax.l2p(d.periodX)) + ')'; };
};

/**
* Make axis tick path string
*
Expand DownExpand Up@@ -2511,6 +2598,7 @@ axes.drawLabels = function(gd, ax, opts) {
var axLetter = axId.charAt(0);
var cls = opts.cls || axId + 'tick';
var vals = opts.vals;

var labelFns = opts.labelFns;
var tickAngle = opts.secondary ? 0 : ax.tickangle;
var prevAngle = (ax._prevTickAngles || {})[cls];
Expand Down
2 changes: 2 additions & 0 deletions src/plots/cartesian/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
}

if(axType === 'date') {
if(!options.noTicklabelmode) coerce('ticklabelmode');

handleArrayContainerDefaults(containerIn, containerOut, {
name: 'rangebreaks',
inclusionAttr: 'enabled',
Expand Down
14 changes: 14 additions & 0 deletions src/plots/cartesian/layout_attributes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,20 @@ module.exports = {
'to the left/bottom of labels.'
].join(' ')
},
ticklabelmode: {
valType: 'enumerated',
values: ['instant', 'period'],
dflt: 'instant',
role: 'info',
editType: 'ticks',
description: [
'Determines where tick labels are drawn with respect to their',
'corresponding ticks and grid lines.',
'Only has an effect for axes of `type` *date*',
'When set to *period*, tick labels are drawn in the middle of the period',
'between ticks.'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually not quite the desired behaviour: if the ticks are spaced every 2 months and the labels are Jan and Mar, the Jan label should appear on Jan 15, not on Feb 1.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's an example... https://codepen.io/nicolaskruchten/pen/ZEQRBWw?editors=0010

In "instant" mode we see 4 "month" labels spaced two months apart. In "period" mode we probably should see only 3 labels, but they should remain Jan/Mar/May, and they should be positioned on Jan 15, Mar 15, May 15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a clearer codepen in the original issue

].join(' ')
},
mirror: {
valType: 'enumerated',
values: [true, 'ticks', false, 'all', 'allticks'],
Expand Down
1 change: 1 addition & 0 deletions src/plots/gl3d/layout/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
data: options.data,
showGrid: true,
noTickson: true,
noTicklabelmode: true,
bgColor: options.bgColor,
calendar: options.calendar
},
Expand Down
Binary file addedtest/image/baselines/date_axes_period.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/date_axes_period2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions test/image/mocks/date_axes_period.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
{
"data": [
{
"x": [
"1900-01-01",
"2000-01-01",
"2100-01-01"
],
"y": [1, 3, 2]
},
{
"x": [
"2013-05-01",
"2013-09-01",
"2014-01-01"
],
"y": [1, 3, 2],
"xaxis": "x2",
"yaxis": "y2"
},
{
"x": [
"2013-11-17",
"2013-12-15",
"2014-01-12"
],
"y": [1, 3, 2],
"xaxis": "x3",
"yaxis": "y3"
},
{
"x": [
"2013-01-01",
"2013-01-02",
"2013-01-03"
],
"y": [1, 3, 2],
"xaxis": "x4",
"yaxis": "y4"
},
{
"x": [
"2013-07-01 18:00",
"2013-07-02 00:00",
"2013-07-02 06:00"
],
"y": [1, 3, 2],
"xaxis": "x5",
"yaxis": "y5"
},
{
"x": [
"2013-01-01 23:59",
"2013-01-02 00:00",
"2013-01-02 00:01"
],
"y": [1, 3, 2],
"xaxis": "x6",
"yaxis": "y6"
},
{
"x": [
"2013-07-01 23:59:59",
"2013-07-02 00:00:00",
"2013-07-02 00:00:01"
],
"y": [1, 3, 2],
"xaxis": "x7",
"yaxis": "y7"
}
],
"layout": {
"showlegend": false,
"width": 600,
"height": 500,
"yaxis": {"domain": [0, 0.04]},
"yaxis2": {"domain": [0.16, 0.2]},
"yaxis3": {"domain": [0.32, 0.36]},
"yaxis4": {"domain": [0.48, 0.52]},
"yaxis5": {"domain": [0.64, 0.68]},
"yaxis6": {"domain": [0.80, 0.84]},
"yaxis7": {"domain": [0.96, 1]},
"xaxis": {"ticklabelmode": "period"},
"xaxis2": {"ticklabelmode": "period", "anchor": "y2"},
"xaxis3": {"ticklabelmode": "period", "anchor": "y3"},
"xaxis4": {"ticklabelmode": "period", "anchor": "y4"},
"xaxis5": {"ticklabelmode": "period", "anchor": "y5"},
"xaxis6": {"ticklabelmode": "period", "anchor": "y6"},
"xaxis7": {"ticklabelmode": "period", "anchor": "y7"}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/colorbar/draw.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -706,6 +706,7 @@ function mockColorBarAxis(gd, opts, zrange) {
font: fullLayout.font,
noHover: true,
noTickson: true,
noTicklabelmode: true,
calendar: fullLayout.calendar // not really necessary (yet?)
};

Expand Down
90 changes: 89 additions & 1 deletion src/plots/cartesian/axes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -620,6 +620,15 @@ axes.calcTicks = function calcTicks(ax, opts) {

generateTicks();

var isPeriod = ax.ticklabelmode === 'period';
if(isPeriod) {
// add one label to show pre tick0 period
tickVals.unshift({
minor: false,
value: axes.tickIncrement(tickVals[0].value, ax.dtick, !axrev, ax.caldendar)
});
}

if(ax.rangebreaks) {
// replace ticks inside breaks that would get a tick
// and reduce ticks
Expand DownExpand Up@@ -681,6 +690,32 @@ axes.calcTicks = function calcTicks(ax, opts) {
ax._prevDateHead = '';
ax._inCalcTicks = true;

var minRange = Math.min(rng[0], rng[1]);
var maxRange = Math.max(rng[0], rng[1]);

var definedDelta;
if(isPeriod && ax.tickformat) {
var _has = function(str) {
return ax.tickformat.indexOf(str) !== -1;
};

if(
!_has('%f') &&
!_has('%H') &&
!_has('%I') &&
!_has('%L') &&
!_has('%Q') &&
!_has('%S') &&
!_has('%s') &&
!_has('%X')
) {
if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
}
}

var removedPreTick0Label = false;
var ticksOut = new Array(tickVals.length);
for(var i = 0; i < tickVals.length; i++) {
var _minor = tickVals[i].minor;
Expand All@@ -692,6 +727,46 @@ axes.calcTicks = function calcTicks(ax, opts) {
false, // hover
_minor // noSuffixPrefix
);

if(isPeriod) {
var v = tickVals[i].value;

var a = i;
var b = i + 1;
if(i < tickVals.length - 1) {
a = i;
b = i + 1;
} else {
a = i - 1;
b = i;
}

var A = tickVals[a].value;
var B = tickVals[b].value;

var delta = definedDelta || Math.abs(B - A);
var half = axrev ? -0.5 : 0.5;
if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
v += half * ONEAVGYEAR;
} else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
v += half * ONEAVGMONTH;
} else if(delta >= ONEDAY) {
v += half * ONEDAY;
}

ticksOut[i].periodX = v;

if(v > maxRange || v < minRange) { // hide label if outside the range
ticksOut[i].text = '';
if(i === 0) removedPreTick0Label = true;
}
}
}

if(removedPreTick0Label && ticksOut.length > 1) {
// redo tick0 text
ax._prevDateHead = '';
ticksOut[1].text = axes.tickText(ax, tickVals[1].value).text;
}

ax._inCalcTicks = false;
Expand DownExpand Up@@ -1785,6 +1860,10 @@ axes.drawOne = function(gd, ax, opts) {
if(!ax.visible) return;

var transFn = axes.makeTransFn(ax);
var transTickLabelFn = ax.ticklabelmode === 'period' ?
axes.makeTransPeriodFn(ax) :
axes.makeTransFn(ax);

var tickVals;
// We remove zero lines, grid lines, and inside ticks if they're within 1px of the end
// The key case here is removing zero lines when the axis bound is zero
Expand DownExpand Up@@ -1903,7 +1982,7 @@ axes.drawOne = function(gd, ax, opts) {
return axes.drawLabels(gd, ax, {
vals: vals,
layer: mainAxLayer,
transFn: transFn,
transFn: transTickLabelFn,
labelFns: axes.makeLabelFns(ax, mainLinePosition)
});
});
Expand DownExpand Up@@ -2213,6 +2292,14 @@ axes.makeTransFn = function(ax) {
function(d) { return 'translate(0,' + (offset + ax.l2p(d.x)) + ')'; };
};

axes.makeTransPeriodFn = function(ax) {
var axLetter = ax._id.charAt(0);
var offset = ax._offset;
return axLetter === 'x' ?
function(d) { return 'translate(' + (offset + ax.l2p(d.periodX)) + ',0)'; } :
function(d) { return 'translate(0,' + (offset + ax.l2p(d.periodX)) + ')'; };
};

/**
* Make axis tick path string
*
Expand DownExpand Up@@ -2511,6 +2598,7 @@ axes.drawLabels = function(gd, ax, opts) {
var axLetter = axId.charAt(0);
var cls = opts.cls || axId + 'tick';
var vals = opts.vals;

var labelFns = opts.labelFns;
var tickAngle = opts.secondary ? 0 : ax.tickangle;
var prevAngle = (ax._prevTickAngles || {})[cls];
Expand Down
2 changes: 2 additions & 0 deletions src/plots/cartesian/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
}

if(axType === 'date') {
if(!options.noTicklabelmode) coerce('ticklabelmode');

handleArrayContainerDefaults(containerIn, containerOut, {
name: 'rangebreaks',
inclusionAttr: 'enabled',
Expand Down
14 changes: 14 additions & 0 deletions src/plots/cartesian/layout_attributes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,20 @@ module.exports = {
'to the left/bottom of labels.'
].join(' ')
},
ticklabelmode: {
valType: 'enumerated',
values: ['instant', 'period'],
dflt: 'instant',
role: 'info',
editType: 'ticks',
description: [
'Determines where tick labels are drawn with respect to their',
'corresponding ticks and grid lines.',
'Only has an effect for axes of `type` *date*',
'When set to *period*, tick labels are drawn in the middle of the period',
'between ticks.'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually not quite the desired behaviour: if the ticks are spaced every 2 months and the labels are Jan and Mar, the Jan label should appear on Jan 15, not on Feb 1.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's an example... https://codepen.io/nicolaskruchten/pen/ZEQRBWw?editors=0010

In "instant" mode we see 4 "month" labels spaced two months apart. In "period" mode we probably should see only 3 labels, but they should remain Jan/Mar/May, and they should be positioned on Jan 15, Mar 15, May 15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a clearer codepen in the original issue

].join(' ')
},
mirror: {
valType: 'enumerated',
values: [true, 'ticks', false, 'all', 'allticks'],
Expand Down
1 change: 1 addition & 0 deletions src/plots/gl3d/layout/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
data: options.data,
showGrid: true,
noTickson: true,
noTicklabelmode: true,
bgColor: options.bgColor,
calendar: options.calendar
},
Expand Down
Binary file addedtest/image/baselines/date_axes_period.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/date_axes_period2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions test/image/mocks/date_axes_period.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
{
"data": [
{
"x": [
"1900-01-01",
"2000-01-01",
"2100-01-01"
],
"y": [1, 3, 2]
},
{
"x": [
"2013-05-01",
"2013-09-01",
"2014-01-01"
],
"y": [1, 3, 2],
"xaxis": "x2",
"yaxis": "y2"
},
{
"x": [
"2013-11-17",
"2013-12-15",
"2014-01-12"
],
"y": [1, 3, 2],
"xaxis": "x3",
"yaxis": "y3"
},
{
"x": [
"2013-01-01",
"2013-01-02",
"2013-01-03"
],
"y": [1, 3, 2],
"xaxis": "x4",
"yaxis": "y4"
},
{
"x": [
"2013-07-01 18:00",
"2013-07-02 00:00",
"2013-07-02 06:00"
],
"y": [1, 3, 2],
"xaxis": "x5",
"yaxis": "y5"
},
{
"x": [
"2013-01-01 23:59",
"2013-01-02 00:00",
"2013-01-02 00:01"
],
"y": [1, 3, 2],
"xaxis": "x6",
"yaxis": "y6"
},
{
"x": [
"2013-07-01 23:59:59",
"2013-07-02 00:00:00",
"2013-07-02 00:00:01"
],
"y": [1, 3, 2],
"xaxis": "x7",
"yaxis": "y7"
}
],
"layout": {
"showlegend": false,
"width": 600,
"height": 500,
"yaxis": {"domain": [0, 0.04]},
"yaxis2": {"domain": [0.16, 0.2]},
"yaxis3": {"domain": [0.32, 0.36]},
"yaxis4": {"domain": [0.48, 0.52]},
"yaxis5": {"domain": [0.64, 0.68]},
"yaxis6": {"domain": [0.80, 0.84]},
"yaxis7": {"domain": [0.96, 1]},
"xaxis": {"ticklabelmode": "period"},
"xaxis2": {"ticklabelmode": "period", "anchor": "y2"},
"xaxis3": {"ticklabelmode": "period", "anchor": "y3"},
"xaxis4": {"ticklabelmode": "period", "anchor": "y4"},
"xaxis5": {"ticklabelmode": "period", "anchor": "y5"},
"xaxis6": {"ticklabelmode": "period", "anchor": "y6"},
"xaxis7": {"ticklabelmode": "period", "anchor": "y7"}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/colorbar/draw.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -706,6 +706,7 @@ function mockColorBarAxis(gd, opts, zrange) {
font: fullLayout.font,
noHover: true,
noTickson: true,
noTicklabelmode: true,
calendar: fullLayout.calendar // not really necessary (yet?)
};

Expand Down
90 changes: 89 additions & 1 deletion src/plots/cartesian/axes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -620,6 +620,15 @@ axes.calcTicks = function calcTicks(ax, opts) {

generateTicks();

var isPeriod = ax.ticklabelmode === 'period';
if(isPeriod) {
// add one label to show pre tick0 period
tickVals.unshift({
minor: false,
value: axes.tickIncrement(tickVals[0].value, ax.dtick, !axrev, ax.caldendar)
});
}

if(ax.rangebreaks) {
// replace ticks inside breaks that would get a tick
// and reduce ticks
Expand DownExpand Up@@ -681,6 +690,32 @@ axes.calcTicks = function calcTicks(ax, opts) {
ax._prevDateHead = '';
ax._inCalcTicks = true;

var minRange = Math.min(rng[0], rng[1]);
var maxRange = Math.max(rng[0], rng[1]);

var definedDelta;
if(isPeriod && ax.tickformat) {
var _has = function(str) {
return ax.tickformat.indexOf(str) !== -1;
};

if(
!_has('%f') &&
!_has('%H') &&
!_has('%I') &&
!_has('%L') &&
!_has('%Q') &&
!_has('%S') &&
!_has('%s') &&
!_has('%X')
) {
if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
}
}

var removedPreTick0Label = false;
var ticksOut = new Array(tickVals.length);
for(var i = 0; i < tickVals.length; i++) {
var _minor = tickVals[i].minor;
Expand All@@ -692,6 +727,46 @@ axes.calcTicks = function calcTicks(ax, opts) {
false, // hover
_minor // noSuffixPrefix
);

if(isPeriod) {
var v = tickVals[i].value;

var a = i;
var b = i + 1;
if(i < tickVals.length - 1) {
a = i;
b = i + 1;
} else {
a = i - 1;
b = i;
}

var A = tickVals[a].value;
var B = tickVals[b].value;

var delta = definedDelta || Math.abs(B - A);
var half = axrev ? -0.5 : 0.5;
if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
v += half * ONEAVGYEAR;
} else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
v += half * ONEAVGMONTH;
} else if(delta >= ONEDAY) {
v += half * ONEDAY;
}

ticksOut[i].periodX = v;

if(v > maxRange || v < minRange) { // hide label if outside the range
ticksOut[i].text = '';
if(i === 0) removedPreTick0Label = true;
}
}
}

if(removedPreTick0Label && ticksOut.length > 1) {
// redo tick0 text
ax._prevDateHead = '';
ticksOut[1].text = axes.tickText(ax, tickVals[1].value).text;
}

ax._inCalcTicks = false;
Expand DownExpand Up@@ -1785,6 +1860,10 @@ axes.drawOne = function(gd, ax, opts) {
if(!ax.visible) return;

var transFn = axes.makeTransFn(ax);
var transTickLabelFn = ax.ticklabelmode === 'period' ?
axes.makeTransPeriodFn(ax) :
axes.makeTransFn(ax);

var tickVals;
// We remove zero lines, grid lines, and inside ticks if they're within 1px of the end
// The key case here is removing zero lines when the axis bound is zero
Expand DownExpand Up@@ -1903,7 +1982,7 @@ axes.drawOne = function(gd, ax, opts) {
return axes.drawLabels(gd, ax, {
vals: vals,
layer: mainAxLayer,
transFn: transFn,
transFn: transTickLabelFn,
labelFns: axes.makeLabelFns(ax, mainLinePosition)
});
});
Expand DownExpand Up@@ -2213,6 +2292,14 @@ axes.makeTransFn = function(ax) {
function(d) { return 'translate(0,' + (offset + ax.l2p(d.x)) + ')'; };
};

axes.makeTransPeriodFn = function(ax) {
var axLetter = ax._id.charAt(0);
var offset = ax._offset;
return axLetter === 'x' ?
function(d) { return 'translate(' + (offset + ax.l2p(d.periodX)) + ',0)'; } :
function(d) { return 'translate(0,' + (offset + ax.l2p(d.periodX)) + ')'; };
};

/**
* Make axis tick path string
*
Expand DownExpand Up@@ -2511,6 +2598,7 @@ axes.drawLabels = function(gd, ax, opts) {
var axLetter = axId.charAt(0);
var cls = opts.cls || axId + 'tick';
var vals = opts.vals;

var labelFns = opts.labelFns;
var tickAngle = opts.secondary ? 0 : ax.tickangle;
var prevAngle = (ax._prevTickAngles || {})[cls];
Expand Down
2 changes: 2 additions & 0 deletions src/plots/cartesian/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
}

if(axType === 'date') {
if(!options.noTicklabelmode) coerce('ticklabelmode');

handleArrayContainerDefaults(containerIn, containerOut, {
name: 'rangebreaks',
inclusionAttr: 'enabled',
Expand Down
14 changes: 14 additions & 0 deletions src/plots/cartesian/layout_attributes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,20 @@ module.exports = {
'to the left/bottom of labels.'
].join(' ')
},
ticklabelmode: {
valType: 'enumerated',
values: ['instant', 'period'],
dflt: 'instant',
role: 'info',
editType: 'ticks',
description: [
'Determines where tick labels are drawn with respect to their',
'corresponding ticks and grid lines.',
'Only has an effect for axes of `type` *date*',
'When set to *period*, tick labels are drawn in the middle of the period',
'between ticks.'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually not quite the desired behaviour: if the ticks are spaced every 2 months and the labels are Jan and Mar, the Jan label should appear on Jan 15, not on Feb 1.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's an example... https://codepen.io/nicolaskruchten/pen/ZEQRBWw?editors=0010

In "instant" mode we see 4 "month" labels spaced two months apart. In "period" mode we probably should see only 3 labels, but they should remain Jan/Mar/May, and they should be positioned on Jan 15, Mar 15, May 15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a clearer codepen in the original issue

].join(' ')
},
mirror: {
valType: 'enumerated',
values: [true, 'ticks', false, 'all', 'allticks'],
Expand Down
1 change: 1 addition & 0 deletions src/plots/gl3d/layout/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
data: options.data,
showGrid: true,
noTickson: true,
noTicklabelmode: true,
bgColor: options.bgColor,
calendar: options.calendar
},
Expand Down
Binary file addedtest/image/baselines/date_axes_period.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/date_axes_period2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions test/image/mocks/date_axes_period.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
{
"data": [
{
"x": [
"1900-01-01",
"2000-01-01",
"2100-01-01"
],
"y": [1, 3, 2]
},
{
"x": [
"2013-05-01",
"2013-09-01",
"2014-01-01"
],
"y": [1, 3, 2],
"xaxis": "x2",
"yaxis": "y2"
},
{
"x": [
"2013-11-17",
"2013-12-15",
"2014-01-12"
],
"y": [1, 3, 2],
"xaxis": "x3",
"yaxis": "y3"
},
{
"x": [
"2013-01-01",
"2013-01-02",
"2013-01-03"
],
"y": [1, 3, 2],
"xaxis": "x4",
"yaxis": "y4"
},
{
"x": [
"2013-07-01 18:00",
"2013-07-02 00:00",
"2013-07-02 06:00"
],
"y": [1, 3, 2],
"xaxis": "x5",
"yaxis": "y5"
},
{
"x": [
"2013-01-01 23:59",
"2013-01-02 00:00",
"2013-01-02 00:01"
],
"y": [1, 3, 2],
"xaxis": "x6",
"yaxis": "y6"
},
{
"x": [
"2013-07-01 23:59:59",
"2013-07-02 00:00:00",
"2013-07-02 00:00:01"
],
"y": [1, 3, 2],
"xaxis": "x7",
"yaxis": "y7"
}
],
"layout": {
"showlegend": false,
"width": 600,
"height": 500,
"yaxis": {"domain": [0, 0.04]},
"yaxis2": {"domain": [0.16, 0.2]},
"yaxis3": {"domain": [0.32, 0.36]},
"yaxis4": {"domain": [0.48, 0.52]},
"yaxis5": {"domain": [0.64, 0.68]},
"yaxis6": {"domain": [0.80, 0.84]},
"yaxis7": {"domain": [0.96, 1]},
"xaxis": {"ticklabelmode": "period"},
"xaxis2": {"ticklabelmode": "period", "anchor": "y2"},
"xaxis3": {"ticklabelmode": "period", "anchor": "y3"},
"xaxis4": {"ticklabelmode": "period", "anchor": "y4"},
"xaxis5": {"ticklabelmode": "period", "anchor": "y5"},
"xaxis6": {"ticklabelmode": "period", "anchor": "y6"},
"xaxis7": {"ticklabelmode": "period", "anchor": "y7"}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/colorbar/draw.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -706,6 +706,7 @@ function mockColorBarAxis(gd, opts, zrange) {
font: fullLayout.font,
noHover: true,
noTickson: true,
noTicklabelmode: true,
calendar: fullLayout.calendar // not really necessary (yet?)
};

Expand Down
90 changes: 89 additions & 1 deletion src/plots/cartesian/axes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -620,6 +620,15 @@ axes.calcTicks = function calcTicks(ax, opts) {

generateTicks();

var isPeriod = ax.ticklabelmode === 'period';
if(isPeriod) {
// add one label to show pre tick0 period
tickVals.unshift({
minor: false,
value: axes.tickIncrement(tickVals[0].value, ax.dtick, !axrev, ax.caldendar)
});
}

if(ax.rangebreaks) {
// replace ticks inside breaks that would get a tick
// and reduce ticks
Expand DownExpand Up@@ -681,6 +690,32 @@ axes.calcTicks = function calcTicks(ax, opts) {
ax._prevDateHead = '';
ax._inCalcTicks = true;

var minRange = Math.min(rng[0], rng[1]);
var maxRange = Math.max(rng[0], rng[1]);

var definedDelta;
if(isPeriod && ax.tickformat) {
var _has = function(str) {
return ax.tickformat.indexOf(str) !== -1;
};

if(
!_has('%f') &&
!_has('%H') &&
!_has('%I') &&
!_has('%L') &&
!_has('%Q') &&
!_has('%S') &&
!_has('%s') &&
!_has('%X')
) {
if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
}
}

var removedPreTick0Label = false;
var ticksOut = new Array(tickVals.length);
for(var i = 0; i < tickVals.length; i++) {
var _minor = tickVals[i].minor;
Expand All@@ -692,6 +727,46 @@ axes.calcTicks = function calcTicks(ax, opts) {
false, // hover
_minor // noSuffixPrefix
);

if(isPeriod) {
var v = tickVals[i].value;

var a = i;
var b = i + 1;
if(i < tickVals.length - 1) {
a = i;
b = i + 1;
} else {
a = i - 1;
b = i;
}

var A = tickVals[a].value;
var B = tickVals[b].value;

var delta = definedDelta || Math.abs(B - A);
var half = axrev ? -0.5 : 0.5;
if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
v += half * ONEAVGYEAR;
} else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
v += half * ONEAVGMONTH;
} else if(delta >= ONEDAY) {
v += half * ONEDAY;
}

ticksOut[i].periodX = v;

if(v > maxRange || v < minRange) { // hide label if outside the range
ticksOut[i].text = '';
if(i === 0) removedPreTick0Label = true;
}
}
}

if(removedPreTick0Label && ticksOut.length > 1) {
// redo tick0 text
ax._prevDateHead = '';
ticksOut[1].text = axes.tickText(ax, tickVals[1].value).text;
}

ax._inCalcTicks = false;
Expand DownExpand Up@@ -1785,6 +1860,10 @@ axes.drawOne = function(gd, ax, opts) {
if(!ax.visible) return;

var transFn = axes.makeTransFn(ax);
var transTickLabelFn = ax.ticklabelmode === 'period' ?
axes.makeTransPeriodFn(ax) :
axes.makeTransFn(ax);

var tickVals;
// We remove zero lines, grid lines, and inside ticks if they're within 1px of the end
// The key case here is removing zero lines when the axis bound is zero
Expand DownExpand Up@@ -1903,7 +1982,7 @@ axes.drawOne = function(gd, ax, opts) {
return axes.drawLabels(gd, ax, {
vals: vals,
layer: mainAxLayer,
transFn: transFn,
transFn: transTickLabelFn,
labelFns: axes.makeLabelFns(ax, mainLinePosition)
});
});
Expand DownExpand Up@@ -2213,6 +2292,14 @@ axes.makeTransFn = function(ax) {
function(d) { return 'translate(0,' + (offset + ax.l2p(d.x)) + ')'; };
};

axes.makeTransPeriodFn = function(ax) {
var axLetter = ax._id.charAt(0);
var offset = ax._offset;
return axLetter === 'x' ?
function(d) { return 'translate(' + (offset + ax.l2p(d.periodX)) + ',0)'; } :
function(d) { return 'translate(0,' + (offset + ax.l2p(d.periodX)) + ')'; };
};

/**
* Make axis tick path string
*
Expand DownExpand Up@@ -2511,6 +2598,7 @@ axes.drawLabels = function(gd, ax, opts) {
var axLetter = axId.charAt(0);
var cls = opts.cls || axId + 'tick';
var vals = opts.vals;

var labelFns = opts.labelFns;
var tickAngle = opts.secondary ? 0 : ax.tickangle;
var prevAngle = (ax._prevTickAngles || {})[cls];
Expand Down
2 changes: 2 additions & 0 deletions src/plots/cartesian/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
}

if(axType === 'date') {
if(!options.noTicklabelmode) coerce('ticklabelmode');

handleArrayContainerDefaults(containerIn, containerOut, {
name: 'rangebreaks',
inclusionAttr: 'enabled',
Expand Down
14 changes: 14 additions & 0 deletions src/plots/cartesian/layout_attributes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,20 @@ module.exports = {
'to the left/bottom of labels.'
].join(' ')
},
ticklabelmode: {
valType: 'enumerated',
values: ['instant', 'period'],
dflt: 'instant',
role: 'info',
editType: 'ticks',
description: [
'Determines where tick labels are drawn with respect to their',
'corresponding ticks and grid lines.',
'Only has an effect for axes of `type` *date*',
'When set to *period*, tick labels are drawn in the middle of the period',
'between ticks.'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually not quite the desired behaviour: if the ticks are spaced every 2 months and the labels are Jan and Mar, the Jan label should appear on Jan 15, not on Feb 1.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's an example... https://codepen.io/nicolaskruchten/pen/ZEQRBWw?editors=0010

In "instant" mode we see 4 "month" labels spaced two months apart. In "period" mode we probably should see only 3 labels, but they should remain Jan/Mar/May, and they should be positioned on Jan 15, Mar 15, May 15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a clearer codepen in the original issue

].join(' ')
},
mirror: {
valType: 'enumerated',
values: [true, 'ticks', false, 'all', 'allticks'],
Expand Down
1 change: 1 addition & 0 deletions src/plots/gl3d/layout/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
data: options.data,
showGrid: true,
noTickson: true,
noTicklabelmode: true,
bgColor: options.bgColor,
calendar: options.calendar
},
Expand Down
Binary file addedtest/image/baselines/date_axes_period.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/date_axes_period2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions test/image/mocks/date_axes_period.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
{
"data": [
{
"x": [
"1900-01-01",
"2000-01-01",
"2100-01-01"
],
"y": [1, 3, 2]
},
{
"x": [
"2013-05-01",
"2013-09-01",
"2014-01-01"
],
"y": [1, 3, 2],
"xaxis": "x2",
"yaxis": "y2"
},
{
"x": [
"2013-11-17",
"2013-12-15",
"2014-01-12"
],
"y": [1, 3, 2],
"xaxis": "x3",
"yaxis": "y3"
},
{
"x": [
"2013-01-01",
"2013-01-02",
"2013-01-03"
],
"y": [1, 3, 2],
"xaxis": "x4",
"yaxis": "y4"
},
{
"x": [
"2013-07-01 18:00",
"2013-07-02 00:00",
"2013-07-02 06:00"
],
"y": [1, 3, 2],
"xaxis": "x5",
"yaxis": "y5"
},
{
"x": [
"2013-01-01 23:59",
"2013-01-02 00:00",
"2013-01-02 00:01"
],
"y": [1, 3, 2],
"xaxis": "x6",
"yaxis": "y6"
},
{
"x": [
"2013-07-01 23:59:59",
"2013-07-02 00:00:00",
"2013-07-02 00:00:01"
],
"y": [1, 3, 2],
"xaxis": "x7",
"yaxis": "y7"
}
],
"layout": {
"showlegend": false,
"width": 600,
"height": 500,
"yaxis": {"domain": [0, 0.04]},
"yaxis2": {"domain": [0.16, 0.2]},
"yaxis3": {"domain": [0.32, 0.36]},
"yaxis4": {"domain": [0.48, 0.52]},
"yaxis5": {"domain": [0.64, 0.68]},
"yaxis6": {"domain": [0.80, 0.84]},
"yaxis7": {"domain": [0.96, 1]},
"xaxis": {"ticklabelmode": "period"},
"xaxis2": {"ticklabelmode": "period", "anchor": "y2"},
"xaxis3": {"ticklabelmode": "period", "anchor": "y3"},
"xaxis4": {"ticklabelmode": "period", "anchor": "y4"},
"xaxis5": {"ticklabelmode": "period", "anchor": "y5"},
"xaxis6": {"ticklabelmode": "period", "anchor": "y6"},
"xaxis7": {"ticklabelmode": "period", "anchor": "y7"}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/colorbar/draw.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -706,6 +706,7 @@ function mockColorBarAxis(gd, opts, zrange) {
font: fullLayout.font,
noHover: true,
noTickson: true,
noTicklabelmode: true,
calendar: fullLayout.calendar // not really necessary (yet?)
};

Expand Down
90 changes: 89 additions & 1 deletion src/plots/cartesian/axes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -620,6 +620,15 @@ axes.calcTicks = function calcTicks(ax, opts) {

generateTicks();

var isPeriod = ax.ticklabelmode === 'period';
if(isPeriod) {
// add one label to show pre tick0 period
tickVals.unshift({
minor: false,
value: axes.tickIncrement(tickVals[0].value, ax.dtick, !axrev, ax.caldendar)
});
}

if(ax.rangebreaks) {
// replace ticks inside breaks that would get a tick
// and reduce ticks
Expand DownExpand Up@@ -681,6 +690,32 @@ axes.calcTicks = function calcTicks(ax, opts) {
ax._prevDateHead = '';
ax._inCalcTicks = true;

var minRange = Math.min(rng[0], rng[1]);
var maxRange = Math.max(rng[0], rng[1]);

var definedDelta;
if(isPeriod && ax.tickformat) {
var _has = function(str) {
return ax.tickformat.indexOf(str) !== -1;
};

if(
!_has('%f') &&
!_has('%H') &&
!_has('%I') &&
!_has('%L') &&
!_has('%Q') &&
!_has('%S') &&
!_has('%s') &&
!_has('%X')
) {
if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
}
}

var removedPreTick0Label = false;
var ticksOut = new Array(tickVals.length);
for(var i = 0; i < tickVals.length; i++) {
var _minor = tickVals[i].minor;
Expand All@@ -692,6 +727,46 @@ axes.calcTicks = function calcTicks(ax, opts) {
false, // hover
_minor // noSuffixPrefix
);

if(isPeriod) {
var v = tickVals[i].value;

var a = i;
var b = i + 1;
if(i < tickVals.length - 1) {
a = i;
b = i + 1;
} else {
a = i - 1;
b = i;
}

var A = tickVals[a].value;
var B = tickVals[b].value;

var delta = definedDelta || Math.abs(B - A);
var half = axrev ? -0.5 : 0.5;
if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
v += half * ONEAVGYEAR;
} else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
v += half * ONEAVGMONTH;
} else if(delta >= ONEDAY) {
v += half * ONEDAY;
}

ticksOut[i].periodX = v;

if(v > maxRange || v < minRange) { // hide label if outside the range
ticksOut[i].text = '';
if(i === 0) removedPreTick0Label = true;
}
}
}

if(removedPreTick0Label && ticksOut.length > 1) {
// redo tick0 text
ax._prevDateHead = '';
ticksOut[1].text = axes.tickText(ax, tickVals[1].value).text;
}

ax._inCalcTicks = false;
Expand DownExpand Up@@ -1785,6 +1860,10 @@ axes.drawOne = function(gd, ax, opts) {
if(!ax.visible) return;

var transFn = axes.makeTransFn(ax);
var transTickLabelFn = ax.ticklabelmode === 'period' ?
axes.makeTransPeriodFn(ax) :
axes.makeTransFn(ax);

var tickVals;
// We remove zero lines, grid lines, and inside ticks if they're within 1px of the end
// The key case here is removing zero lines when the axis bound is zero
Expand DownExpand Up@@ -1903,7 +1982,7 @@ axes.drawOne = function(gd, ax, opts) {
return axes.drawLabels(gd, ax, {
vals: vals,
layer: mainAxLayer,
transFn: transFn,
transFn: transTickLabelFn,
labelFns: axes.makeLabelFns(ax, mainLinePosition)
});
});
Expand DownExpand Up@@ -2213,6 +2292,14 @@ axes.makeTransFn = function(ax) {
function(d) { return 'translate(0,' + (offset + ax.l2p(d.x)) + ')'; };
};

axes.makeTransPeriodFn = function(ax) {
var axLetter = ax._id.charAt(0);
var offset = ax._offset;
return axLetter === 'x' ?
function(d) { return 'translate(' + (offset + ax.l2p(d.periodX)) + ',0)'; } :
function(d) { return 'translate(0,' + (offset + ax.l2p(d.periodX)) + ')'; };
};

/**
* Make axis tick path string
*
Expand DownExpand Up@@ -2511,6 +2598,7 @@ axes.drawLabels = function(gd, ax, opts) {
var axLetter = axId.charAt(0);
var cls = opts.cls || axId + 'tick';
var vals = opts.vals;

var labelFns = opts.labelFns;
var tickAngle = opts.secondary ? 0 : ax.tickangle;
var prevAngle = (ax._prevTickAngles || {})[cls];
Expand Down
2 changes: 2 additions & 0 deletions src/plots/cartesian/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
}

if(axType === 'date') {
if(!options.noTicklabelmode) coerce('ticklabelmode');

handleArrayContainerDefaults(containerIn, containerOut, {
name: 'rangebreaks',
inclusionAttr: 'enabled',
Expand Down
14 changes: 14 additions & 0 deletions src/plots/cartesian/layout_attributes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,20 @@ module.exports = {
'to the left/bottom of labels.'
].join(' ')
},
ticklabelmode: {
valType: 'enumerated',
values: ['instant', 'period'],
dflt: 'instant',
role: 'info',
editType: 'ticks',
description: [
'Determines where tick labels are drawn with respect to their',
'corresponding ticks and grid lines.',
'Only has an effect for axes of `type` *date*',
'When set to *period*, tick labels are drawn in the middle of the period',
'between ticks.'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually not quite the desired behaviour: if the ticks are spaced every 2 months and the labels are Jan and Mar, the Jan label should appear on Jan 15, not on Feb 1.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's an example... https://codepen.io/nicolaskruchten/pen/ZEQRBWw?editors=0010

In "instant" mode we see 4 "month" labels spaced two months apart. In "period" mode we probably should see only 3 labels, but they should remain Jan/Mar/May, and they should be positioned on Jan 15, Mar 15, May 15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a clearer codepen in the original issue

].join(' ')
},
mirror: {
valType: 'enumerated',
values: [true, 'ticks', false, 'all', 'allticks'],
Expand Down
1 change: 1 addition & 0 deletions src/plots/gl3d/layout/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
data: options.data,
showGrid: true,
noTickson: true,
noTicklabelmode: true,
bgColor: options.bgColor,
calendar: options.calendar
},
Expand Down
Binary file addedtest/image/baselines/date_axes_period.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/date_axes_period2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions test/image/mocks/date_axes_period.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
{
"data": [
{
"x": [
"1900-01-01",
"2000-01-01",
"2100-01-01"
],
"y": [1, 3, 2]
},
{
"x": [
"2013-05-01",
"2013-09-01",
"2014-01-01"
],
"y": [1, 3, 2],
"xaxis": "x2",
"yaxis": "y2"
},
{
"x": [
"2013-11-17",
"2013-12-15",
"2014-01-12"
],
"y": [1, 3, 2],
"xaxis": "x3",
"yaxis": "y3"
},
{
"x": [
"2013-01-01",
"2013-01-02",
"2013-01-03"
],
"y": [1, 3, 2],
"xaxis": "x4",
"yaxis": "y4"
},
{
"x": [
"2013-07-01 18:00",
"2013-07-02 00:00",
"2013-07-02 06:00"
],
"y": [1, 3, 2],
"xaxis": "x5",
"yaxis": "y5"
},
{
"x": [
"2013-01-01 23:59",
"2013-01-02 00:00",
"2013-01-02 00:01"
],
"y": [1, 3, 2],
"xaxis": "x6",
"yaxis": "y6"
},
{
"x": [
"2013-07-01 23:59:59",
"2013-07-02 00:00:00",
"2013-07-02 00:00:01"
],
"y": [1, 3, 2],
"xaxis": "x7",
"yaxis": "y7"
}
],
"layout": {
"showlegend": false,
"width": 600,
"height": 500,
"yaxis": {"domain": [0, 0.04]},
"yaxis2": {"domain": [0.16, 0.2]},
"yaxis3": {"domain": [0.32, 0.36]},
"yaxis4": {"domain": [0.48, 0.52]},
"yaxis5": {"domain": [0.64, 0.68]},
"yaxis6": {"domain": [0.80, 0.84]},
"yaxis7": {"domain": [0.96, 1]},
"xaxis": {"ticklabelmode": "period"},
"xaxis2": {"ticklabelmode": "period", "anchor": "y2"},
"xaxis3": {"ticklabelmode": "period", "anchor": "y3"},
"xaxis4": {"ticklabelmode": "period", "anchor": "y4"},
"xaxis5": {"ticklabelmode": "period", "anchor": "y5"},
"xaxis6": {"ticklabelmode": "period", "anchor": "y6"},
"xaxis7": {"ticklabelmode": "period", "anchor": "y7"}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/colorbar/draw.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -706,6 +706,7 @@ function mockColorBarAxis(gd, opts, zrange) {
font: fullLayout.font,
noHover: true,
noTickson: true,
noTicklabelmode: true,
calendar: fullLayout.calendar // not really necessary (yet?)
};

Expand Down
90 changes: 89 additions & 1 deletion src/plots/cartesian/axes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -620,6 +620,15 @@ axes.calcTicks = function calcTicks(ax, opts) {

generateTicks();

var isPeriod = ax.ticklabelmode === 'period';
if(isPeriod) {
// add one label to show pre tick0 period
tickVals.unshift({
minor: false,
value: axes.tickIncrement(tickVals[0].value, ax.dtick, !axrev, ax.caldendar)
});
}

if(ax.rangebreaks) {
// replace ticks inside breaks that would get a tick
// and reduce ticks
Expand DownExpand Up@@ -681,6 +690,32 @@ axes.calcTicks = function calcTicks(ax, opts) {
ax._prevDateHead = '';
ax._inCalcTicks = true;

var minRange = Math.min(rng[0], rng[1]);
var maxRange = Math.max(rng[0], rng[1]);

var definedDelta;
if(isPeriod && ax.tickformat) {
var _has = function(str) {
return ax.tickformat.indexOf(str) !== -1;
};

if(
!_has('%f') &&
!_has('%H') &&
!_has('%I') &&
!_has('%L') &&
!_has('%Q') &&
!_has('%S') &&
!_has('%s') &&
!_has('%X')
) {
if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
}
}

var removedPreTick0Label = false;
var ticksOut = new Array(tickVals.length);
for(var i = 0; i < tickVals.length; i++) {
var _minor = tickVals[i].minor;
Expand All@@ -692,6 +727,46 @@ axes.calcTicks = function calcTicks(ax, opts) {
false, // hover
_minor // noSuffixPrefix
);

if(isPeriod) {
var v = tickVals[i].value;

var a = i;
var b = i + 1;
if(i < tickVals.length - 1) {
a = i;
b = i + 1;
} else {
a = i - 1;
b = i;
}

var A = tickVals[a].value;
var B = tickVals[b].value;

var delta = definedDelta || Math.abs(B - A);
var half = axrev ? -0.5 : 0.5;
if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
v += half * ONEAVGYEAR;
} else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
v += half * ONEAVGMONTH;
} else if(delta >= ONEDAY) {
v += half * ONEDAY;
}

ticksOut[i].periodX = v;

if(v > maxRange || v < minRange) { // hide label if outside the range
ticksOut[i].text = '';
if(i === 0) removedPreTick0Label = true;
}
}
}

if(removedPreTick0Label && ticksOut.length > 1) {
// redo tick0 text
ax._prevDateHead = '';
ticksOut[1].text = axes.tickText(ax, tickVals[1].value).text;
}

ax._inCalcTicks = false;
Expand DownExpand Up@@ -1785,6 +1860,10 @@ axes.drawOne = function(gd, ax, opts) {
if(!ax.visible) return;

var transFn = axes.makeTransFn(ax);
var transTickLabelFn = ax.ticklabelmode === 'period' ?
axes.makeTransPeriodFn(ax) :
axes.makeTransFn(ax);

var tickVals;
// We remove zero lines, grid lines, and inside ticks if they're within 1px of the end
// The key case here is removing zero lines when the axis bound is zero
Expand DownExpand Up@@ -1903,7 +1982,7 @@ axes.drawOne = function(gd, ax, opts) {
return axes.drawLabels(gd, ax, {
vals: vals,
layer: mainAxLayer,
transFn: transFn,
transFn: transTickLabelFn,
labelFns: axes.makeLabelFns(ax, mainLinePosition)
});
});
Expand DownExpand Up@@ -2213,6 +2292,14 @@ axes.makeTransFn = function(ax) {
function(d) { return 'translate(0,' + (offset + ax.l2p(d.x)) + ')'; };
};

axes.makeTransPeriodFn = function(ax) {
var axLetter = ax._id.charAt(0);
var offset = ax._offset;
return axLetter === 'x' ?
function(d) { return 'translate(' + (offset + ax.l2p(d.periodX)) + ',0)'; } :
function(d) { return 'translate(0,' + (offset + ax.l2p(d.periodX)) + ')'; };
};

/**
* Make axis tick path string
*
Expand DownExpand Up@@ -2511,6 +2598,7 @@ axes.drawLabels = function(gd, ax, opts) {
var axLetter = axId.charAt(0);
var cls = opts.cls || axId + 'tick';
var vals = opts.vals;

var labelFns = opts.labelFns;
var tickAngle = opts.secondary ? 0 : ax.tickangle;
var prevAngle = (ax._prevTickAngles || {})[cls];
Expand Down
2 changes: 2 additions & 0 deletions src/plots/cartesian/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
}

if(axType === 'date') {
if(!options.noTicklabelmode) coerce('ticklabelmode');

handleArrayContainerDefaults(containerIn, containerOut, {
name: 'rangebreaks',
inclusionAttr: 'enabled',
Expand Down
14 changes: 14 additions & 0 deletions src/plots/cartesian/layout_attributes.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -478,6 +478,20 @@ module.exports = {
'to the left/bottom of labels.'
].join(' ')
},
ticklabelmode: {
valType: 'enumerated',
values: ['instant', 'period'],
dflt: 'instant',
role: 'info',
editType: 'ticks',
description: [
'Determines where tick labels are drawn with respect to their',
'corresponding ticks and grid lines.',
'Only has an effect for axes of `type` *date*',
'When set to *period*, tick labels are drawn in the middle of the period',
'between ticks.'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually not quite the desired behaviour: if the ticks are spaced every 2 months and the labels are Jan and Mar, the Jan label should appear on Jan 15, not on Feb 1.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's an example... https://codepen.io/nicolaskruchten/pen/ZEQRBWw?editors=0010

In "instant" mode we see 4 "month" labels spaced two months apart. In "period" mode we probably should see only 3 labels, but they should remain Jan/Mar/May, and they should be positioned on Jan 15, Mar 15, May 15

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a clearer codepen in the original issue

].join(' ')
},
mirror: {
valType: 'enumerated',
values: [true, 'ticks', false, 'all', 'allticks'],
Expand Down
1 change: 1 addition & 0 deletions src/plots/gl3d/layout/axis_defaults.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, options) {
data: options.data,
showGrid: true,
noTickson: true,
noTicklabelmode: true,
bgColor: options.bgColor,
calendar: options.calendar
},
Expand Down
Binary file addedtest/image/baselines/date_axes_period.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/date_axes_period2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions test/image/mocks/date_axes_period.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
{
"data": [
{
"x": [
"1900-01-01",
"2000-01-01",
"2100-01-01"
],
"y": [1, 3, 2]
},
{
"x": [
"2013-05-01",
"2013-09-01",
"2014-01-01"
],
"y": [1, 3, 2],
"xaxis": "x2",
"yaxis": "y2"
},
{
"x": [
"2013-11-17",
"2013-12-15",
"2014-01-12"
],
"y": [1, 3, 2],
"xaxis": "x3",
"yaxis": "y3"
},
{
"x": [
"2013-01-01",
"2013-01-02",
"2013-01-03"
],
"y": [1, 3, 2],
"xaxis": "x4",
"yaxis": "y4"
},
{
"x": [
"2013-07-01 18:00",
"2013-07-02 00:00",
"2013-07-02 06:00"
],
"y": [1, 3, 2],
"xaxis": "x5",
"yaxis": "y5"
},
{
"x": [
"2013-01-01 23:59",
"2013-01-02 00:00",
"2013-01-02 00:01"
],
"y": [1, 3, 2],
"xaxis": "x6",
"yaxis": "y6"
},
{
"x": [
"2013-07-01 23:59:59",
"2013-07-02 00:00:00",
"2013-07-02 00:00:01"
],
"y": [1, 3, 2],
"xaxis": "x7",
"yaxis": "y7"
}
],
"layout": {
"showlegend": false,
"width": 600,
"height": 500,
"yaxis": {"domain": [0, 0.04]},
"yaxis2": {"domain": [0.16, 0.2]},
"yaxis3": {"domain": [0.32, 0.36]},
"yaxis4": {"domain": [0.48, 0.52]},
"yaxis5": {"domain": [0.64, 0.68]},
"yaxis6": {"domain": [0.80, 0.84]},
"yaxis7": {"domain": [0.96, 1]},
"xaxis": {"ticklabelmode": "period"},
"xaxis2": {"ticklabelmode": "period", "anchor": "y2"},
"xaxis3": {"ticklabelmode": "period", "anchor": "y3"},
"xaxis4": {"ticklabelmode": "period", "anchor": "y4"},
"xaxis5": {"ticklabelmode": "period", "anchor": "y5"},
"xaxis6": {"ticklabelmode": "period", "anchor": "y6"},
"xaxis7": {"ticklabelmode": "period", "anchor": "y7"}
}
}
Loading