feat: Line averaging, width, and color controls #300
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import { InfoCircleOutlined } from "@ant-design/icons"; | ||
| import { Tooltip } from "antd"; | ||
| import React, { ReactElement, ReactNode, useRef } from "react"; | ||
|
|
||
| type InlineHintProps = { | ||
| title?: ReactNode; | ||
| }; | ||
|
|
||
| /** An icon that can be hovered or focused to show an informational tooltip. */ | ||
| export default function InlineHint(props: InlineHintProps): ReactElement { | ||
| const popupContainerRef = useRef<HTMLDivElement>(null); | ||
|
|
||
| return ( | ||
| <div ref={popupContainerRef}> | ||
| <Tooltip | ||
| trigger={["focus", "hover"]} | ||
| title={props.title} | ||
| getPopupContainer={() => popupContainerRef.current ?? document.body} | ||
| > | ||
| <button | ||
| style={{ | ||
| background: "none", | ||
| border: "none", | ||
| padding: 0, | ||
| margin: 0, | ||
| cursor: "help", | ||
| color: "unset", | ||
| }} | ||
| aria-label="More information" | ||
| > | ||
| <InfoCircleOutlined></InfoCircleOutlined> | ||
| </button> | ||
| </Tooltip> | ||
| </div> | ||
| ); | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| import React, { ReactElement } from "react"; | ||
|
|
||
| import { connect } from "react-redux"; | ||
| import { ActionCreator } from "redux"; | ||
|
|
||
| import { | ||
| SetLineAverageWindowAction, | ||
| SetLineDefaultColorAction, | ||
| SetLineWidthAction, | ||
| } from "../../state/selection/types"; | ||
| import { State } from "../../state/types"; | ||
| import { useDebouncedSetter } from "../../hooks"; | ||
| import LabeledSlider from "../LabeledSlider"; | ||
| import { | ||
| getLineDefaultColor, | ||
| getLineMovingAverageWindow, | ||
| getLineWidth, | ||
| } from "../../state/selection/selectors"; | ||
| import { | ||
| setConnectLineDefaultColor, | ||
| setConnectLineAverageWindow, | ||
| setConnectLineWidth, | ||
| } from "../../state/selection/actions"; | ||
| import ResettableColorPicker from "../ResettableColorPicker"; | ||
| import { GENERAL_PLOT_SETTINGS, PALETTE } from "../../constants"; | ||
| import InlineHint from "../InlineHint"; | ||
|
|
||
| type PropsFromState = { | ||
| lineAverageWindow: number; | ||
| lineWidth: number; | ||
| lineDefaultColor: string; | ||
| }; | ||
|
|
||
| type DispatchProps = { | ||
| handleSetLineAverageWindow: ActionCreator<SetLineAverageWindowAction>; | ||
| handleSetLineWidth: ActionCreator<SetLineWidthAction>; | ||
| handleSetLineDefaultColor: ActionCreator<SetLineDefaultColorAction>; | ||
| }; | ||
|
|
||
| type PlotLineSettingsProps = PropsFromState & | ||
| DispatchProps & { | ||
| labelWidth?: string; | ||
|
Contributor
There was a problem hiding this comment. maybe a comment on what labelWidth is for? (I'm wondering: why is it a string? what label?)
Contributor
Author
There was a problem hiding this comment. Yeah, can do. It's a string because it's intended to take a CSS specifier, e.g. "100px" or "100%". The label is the label for any settings inputs (sliders or numeric inputs) that sits to the left. |
||
| }; | ||
|
|
||
| const PlotLineSettings = (props: PlotLineSettingsProps): ReactElement => { | ||
| const [lineAverageWindow, setLineAverageWindow] = useDebouncedSetter( | ||
| props.lineAverageWindow, | ||
| props.handleSetLineAverageWindow | ||
| ); | ||
| const [lineWidth, setLineWidth] = useDebouncedSetter(props.lineWidth, props.handleSetLineWidth); | ||
| const [lineDefaultColor, setLineDefaultColor] = useDebouncedSetter( | ||
| props.lineDefaultColor, | ||
| props.handleSetLineDefaultColor | ||
| ); | ||
|
|
||
| return ( | ||
| <div style={{ display: "flex", flexDirection: "column", width: "100%" }}> | ||
| <p style={{ fontWeight: 600, marginBottom: 0, color: PALETTE.white }}>Line settings</p> | ||
| <LabeledSlider | ||
| label={ | ||
| <div style={{ display: "flex", flexDirection: "row", gap: "6px" }}> | ||
| Average window | ||
| <InlineHint title="Total number of points to average over, including past and future." /> | ||
| </div> | ||
| } | ||
| id={"line-average-window-input"} | ||
| labelWidth={props.labelWidth} | ||
| sliderProps={{ | ||
| value: lineAverageWindow, | ||
| onChange: setLineAverageWindow, | ||
| min: 1, | ||
| max: 31, | ||
| step: 2, | ||
| }} | ||
| inputMin={1} | ||
| inputMax={101} | ||
|
ShrimpCryptid marked this conversation as resolved.
|
||
| ></LabeledSlider> | ||
| <LabeledSlider | ||
| label="Line width" | ||
| labelWidth={props.labelWidth} | ||
| sliderProps={{ | ||
| value: lineWidth, | ||
| onChange: setLineWidth, | ||
| min: 0.1, | ||
| max: 3.5, | ||
| step: 0.1, | ||
| marks: { 1.5: <></> }, | ||
| tooltip: { | ||
| formatter: (value) => value?.toFixed(1), | ||
| }, | ||
| }} | ||
| inputMin={0} | ||
| inputMax={100} | ||
|
ShrimpCryptid marked this conversation as resolved.
|
||
| ></LabeledSlider> | ||
| <div | ||
| style={{ | ||
| display: "flex", | ||
| flexDirection: "row", | ||
| justifyContent: "flex-start", | ||
| marginTop: "4px", | ||
| }} | ||
| > | ||
| <label style={{ width: props.labelWidth }}>Default color</label> | ||
| <ResettableColorPicker | ||
| value={lineDefaultColor} | ||
| onChange={(color) => { | ||
| setLineDefaultColor(color.toHexString()); | ||
| }} | ||
| size="small" | ||
| onReset={function (): void { | ||
| setLineDefaultColor(GENERAL_PLOT_SETTINGS.connectionLineDefaultColor); | ||
| }} | ||
| ></ResettableColorPicker> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| function mapStateToProps(state: State): PropsFromState { | ||
| return { | ||
| lineAverageWindow: getLineMovingAverageWindow(state), | ||
| lineWidth: getLineWidth(state), | ||
| lineDefaultColor: getLineDefaultColor(state), | ||
| }; | ||
| } | ||
|
|
||
| const dispatchToPropsMap: DispatchProps = { | ||
| handleSetLineAverageWindow: setConnectLineAverageWindow, | ||
| handleSetLineDefaultColor: setConnectLineDefaultColor, | ||
| handleSetLineWidth: setConnectLineWidth, | ||
| }; | ||
| export default connect<PropsFromState, DispatchProps, unknown, State>( | ||
| mapStateToProps, | ||
| dispatchToPropsMap | ||
| )(PlotLineSettings); | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Copied from TFE. Appears as a small hoverable or tab-focusable tooltip.