refactor: migrate helpers.options to typescript #10753
Merged
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
luckened
commented
Oct 5, 2022
src/helpers/helpers.options.ts
Outdated
| @@ -120,7 +126,7 @@ export function toFont(options, fallback) { | |||
| let style = valueOrDefault(options.style, fallback.style); | |||
| if (style && !('' + style).match(FONT_STYLE)) { | |||
| console.warn('Invalid font style specified: "' + style + '"'); | |||
| style = ''; | |||
| style = 'inherit'; | |||
There was a problem hiding this comment.
not sure about this one
There was a problem hiding this comment.
try to restore it, or try undefined
Suggested change
| style = 'inherit'; | |
| style = undefined; |
maybe this will fix tests
There was a problem hiding this comment.
empty string wont work, tried undefined but ubuntu test is still broken
|
@etimberg another one |
LeeLenaleee
reviewed
Oct 6, 2022
dangreen
suggested changes
Oct 11, 2022
luckened
force-pushed
the
tsmigration
branch
3 times, most recently
from
cbe29c6 to
a8f5642
Compare
luckened
commented
Oct 15, 2022
luckened
force-pushed
the
tsmigration
branch
3 times, most recently
from
46ea8ec to
568749c
Compare
dangreen
reviewed
Oct 19, 2022
src/helpers/helpers.options.ts
Outdated
Comment on lines
99
to
107
| const obj: ChartArea = { | ||
| ...toTRBL(value), | ||
| width: 0, | ||
| height: 0, | ||
| top: 0, | ||
| left: 0, | ||
| right: 0, | ||
| bottom: 0 | ||
| }; |
There was a problem hiding this comment.
problem is here
Suggested change
| const obj: ChartArea = { | |
| ...toTRBL(value), | |
| width: 0, | |
| height: 0, | |
| top: 0, | |
| left: 0, | |
| right: 0, | |
| bottom: 0 | |
| }; | |
| const obj: ChartArea = { | |
| ...toTRBL(value), | |
| width: 0, | |
| height: 0 | |
| }; |
etimberg
previously approved these changes
Oct 19, 2022
dangreen
previously approved these changes
Oct 19, 2022
src/helpers/helpers.options.ts
Outdated
Comment on lines
7
to
8
| const LINE_HEIGHT = new RegExp(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/); | ||
| const FONT_STYLE = new RegExp(/^(normal|italic|initial|inherit|unset|(oblique( -?[0-9]?[0-9]deg)?))$/); |
There was a problem hiding this comment.
nit
Suggested change
| const LINE_HEIGHT = new RegExp(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/); | |
| const FONT_STYLE = new RegExp(/^(normal|italic|initial|inherit|unset|(oblique( -?[0-9]?[0-9]deg)?))$/); | |
| const LINE_HEIGHT = /^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/; | |
| const FONT_STYLE = /^(normal|italic|initial|inherit|unset|(oblique( -?[0-9]?[0-9]deg)?))$/; |
etimberg
previously approved these changes
Oct 20, 2022
dangreen
previously approved these changes
Oct 31, 2022
LeeLenaleee
previously approved these changes
Oct 31, 2022
|
@luckened for the nits do you want to address them in this PR or a followup? |
dangreen
reviewed
Nov 1, 2022
src/helpers/helpers.options.ts
Outdated
| } | ||
|
|
||
| return size * value; | ||
| } | ||
|
|
||
| const numberOrZero = v => +v || 0; | ||
| const numberOrZero = (v: number) => +v || 0; |
There was a problem hiding this comment.
Suggested change
| const numberOrZero = (v: number) => +v || 0; | |
| const numberOrZero = (v: unknown) => +v || 0; |
src/helpers/helpers.options.ts
Outdated
| export function toPadding(value) { | ||
| const obj = toTRBL(value); | ||
| export function toPadding(value?: number | TRBL): ChartArea { | ||
| const obj: ChartArea = {...toTRBL(value), width: 0, height: 0}; |
There was a problem hiding this comment.
Suggested change
| const obj: ChartArea = {...toTRBL(value), width: 0, height: 0}; | |
| const obj = toTRBL(value) as ChartArea; |
luckened
dismissed stale reviews from LeeLenaleee, kurkle, dangreen, and etimberg
via
a5e1d42
|
@etimberg commited the nits, better to do them right away |
kurkle
approved these changes
Nov 3, 2022
LeeLenaleee
approved these changes
Nov 3, 2022
dangreen
approved these changes
Nov 4, 2022
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.
Refactor
src/helpers/helpers.options.jsto typescript and apply required changes