diff --git a/src/modules/Image/index.js b/src/modules/Image/index.js index e6b0288e..a16f2383 100644 --- a/src/modules/Image/index.js +++ b/src/modules/Image/index.js @@ -7,7 +7,7 @@ class Image extends React.Component { static propTypes = { accessibilityLabel: PropTypes.string, className: PropTypes.string, - source: PropTypes.string, + source: PropTypes.object, style: PropTypes.shape(ImageStylePropTypes) } @@ -28,7 +28,7 @@ class Image extends React.Component { alt={accessibilityLabel} className={`Image ${className}`} component='img' - src={source} + src={source.uri} style={mergedStyle} /> ) diff --git a/src/modules/Image/index.spec.js b/src/modules/Image/index.spec.js index dfeec773..9f4458ba 100644 --- a/src/modules/Image/index.spec.js +++ b/src/modules/Image/index.spec.js @@ -39,11 +39,11 @@ suite('Image', () => { }) test('prop "source"', () => { - const source = 'path-to-image' + const source = { uri: 'path-to-image' } const result = ReactTestUtils.renderIntoDocument() const root = React.findDOMNode(result) - assert.equal(root.getAttribute('src'), source) + assert.equal(root.getAttribute('src'), source.uri) }) test('prop "style"', () => { diff --git a/src/modules/react-native-web-style/modules/restyle.js b/src/modules/react-native-web-style/modules/restyle.js index 5c2e6d8a..e5e33526 100644 --- a/src/modules/react-native-web-style/modules/restyle.js +++ b/src/modules/react-native-web-style/modules/restyle.js @@ -1,5 +1,5 @@ import autoprefix from './autoprefix' -import styles from './styles.css' +import styles from '../../styles' /** * Get the HTML class that corresponds to a style declaration diff --git a/src/modules/styles/index.js b/src/modules/styles/index.js new file mode 100644 index 00000000..b84a2a0b --- /dev/null +++ b/src/modules/styles/index.js @@ -0,0 +1,2 @@ +import styles from './styles.css' +export default styles diff --git a/src/modules/react-native-web-style/modules/styles.css b/src/modules/styles/styles.css similarity index 99% rename from src/modules/react-native-web-style/modules/styles.css rename to src/modules/styles/styles.css index c1105577..ebab49ee 100644 --- a/src/modules/react-native-web-style/modules/styles.css +++ b/src/modules/styles/styles.css @@ -480,6 +480,7 @@ /* order */ +.order--1 { order: -1; } .order-1 { order: 1; } .order-2 { order: 2; } .order-3 { order: 3; } @@ -489,6 +490,8 @@ .order-7 { order: 7; } .order-8 { order: 8; } .order-9 { order: 9; } +.order-10 { order: 10; } +.order-11 { order: 11; } /* overflow */