@density/chart-historical-counts
Advanced tools
Comparing version 1.6.0 to 1.6.1
@@ -270,3 +270,3 @@ 'use strict'; | ||
var mouseX = d3.mouse(overlayRect.node())[0]; | ||
overlayGroup.call(_overlayLine2.default, xScale, yScale, domainStart, domainEnd, graphWidth, graphHeight, initialCount, lastEvent, timeZoneLabel, timeZoneOffset, overlayDialogTopBottomMargin, overlayDialogBottomTopMargin, overlayDialogBorderRadius, overlayDialogTopWidth, overlayDialogTopHeight, overlayDialogBottomWidth, overlayDialogBottomHeight, overlayDialogTopIconCenterOffset, overlayDialogTopTextCenterOffset, data, mouseX); | ||
overlayGroup.call(_overlayLine2.default, xScale, yScale, domainStart, domainEnd, graphWidth, graphHeight, initialCount, lastEvent, timeZoneLabel, timeZoneOffset, overlayDialogTopBottomMargin, overlayDialogBottomTopMargin, overlayDialogBorderRadius, overlayDialogTopWidth, overlayDialogTopHeight, overlayDialogBottomWidth, overlayDialogBottomHeight, overlayDialogTopIconCenterOffset, overlayDialogTopTextCenterOffset, data, mouseX, xAxisResolution); | ||
} | ||
@@ -273,0 +273,0 @@ |
@@ -21,3 +21,3 @@ 'use strict'; | ||
function overlayLine(selection, timeScale, countScale, domainStart, domainEnd, graphWidth, graphHeight, initialCount, lastEvent, timeZoneLabel, timeZoneOffset, overlayDialogTopBottomMargin, overlayDialogBottomTopMargin, overlayDialogBorderRadius, overlayDialogTopWidth, overlayDialogTopHeight, overlayDialogBottomWidth, overlayDialogBottomHeight, overlayDialogTopIconCenterOffset, overlayDialogTopTextCenterOffset, data, mouseX) { | ||
function overlayLine(selection, timeScale, countScale, domainStart, domainEnd, graphWidth, graphHeight, initialCount, lastEvent, timeZoneLabel, timeZoneOffset, overlayDialogTopBottomMargin, overlayDialogBottomTopMargin, overlayDialogBorderRadius, overlayDialogTopWidth, overlayDialogTopHeight, overlayDialogBottomWidth, overlayDialogBottomHeight, overlayDialogTopIconCenterOffset, overlayDialogTopTextCenterOffset, data, mouseX, xAxisResolution) { | ||
var now = _moment2.default.utc(); | ||
@@ -117,6 +117,12 @@ | ||
enteringGroup.select('.historical-counts-overlay-bottom-text').text(_moment2.default.utc(timeAtPosition).add(timeZoneOffset, 'hours').format('hh:mm A[' + (timeZoneLabel ? ' (' + timeZoneLabel + ') ' : ' ') + ']ddd MMM DD')); | ||
// Decide how to format the time shown in the lower panel on the hover overlay. | ||
var timeFormat = 'hh:mm A[' + (timeZoneLabel ? ' (' + timeZoneLabel + ') ' : ' ') + ']ddd MMM DD'; | ||
if (xAxisResolution === 'day' || xAxisResolution === 'week') { | ||
timeFormat = 'ddd MM DD'; | ||
} | ||
enteringGroup.select('.historical-counts-overlay-bottom-text').text(_moment2.default.utc(timeAtPosition).add(timeZoneOffset, 'hours').format(timeFormat)); | ||
enteringGroup.select('.historical-counts-overlay-top-text').attr('transform', 'translate(' + overlayDialogTopTextCenterOffset + ',0)').text(countAtPosition); | ||
} | ||
@@ -302,3 +302,3 @@ import './styles.scss'; | ||
overlayDialogTopIconCenterOffset, overlayDialogTopTextCenterOffset, | ||
data, mouseX | ||
data, mouseX, xAxisResolution | ||
); | ||
@@ -305,0 +305,0 @@ } |
@@ -13,3 +13,3 @@ import { bisector } from 'd3'; | ||
overlayDialogTopIconCenterOffset, overlayDialogTopTextCenterOffset, | ||
data, mouseX | ||
data, mouseX, xAxisResolution | ||
) { | ||
@@ -174,4 +174,10 @@ const now = moment.utc(); | ||
// Decide how to format the time shown in the lower panel on the hover overlay. | ||
let timeFormat = `hh:mm A[${timeZoneLabel ? ` (${timeZoneLabel}) ` : ' '}]ddd MMM DD`; | ||
if (xAxisResolution === 'day' || xAxisResolution === 'week') { | ||
timeFormat = `ddd MM DD`; | ||
} | ||
enteringGroup.select('.historical-counts-overlay-bottom-text') | ||
.text(moment.utc(timeAtPosition).add(timeZoneOffset, 'hours').format(`hh:mm A[${timeZoneLabel ? ` (${timeZoneLabel}) ` : ' '}]ddd MMM DD`)); | ||
.text(moment.utc(timeAtPosition).add(timeZoneOffset, 'hours').format(timeFormat)); | ||
@@ -178,0 +184,0 @@ enteringGroup.select('.historical-counts-overlay-top-text') |
{ | ||
"name": "@density/chart-historical-counts", | ||
"version": "1.6.0", | ||
"version": "1.6.1", | ||
"description": "Historical Counts chart", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
645651
2174