fix readerSettings ranges to match options-values #2504
Conversation
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
danielweck
requested changes
Aug 2, 2024
| @@ -390,63 +390,65 @@ interface ITable { | |||
|
|
|||
| const Slider = ({ value, option, set }: { value: string, option: ITable, set: (a: Pick<ReaderConfig, "pageMargins" | "wordSpacing" | "letterSpacing" | "paraSpacing" | "lineHeight">) => void }) => { | |||
| const [currentSliderValue, setCurrentSliderValue] = React.useState(option.defaultValue); | |||
| const [currentIndex, setCurrentIndex] = React.useState(() => optionsValues[option.parameter].findIndex((el) => el === option.defaultValue)); | |||
There was a problem hiding this comment.
This would fail at compile time with TypeScript strictNullChecks (or strict) ... which is not yet activated in this project unfortunately.
I would recommend optionsValues[option.parameter] ==> (optionsValues[option.parameter] || []) and also .findIndex((el) => el === option.defaultValue) ==> .findIndex((el) => el === option.defaultValue) || 0
| setCurrentSliderValue(value.replace(/rem/g, "")); | ||
| }, [value]); | ||
| setCurrentSliderValue(value); | ||
| const newIndex = optionsValues[option.parameter].findIndex((el) => el === value); |
There was a problem hiding this comment.
same remark as above regarding sanity-checking optionsValues[option.parameter] for undefined.
| }, [value, option.parameter]); | ||
|
|
||
| const updateValue = (index: number) => { | ||
| const newValue = optionsValues[option.parameter][index]; |
| set({ [option.parameter]: valueToString + (option.rem ? "rem" : "") } as Pick<ReaderConfig, "pageMargins" | "wordSpacing" | "letterSpacing" | "paraSpacing" | "lineHeight">); | ||
| setCurrentIndex((prevIndex) => { | ||
| const newIndex = direction === "out" ? prevIndex - 1 : prevIndex + 1; | ||
| if (newIndex >= 0 && newIndex < optionsValues[option.parameter].length) { |
There was a problem hiding this comment.
Same sanity-check workaround here ... unless we can "guarantee" through the TypeScript type system that option.parameter is within bounds of the optionsValues array range.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #2500