diff options
| author | Oliver <oliver@mohlin.dev> | 2024-12-03 12:04:44 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-12-03 17:05:09 +0100 |
| commit | dc781b81047e24a41b549db235ba115bb111b412 (patch) | |
| tree | 427f32145ea85507236988d9caef3d5532510d5f /desktop/packages | |
| parent | 2bf40389ee140fbeca4d1db3239c5fec8c998588 (diff) | |
| download | mullvadvpn-dc781b81047e24a41b549db235ba115bb111b412.tar.xz mullvadvpn-dc781b81047e24a41b549db235ba115bb111b412.zip | |
Upgrade styled-components to 6.1.13
Diffstat (limited to 'desktop/packages')
4 files changed, 5 insertions, 6 deletions
diff --git a/desktop/packages/mullvad-vpn/package.json b/desktop/packages/mullvad-vpn/package.json index b67b7e7421..bed03321e8 100644 --- a/desktop/packages/mullvad-vpn/package.json +++ b/desktop/packages/mullvad-vpn/package.json @@ -25,7 +25,7 @@ "redux": "^4.2.0", "simple-plist": "^1.3.1", "sprintf-js": "^1.1.2", - "styled-components": "^6.1.0", + "styled-components": "^6.1.13", "nseventforwarder": "0.0.0" }, "optionalDependencies": { diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/Accordion.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/Accordion.tsx index 27a5be53bc..89c171e99e 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/Accordion.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/Accordion.tsx @@ -3,7 +3,7 @@ import styled from 'styled-components'; interface IProps { expanded: boolean; - animationDuration: number; + animationDuration?: number; children?: React.ReactNode; onWillExpand?: (contentHeight: number) => void; onTransitionEnd?: () => void; @@ -33,7 +33,6 @@ const Content = styled.div({ export default class Accordion extends React.Component<IProps, IState> { public static defaultProps = { expanded: true, - animationDuration: 350, }; public state: IState = { @@ -58,7 +57,7 @@ export default class Accordion extends React.Component<IProps, IState> { ref={this.containerRef} className={this.props.className} $height={this.state.containerHeight} - $animationDuration={this.props.animationDuration} + $animationDuration={this.props.animationDuration ?? 350} onTransitionEnd={this.onTransitionEnd}> <Content ref={this.contentRef}>{this.state.mountChildren && this.props.children}</Content> </Container> diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/Filter.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/Filter.tsx index a0ed1725b1..940563fd87 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/Filter.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/Filter.tsx @@ -214,7 +214,7 @@ function useProviders(): Record<string, boolean> { const StyledSelector = styled(Selector)({ marginBottom: 0, -}); +}) as typeof Selector; interface IFilterByOwnershipProps { ownership: Ownership; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/SelectLanguage.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/SelectLanguage.tsx index 9bbc110fc1..84f572fc5a 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/SelectLanguage.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/SelectLanguage.tsx @@ -21,7 +21,7 @@ import SettingsHeader, { HeaderTitle } from './SettingsHeader'; const StyledSelector = styled(Selector)({ marginBottom: 0, -}); +}) as typeof Selector; export default function SelectLanguage() { const { pop } = useHistory(); |