This repository has been archived by the owner on Feb 19, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 88
add downsample prop to VictoryZoomContainer #503
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,12 @@ | ||
import PropTypes from "prop-types"; | ||
import React from "react"; | ||
import { defaults, isEqual } from "lodash"; | ||
import { defaults, isEqual, get } from "lodash"; | ||
import ZoomHelpers from "./zoom-helpers"; | ||
import { VictoryContainer, VictoryClipContainer, PropTypes as CustomPropTypes } from "victory-core"; | ||
import { | ||
VictoryContainer, VictoryClipContainer, Data, PropTypes as CustomPropTypes | ||
} from "victory-core"; | ||
|
||
const DEFAULT_DOWNSAMPLE = 150; | ||
|
||
export const zoomContainerMixin = (base) => class VictoryZoomContainer extends base { | ||
static displayName = "VictoryZoomContainer"; | ||
|
@@ -12,6 +16,10 @@ export const zoomContainerMixin = (base) => class VictoryZoomContainer extends b | |
allowZoom: PropTypes.bool, | ||
clipContainerComponent: PropTypes.element.isRequired, | ||
dimension: PropTypes.oneOf(["x", "y"]), | ||
downsample: PropTypes.oneOfType([ | ||
PropTypes.bool, | ||
PropTypes.number | ||
]), | ||
minimumZoom: PropTypes.shape({ | ||
x: PropTypes.number, | ||
y: PropTypes.number | ||
|
@@ -128,6 +136,30 @@ export const zoomContainerMixin = (base) => class VictoryZoomContainer extends b | |
}; | ||
} | ||
|
||
downsampleZoomData(props, childProps, domain) { | ||
const { downsample } = props; | ||
const rawData = get(childProps, "data"); | ||
// return undefined if downsample is not run, then default() will replace with child.props.data | ||
if (!downsample || !rawData || !domain) { return undefined; } | ||
|
||
// if data accessors are not used, skip calling expensive Data.formatData | ||
const data = (childProps.x || childProps.y) ? Data.formatData(rawData, childProps) : rawData; | ||
const maxPoints = (downsample === true) ? DEFAULT_DOWNSAMPLE : downsample; | ||
const dimension = props.dimension || "x"; | ||
|
||
// important: assumes data is ordered by dimension | ||
// get the start and end of the data that is in the current visible domain | ||
let startIndex = data.findIndex((d) => d[dimension] >= domain[dimension][0]); | ||
let endIndex = data.findIndex((d) => d[dimension] > domain[dimension][1]); | ||
// pick one more point (if available) at each end so that VictoryLine, VictoryArea connect | ||
if (startIndex !== 0) { startIndex -= 1; } | ||
if (endIndex !== -1) { endIndex += 1; } | ||
|
||
const visableData = data.slice(startIndex, endIndex); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. NIT: |
||
|
||
return Data.downsampleZoomFriendly(visableData, maxPoints, startIndex); | ||
} | ||
|
||
modifyChildren(props) { | ||
const childComponents = React.Children.toArray(props.children); | ||
|
||
|
@@ -158,7 +190,11 @@ export const zoomContainerMixin = (base) => class VictoryZoomContainer extends b | |
}; | ||
} | ||
return React.cloneElement( | ||
child, defaults({ domain: newDomain }, child.props) | ||
child, | ||
defaults({ | ||
domain: newDomain, | ||
data: this.downsampleZoomData(props, child.props, newDomain) | ||
}, child.props) | ||
); | ||
}); | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can check on the
sortKey
prop