Skip to content

Commit 5c7740a

Browse files
committed
fix: ts check
1 parent db90fbc commit 5c7740a

File tree

11 files changed

+19
-33
lines changed

11 files changed

+19
-33
lines changed

packages/blade/src/components/BladeProvider/__tests__/bladeLightTheme/bladeLightTheme.native.ts

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,13 @@ const bladeLightTheme: Theme = {
1313
motion: {
1414
...bladeTheme.motion,
1515
easing: {
16-
standard: {
17-
attentive: Easing.bezier(0.5, 0, 0.3, 1.5),
18-
effective: Easing.bezier(0.3, 0, 0.2, 1),
19-
revealing: Easing.bezier(0.5, 0, 0, 1),
20-
wary: Easing.bezier(1, 0.5, 0, 0.5),
21-
},
22-
entrance: {
23-
attentive: Easing.bezier(0.5, 0, 0.3, 1.5),
24-
effective: Easing.bezier(0, 0, 0.2, 1),
25-
revealing: Easing.bezier(0, 0, 0, 1),
26-
},
27-
exit: {
28-
attentive: Easing.bezier(0.7, 0, 0.5, 1),
29-
effective: Easing.bezier(0.17, 0, 1, 1),
30-
revealing: Easing.bezier(0.5, 0, 1, 1),
31-
},
16+
linear: Easing.bezier(0, 0, 0, 0),
17+
entrance: Easing.bezier(0, 0, 0.2, 1),
18+
exit: Easing.bezier(0.17, 0, 1, 1),
19+
standard: Easing.bezier(0.3, 0, 0.2, 1),
20+
emphasized: Easing.bezier(0.5, 0, 0, 1),
21+
overshoot: Easing.bezier(0.5, 0, 0.3, 1.5),
22+
shake: Easing.bezier(1, 0.5, 0, 0.5),
3223
},
3324
},
3425
};

packages/blade/src/components/Button/BaseButton/BaseButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ const getProps = ({
257257
borderWidth: variant == 'secondary' ? makeBorderSize(theme.border.width.thin) : '0px',
258258
borderRadius: makeBorderSize(theme.border.radius.medium),
259259
motionDuration: 'duration.xquick',
260-
motionEasing: 'easing.standard.effective',
260+
motionEasing: 'easing.standard',
261261
};
262262

263263
if (isDisabled) {

packages/blade/src/components/Carousel/NavigationButton/getNavigationButtonStyles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const getNavigationButtonStyles = (props: {
6666
: {
6767
transitionProperty: 'color, box-shadow',
6868
transitionDuration: castWebType(makeMotionTime(motionToken.duration.xquick)),
69-
transitionTimingFunction: castWebType(motionToken.easing.standard.effective),
69+
transitionTimingFunction: castWebType(motionToken.easing.standard),
7070
boxShadow: variant === 'filled' ? castWebType(theme.elevation.midRaised) : undefined,
7171

7272
'&:hover': {

packages/blade/src/components/Chip/chipTokens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ const chipTextSizes = {
195195

196196
const chipMotionTokens: Record<'duration' | 'easing', DurationString | EasingString> = {
197197
duration: 'duration.xquick',
198-
easing: 'easing.standard.effective',
198+
easing: 'easing.standard',
199199
};
200200

201201
export {

packages/blade/src/components/FileUpload/fileUploadTokens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const getFileUploadInputHoverTokens = (): SelectorInputHoverTokens => {
2020

2121
const fileUploadMotionTokens: Record<'duration' | 'easing', DurationString | EasingString> = {
2222
duration: 'duration.2xquick',
23-
easing: 'easing.standard.effective',
23+
easing: 'easing.standard',
2424
};
2525

2626
const fileUploadHeightTokens = {

packages/blade/src/components/Input/BaseInput/baseInputTokens.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ export const baseInputBorderWidth = {
6464
} as const;
6565

6666
export const baseInputBorderBackgroundMotion = {
67-
enter: { duration: 'xgentle', easing: 'standard.revealing' },
68-
exit: { duration: 'gentle', easing: 'standard.effective' },
67+
enter: { duration: 'xgentle', easing: 'emphasized' },
68+
exit: { duration: 'gentle', easing: 'standard' },
6969
} as const;
7070

7171
export const baseInputPaddingTokens = {

packages/blade/src/components/Link/BaseLink/BaseLink.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ const getProps = ({
246246
}) as BaseTextProps['color'],
247247
focusRingColor: getIn(theme.colors, 'interactive.background.primary.faded'),
248248
motionDuration: 'duration.2xquick',
249-
motionEasing: 'easing.standard.effective',
249+
motionEasing: 'easing.standard',
250250
cursor: isButton && isDisabled ? 'not-allowed' : 'pointer',
251251
disabled: isButton && isDisabled,
252252
role: isButton ? 'button' : 'link',

packages/blade/src/components/ProgressBar/ProgressBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ const ProgressBar = ({
248248
pulseMotionDuration="duration.2xgentle"
249249
fillMotionDuration="duration.2xgentle"
250250
pulseMotionDelay="delay.long"
251-
motionEasing="easing.standard.revealing"
251+
motionEasing="easing.emphasized"
252252
/>
253253
) : (
254254
<BaseBox
@@ -264,7 +264,7 @@ const ProgressBar = ({
264264
pulseMotionDuration="duration.2xgentle"
265265
indeterminateMotionDuration="duration.2xgentle"
266266
pulseMotionDelay="delay.long"
267-
motionEasing="easing.standard.revealing"
267+
motionEasing="easing.emphasized"
268268
type={progressType}
269269
isIndeterminate={isIndeterminate}
270270
/>

packages/blade/src/components/Spinner/BaseSpinner/spinnerTokens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const motion: {
1111
easing: EasingString;
1212
} = {
1313
duration: 'duration.2xgentle',
14-
easing: 'easing.standard.attentive',
14+
easing: 'easing.overshoot', // TODO: confirm
1515
};
1616

1717
export { dimensions, motion };

packages/blade/src/tokens/global/motion.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ type Duration = {
2121
};
2222

2323
type Delay = {
24-
// TODO: confirm naming and values with RK once
25-
/** `70` milliseconds */
26-
// '2xshort': 70;
27-
// /** `120` milliseconds */
28-
// xshort: 120;
2924
/** `160` milliseconds */
3025
xquick: 160;
3126
/** `280` milliseconds */

packages/blade/src/utils/makeMotionTime/makeMotionTime.native.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('makeMotionTime', () => {
88
});
99

1010
it('should return the delay value in `number`', () => {
11-
const delay = makeMotionTime(motion.delay.short);
12-
expect(delay).toEqual(180);
11+
const delay = makeMotionTime(motion.delay.xquick);
12+
expect(delay).toEqual(160);
1313
});
1414
});

0 commit comments

Comments
 (0)