Skip to content

Commit 4f55b63

Browse files
authored
Merge pull request pmndrs#457 from brunolemos/style-flatten
[react-native] Support nested array styles
2 parents f3aca84 + bcc4fa2 commit 4f55b63

File tree

3 files changed

+6
-33
lines changed

3 files changed

+6
-33
lines changed

src/targets/native/AnimatedStyles.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/targets/native/hooks.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ import AnimatedStyle from '../../animated/AnimatedStyle'
77
import createInterpolation from '../../shared/interpolation'
88
import colorNames from '../../shared/colors'
99
import AnimatedTransform from './AnimatedTransform'
10-
import AnimatedStyles from './AnimatedStyles'
1110
import { useSpring } from '../../hooks/useSpring'
1211
import { useTrail } from '../../hooks/useTrail'
1312
import { useTransition } from '../../hooks/useTransition'
1413
import { useKeyframes } from '../../hooks/useKeyframes'
1514
import { useChain } from '../../hooks/useChain'
1615
import { useSprings } from '../../hooks/useSprings'
17-
import { View } from 'react-native'
16+
import { StyleSheet, View } from 'react-native'
1817

1918
Globals.injectDefaultElement(View)
2019
Globals.injectInterpolation(createInterpolation)
@@ -24,8 +23,8 @@ Globals.injectApplyAnimatedValues(
2423
instance.setNativeProps ? instance.setNativeProps(props) : false,
2524
style => ({ ...style, transform: new AnimatedTransform(style.transform) })
2625
)
27-
Globals.injectCreateAnimatedStyle(styles =>
28-
Array.isArray(styles) ? new AnimatedStyles(styles) : new AnimatedStyle(styles)
26+
Globals.injectCreateAnimatedStyle(
27+
styles => new AnimatedStyle(StyleSheet.flatten(styles))
2928
)
3029

3130
export {

src/targets/native/index.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import Keyframes from '../../Keyframes'
1111
import createInterpolation from '../../shared/interpolation'
1212
import colorNames from '../../shared/colors'
1313
import AnimatedTransform from './AnimatedTransform'
14-
import AnimatedStyles from './AnimatedStyles'
15-
import { View } from 'react-native'
14+
import { StyleSheet, View } from 'react-native'
1615

1716
Globals.injectDefaultElement(View)
1817
Globals.injectInterpolation(createInterpolation)
@@ -22,8 +21,8 @@ Globals.injectApplyAnimatedValues(
2221
instance.setNativeProps ? instance.setNativeProps(props) : false,
2322
style => ({ ...style, transform: new AnimatedTransform(style.transform) })
2423
)
25-
Globals.injectCreateAnimatedStyle(styles =>
26-
Array.isArray(styles) ? new AnimatedStyles(styles) : new AnimatedStyle(styles)
24+
Globals.injectCreateAnimatedStyle(
25+
styles => new AnimatedStyle(StyleSheet.flatten(styles))
2726
)
2827

2928
export {

0 commit comments

Comments
 (0)