diff --git a/packages/react-native-web/src/exports/ScrollView/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/ScrollView/__tests__/__snapshots__/index-test.js.snap index 011e9294..fc6fc4e8 100644 --- a/packages/react-native-web/src/exports/ScrollView/__tests__/__snapshots__/index-test.js.snap +++ b/packages/react-native-web/src/exports/ScrollView/__tests__/__snapshots__/index-test.js.snap @@ -2,7 +2,7 @@ exports[`components/ScrollView prop "centerContent" with 1`] = `
{ pointerEvents: 'box-only', start: '12.34%', textAlign: 'start', - transform: [ - { - translateX: 50, - scale: -1 - } - ] + transform: 'translateX(50px) scale(-1)' }); expect(result).toMatchInlineSnapshot(` @@ -61,7 +56,7 @@ describe('StyleSheet/compile', () => { "r-textAlign-fdjqy7", "r-textAlign-1ff274t", ], - "transform": "r-transform-1ehiua4", + "transform": "r-transform-d7xd9i", }, [ [ @@ -165,7 +160,7 @@ describe('StyleSheet/compile', () => { ], [ [ - ".r-transform-1ehiua4{transform:translateX(50px);}", + ".r-transform-d7xd9i{transform:translateX(50px) scale(-1);}", ], 2.2, ], @@ -179,19 +174,14 @@ describe('StyleSheet/compile', () => { test('converts style to classic CSS', () => { const result = classic( { - animationDirection: ['alternate', 'alternate-reverse'], + animationDirection: 'alternate,alternate-reverse', animationKeyframes: [ { '0%': { top: 0 }, '50%': { top: 5 }, '100%': { top: 10 } }, { from: { left: 0 }, to: { left: 10 } } ], marginHorizontal: 10, font: '14px System', - transform: [ - { - translateX: 50, - scale: -1 - } - ] + transform: 'translateX(50px) scale(-1)' }, 'text' ); diff --git a/packages/react-native-web/src/exports/StyleSheet/compiler/createReactDOMStyle.js b/packages/react-native-web/src/exports/StyleSheet/compiler/createReactDOMStyle.js index 0ee748fd..35f9b7c4 100644 --- a/packages/react-native-web/src/exports/StyleSheet/compiler/createReactDOMStyle.js +++ b/packages/react-native-web/src/exports/StyleSheet/compiler/createReactDOMStyle.js @@ -99,6 +99,10 @@ const mapTransform = (transform: Object): string => { export const createTransformValue = (style: Style): string => { let transform = style.transform; if (Array.isArray(style.transform)) { + warnOnce( + 'transform', + '"transform" style array value is deprecated. Use space-separated string functions, e.g., "scaleX(2) rotateX(15deg)".' + ); transform = style.transform.map(mapTransform).join(' '); } return transform; diff --git a/packages/react-native-web/src/exports/Switch/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/Switch/__tests__/__snapshots__/index-test.js.snap index 55cfea6e..4b95f114 100644 --- a/packages/react-native-web/src/exports/Switch/__tests__/__snapshots__/index-test.js.snap +++ b/packages/react-native-web/src/exports/Switch/__tests__/__snapshots__/index-test.js.snap @@ -9,7 +9,7 @@ exports[`components/Switch disabled when "true" and value="false", a disabled ch exports[`components/Switch disabled when "true" and value="false", a disabled checkbox is rendered with provided thumbColor 1`] = `
`; @@ -23,7 +23,7 @@ exports[`components/Switch disabled when "true" and value="false", a disabled ch exports[`components/Switch disabled when "true" and value="true", a disabled checkbox is rendered with provided activeThumbColor 1`] = `
`; diff --git a/packages/react-native-web/src/exports/Switch/index.js b/packages/react-native-web/src/exports/Switch/index.js index 1077c82e..4a900930 100644 --- a/packages/react-native-web/src/exports/Switch/index.js +++ b/packages/react-native-web/src/exports/Switch/index.js @@ -214,7 +214,7 @@ const styles = StyleSheet.create({ borderRadius: '100%', boxShadow: thumbDefaultBoxShadow, start: '0%', - transform: [{ translateZ: 0 }], + transform: 'translateZ(0)', transitionDuration: '0.1s' }, thumbActive: { diff --git a/packages/react-native-web/src/types/styles.js b/packages/react-native-web/src/types/styles.js index cb31a62d..86e2a993 100644 --- a/packages/react-native-web/src/types/styles.js +++ b/packages/react-native-web/src/types/styles.js @@ -270,24 +270,26 @@ export type ShadowStyles = {| export type TransformStyles = {| perspective?: ?NumberOrString, perspectiveOrigin?: ?string, - transform?: Array< - | {| +perspective: NumberOrString |} - | {| +rotate: string |} - | {| +rotateX: string |} - | {| +rotateY: string |} - | {| +rotateZ: string |} - | {| +scale: number |} - | {| +scaleX: number |} - | {| +scaleY: number |} - | {| +scaleZ: number |} - | {| +scale3d: string |} - | {| +skewX: string |} - | {| +skewY: string |} - | {| +translateX: NumberOrString |} - | {| +translateY: NumberOrString |} - | {| +translateZ: NumberOrString |} - | {| +translate3d: string |} - >, + transform?: + | ?string + | Array< + | {| +perspective: NumberOrString |} + | {| +rotate: string |} + | {| +rotateX: string |} + | {| +rotateY: string |} + | {| +rotateZ: string |} + | {| +scale: number |} + | {| +scaleX: number |} + | {| +scaleY: number |} + | {| +scaleZ: number |} + | {| +scale3d: string |} + | {| +skewX: string |} + | {| +skewY: string |} + | {| +translateX: NumberOrString |} + | {| +translateY: NumberOrString |} + | {| +translateZ: NumberOrString |} + | {| +translate3d: string |} + >, transformOrigin?: ?string, transformStyle?: ?('flat' | 'preserve-3d') |};