diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-08-14 12:24:25 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-08-14 12:24:25 +0200 |
| commit | faf933331f93e1a8d771babb31f3ac37a2f9851f (patch) | |
| tree | 55986fad4cbea6a1ca9f74d18057c536f061963e /gui/src | |
| parent | 3da9780d3cc5dd14df6f4142818b989aa0a4e2c9 (diff) | |
| parent | b3394f1bc3694c0d3dfffac8330fc7c5b131cedf (diff) | |
| download | mullvadvpn-faf933331f93e1a8d771babb31f3ac37a2f9851f.tar.xz mullvadvpn-faf933331f93e1a8d771babb31f3ac37a2f9851f.zip | |
Merge branch 'upgrade-to-typescript-3.9.7' into master
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/components/TransitionContainer.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/src/renderer/components/TransitionContainer.tsx b/gui/src/renderer/components/TransitionContainer.tsx index 9f7056888a..7cb95d38a3 100644 --- a/gui/src/renderer/components/TransitionContainer.tsx +++ b/gui/src/renderer/components/TransitionContainer.tsx @@ -21,8 +21,8 @@ interface IState { currentItem?: ITransitionQueueItem; nextItem?: ITransitionQueueItem; itemQueue: ITransitionQueueItem[]; - currentItemStyle?: Array<Types.StyleRuleSet<Types.AnimatedViewStyle>>; - nextItemStyle?: Array<Types.StyleRuleSet<Types.AnimatedViewStyle>>; + currentItemStyle?: Array<Types.StyleRuleSet<Types.AnimatedViewStyle | Types.ViewStyle>>; + nextItemStyle?: Array<Types.StyleRuleSet<Types.AnimatedViewStyle | Types.ViewStyle>>; } const styles = { |