Skip to content

Commit f19e346

Browse files
benjamin_vialatouFabilin
authored andcommitted
fixes storybook tests
1 parent e0e51e3 commit f19e346

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"build-storybook": "build-storybook",
1313
"build": "rollup -c --environment BUILD:production",
1414
"watch-build": "rollup -w -c --environment BUILD:production",
15-
"lint": "eslint 'src/**/*.{js,ts,tsx}' --fix --quiet",
15+
"lint": "eslint src/**/*.{js,ts,tsx} --fix --quiet",
1616
"prepare": "rollup -c --environment BUILD:production",
1717
"version": "auto-changelog -p && git add CHANGELOG.md",
1818
"test": "echo 'Tests coming soon ...'",

src/components/Card/Card.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import React, {
77
import { prop } from 'styled-tools';
88

99
import { Button } from '../../TockContext';
10-
import 'styles/theme';
10+
import '../../styles/theme';
1111

1212
export const CardOuter: StyledComponent<DetailedHTMLProps<
1313
HTMLAttributes<HTMLLIElement>,

src/components/Carousel/Carousel.tsx

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import styled, { StyledComponent } from '@emotion/styled';
22
import React, { DetailedHTMLProps, HTMLAttributes, ReactElement } from 'react';
33
import { ArrowLeftCircle, ArrowRightCircle } from 'react-feather';
4-
import { opacify } from 'polished';
54
import { prop } from 'styled-tools';
65
import { useTheme } from '@emotion/react';
76
import useCarousel from './hooks/useCarousel';
87
import useArrowVisibility from './hooks/useArrowVisibility';
98
import TockAccessibility from 'TockAccessibility';
9+
import TockTheme from '../../styles/theme';
1010

1111
const ButtonContainer: StyledComponent<DetailedHTMLProps<
1212
HTMLAttributes<HTMLLIElement>,
@@ -33,13 +33,13 @@ const ItemContainer: StyledComponent<DetailedHTMLProps<
3333
display: none;
3434
}
3535
scrollbar-width: none;
36-
${prop<any>('theme.overrides.carouselContainer', '')}
36+
${prop('theme.overrides.carouselContainer', '')}
3737
3838
& > li, & > * {
3939
margin-left: 1em;
4040
margin-right: 1em;
4141
42-
${prop<any>('theme.overrides.carouselItem', '')}
42+
${prop('theme.overrides.carouselItem', '')}
4343
}
4444
`;
4545

@@ -53,7 +53,7 @@ const Previous: StyledComponent<DetailedHTMLProps<
5353
top: 0;
5454
bottom: 0;
5555
padding: 1em;
56-
background: ${(props) => opacify(-0.8, props.theme.palette.background.bot)};
56+
background: opacify(-0.8, ${prop('props.theme.palette.background.bot')});
5757
border: none;
5858
width: 4em;
5959
height: 4em;
@@ -63,17 +63,17 @@ const Previous: StyledComponent<DetailedHTMLProps<
6363
z-index: 5;
6464
6565
& svg {
66-
stroke: ${prop<any>('theme.palette.background.bot')};
66+
stroke: ${prop('theme.palette.background.bot')};
6767
}
6868
6969
&:hover,
7070
&:focus {
7171
svg {
72-
stroke: ${prop<any>('theme.palette.text.bot')};
72+
stroke: ${prop('theme.palette.text.bot')};
7373
}
7474
}
7575
76-
${prop<any>('theme.overrides.carouselArrow', '')};
76+
${prop('theme.overrides.carouselArrow', '')};
7777
`;
7878

7979
const Next: StyledComponent<DetailedHTMLProps<
@@ -86,7 +86,7 @@ const Next: StyledComponent<DetailedHTMLProps<
8686
top: 0;
8787
bottom: 0;
8888
padding: 1em;
89-
background: ${(props) => opacify(-0.8, props.theme.palette.background.bot)};
89+
background: opacify(-0.8, ${prop('props.theme.palette.background.bot')});
9090
border: none;
9191
width: 4em;
9292
height: 4em;
@@ -96,17 +96,17 @@ const Next: StyledComponent<DetailedHTMLProps<
9696
z-index: 5;
9797
9898
& svg {
99-
stroke: ${prop<any>('theme.palette.background.bot')};
99+
stroke: ${prop('theme.palette.background.bot')};
100100
}
101101
102102
&:hover,
103103
&:focus {
104104
svg {
105-
stroke: ${prop<any>('theme.palette.text.bot')};
105+
stroke: ${prop('theme.palette.text.bot')};
106106
}
107107
}
108108
109-
${prop<any>('theme.overrides.carouselArrow', '')};
109+
${prop('theme.overrides.carouselArrow', '')};
110110
`;
111111

112112
const Carousel: (props: {
@@ -119,7 +119,8 @@ const Carousel: (props: {
119119
children?: ReactElement[];
120120
accessibility?: TockAccessibility;
121121
}) => {
122-
const theme: TockTheme = useTheme<TockTheme>();
122+
const theme: TockTheme = useTheme();
123+
123124
const [ref, previous, next] = useCarousel<HTMLUListElement>(children?.length);
124125
const [leftVisible, rightVisible] = useArrowVisibility(
125126
ref.container,

src/components/Conversation/Conversation.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import InlineQuickReplyList from '../InlineQuickReplyList';
1313
import useIntervalCounter from './hooks/useIntervalCounter';
1414
import useScrollBehaviour from './hooks/useScrollBehaviour';
1515
import { useTheme } from '@emotion/react';
16-
import 'styles/theme';
17-
import TockTheme from 'styles/theme';
16+
import '../../styles/theme';
17+
import TockTheme from '../../styles/theme';
1818

1919
import type {
2020
Button,

src/components/Image/Image.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import React, {
55
ImgHTMLAttributes,
66
} from 'react';
77
import { prop } from 'styled-tools';
8-
import 'styles/theme';
8+
import '../../styles/theme';
99

1010
export const CardOuter: StyledComponent<DetailedHTMLProps<
1111
HTMLAttributes<HTMLLIElement>,

src/components/InlineQuickReplyList/InlineQuickReplyList.tsx

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import { ArrowLeftCircle, ArrowRightCircle } from 'react-feather';
33
import styled, { StyledComponent } from '@emotion/styled';
44
import { prop } from 'styled-tools';
55
import { useTheme } from '@emotion/react';
6-
import 'styles/theme';
7-
import TockTheme from 'styles/theme';
8-
import { opacify } from 'polished';
6+
import '../../styles/theme';
7+
import TockTheme from '../../styles/theme';
98
import { Button } from '../../TockContext';
109
import useCarouselQuickReply from './hooks/useCarouselQuickReply';
1110
import useArrowVisibility from '../Carousel/hooks/useArrowVisibility';
@@ -45,7 +44,7 @@ const Previous: StyledComponent<DetailedHTMLProps<
4544
top: 0;
4645
bottom: 0;
4746
padding: 1em;
48-
background: ${(props) => opacify(-0.8, props.theme.palette.background.bot)};
47+
background: opacify(-0.8, ${prop('props.theme.palette.background.bot')});
4948
border: none;
5049
width: 3em;
5150
height: 3em;
@@ -55,17 +54,17 @@ const Previous: StyledComponent<DetailedHTMLProps<
5554
z-index: 5;
5655
5756
& svg {
58-
stroke: ${prop<any>('theme.palette.background.bot')};
57+
stroke: ${prop('theme.palette.background.bot')};
5958
}
6059
6160
&:hover,
6261
&:focus {
6362
svg {
64-
stroke: ${prop<any>('theme.palette.text.bot')};
63+
stroke: ${prop('theme.palette.text.bot')};
6564
}
6665
}
6766
68-
${prop<any>('theme.overrides.quickReplyArrow', '')};
67+
${prop('theme.overrides.quickReplyArrow', '')};
6968
`;
7069

7170
const Next: StyledComponent<DetailedHTMLProps<
@@ -78,7 +77,7 @@ const Next: StyledComponent<DetailedHTMLProps<
7877
top: 0;
7978
bottom: 0;
8079
padding: 1em;
81-
background: ${(props) => opacify(-0.8, props.theme.palette.background.bot)};
80+
background: opacify(-0.8, ${prop('props.theme.palette.background.bot')});
8281
border: none;
8382
width: 3em;
8483
height: 3em;
@@ -88,17 +87,17 @@ const Next: StyledComponent<DetailedHTMLProps<
8887
z-index: 5;
8988
9089
& svg {
91-
stroke: ${prop<any>('theme.palette.background.bot')};
90+
stroke: ${prop('theme.palette.background.bot')};
9291
}
9392
9493
&:hover,
9594
&:focus {
9695
svg {
97-
stroke: ${prop<any>('theme.palette.text.bot')};
96+
stroke: ${prop('theme.palette.text.bot')};
9897
}
9998
}
10099
101-
${prop<any>('theme.overrides.quickReplyArrow', '')};
100+
${prop('theme.overrides.quickReplyArrow', '')};
102101
`;
103102

104103
const InlineQuickReplyListOuterContainer: StyledComponent<DetailedHTMLProps<

src/components/MessageBot/MessageBot.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { prop } from 'styled-tools';
77
import { Button, TextMessage } from '../../TockContext';
88
import QuickReplyList from '../QuickReplyList';
99

10-
import 'styles/theme';
10+
import '../../styles/theme';
1111

1212
export const MessageContainer: StyledComponent<{}> = styled.li`
1313
width: 100%;

src/components/QuickReplyList/QuickReplyList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { prop } from 'styled-tools';
44

55
import { Button } from '../../TockContext';
66
import QuickReply from '../QuickReply/QuickReply';
7-
import 'styles/theme';
7+
import '../../styles/theme';
88

99
const QuickReplyListContainer: StyledComponent<DetailedHTMLProps<
1010
HTMLAttributes<HTMLUListElement>,

src/styles/tockThemeProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import TockTheme from './theme';
55
import { default as createTheme } from './createTheme';
66

77
export default function TockThemeProvider<Theme>(
8-
props: ThemeProviderProps<Theme>,
8+
props: ThemeProviderProps,
99
): React.ReactElement {
1010
const theme = props.theme as TockTheme;
1111
if (!theme.overrides) {
1212
console.warn(
1313
'[Theme deprecated] You seem providing a deprecated theme.\n Since version 20.3.4 you must provide a theme build by using "createTheme" function and the new TockTheme interface.',
1414
);
1515
return ThemeProvider(
16-
deepmerge<ThemeProviderProps<Theme>>(
16+
deepmerge<ThemeProviderProps>(
1717
{ theme: createTheme({}) as Partial<Theme> },
1818
{ ...props },
1919
),

0 commit comments

Comments
 (0)