Skip to content

Commit a2661c3

Browse files
authored
fix Date equality in axis (#2642)
1 parent c9991c7 commit a2661c3

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

.changeset/proud-ravens-retire.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"victory-axis": patch
3+
"victory": patch
4+
---
5+
6+
Fix Date equality in axis

packages/victory-axis/src/helper-methods.tsx

+11-5
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,13 @@ const getStandaloneOffset = (props, calculatedValues) => {
257257
};
258258
};
259259

260+
const isEqual = (a, b) => {
261+
if (a instanceof Date && b instanceof Date) {
262+
return a.getTime() === b.getTime();
263+
}
264+
return a === b;
265+
};
266+
260267
// eslint-disable-next-line complexity
261268
const getOffset = (props, calculatedValues) => {
262269
const { scale, origin, orientation, orientations, domain, padding } =
@@ -285,15 +292,14 @@ const getOffset = (props, calculatedValues) => {
285292
};
286293
const originPosition = {
287294
x:
288-
origin.x === domain.x[0] || origin.x === domain.x[1]
295+
isEqual(origin.x, domain.x[0]) || isEqual(origin.x, domain.x[1])
289296
? 0
290297
: scale.x(origin.x),
291298
y:
292-
origin.y === domain.y[0] || origin.y === domain.y[1]
299+
isEqual(origin.y, domain.y[0]) || isEqual(origin.y, domain.y[1])
293300
? 0
294301
: scale.y(origin.y),
295302
};
296-
297303
const x = originPosition.x
298304
? Math.abs(originOffset.x - originPosition.x)
299305
: orientationOffset.x;
@@ -337,11 +343,11 @@ const getHorizontalOffset = (props, calculatedValues) => {
337343
};
338344
const originPosition = {
339345
x:
340-
origin.x === domain.x[0] || origin.x === domain.x[1]
346+
isEqual(origin.x, domain.x[0]) || isEqual(origin.x, domain.x[1])
341347
? 0
342348
: scale.x(origin.x),
343349
y:
344-
origin.y === domain.y[0] || origin.y === domain.y[1]
350+
isEqual(origin.y, domain.y[0]) || isEqual(origin.y, domain.y[1])
345351
? 0
346352
: scale.y(origin.y),
347353
};

0 commit comments

Comments
 (0)