diff --git a/packages/react-native-web/src/exports/View/__tests__/index-test.js b/packages/react-native-web/src/exports/View/__tests__/index-test.js index 065f966c..f5d51446 100644 --- a/packages/react-native-web/src/exports/View/__tests__/index-test.js +++ b/packages/react-native-web/src/exports/View/__tests__/index-test.js @@ -127,6 +127,19 @@ describe('components/View', () => { expect(ref).toBeCalled(); }); + test('is not called for props changes', () => { + const ref = jest.fn(); + let rerender; + act(() => { + ({ rerender } = render()); + }); + expect(ref).toHaveBeenCalledTimes(1); + act(() => { + rerender(); + }); + expect(ref).toHaveBeenCalledTimes(1); + }); + test('node has imperative methods', () => { const ref = React.createRef(); act(() => { diff --git a/packages/react-native-web/src/exports/View/index.js b/packages/react-native-web/src/exports/View/index.js index a54b743f..7e66bd04 100644 --- a/packages/react-native-web/src/exports/View/index.js +++ b/packages/react-native-web/src/exports/View/index.js @@ -103,12 +103,6 @@ const View = forwardRef((props, forwardedRef) => { const hasTextAncestor = useContext(TextAncestorContext); const hostRef = useRef(null); - const classList = [classes.view]; - const style = StyleSheet.compose( - hasTextAncestor && styles.inline, - props.style - ); - useElementLayout(hostRef, onLayout); useResponderEvents(hostRef, { onMoveShouldSetResponder, @@ -129,6 +123,11 @@ const View = forwardRef((props, forwardedRef) => { onStartShouldSetResponderCapture }); + const style = StyleSheet.compose( + hasTextAncestor && styles.inline, + props.style + ); + const supportedProps = pickProps(props); supportedProps.classList = classList; supportedProps.style = style; @@ -161,6 +160,8 @@ const classes = css.create({ } }); +const classList = [classes.view]; + const styles = StyleSheet.create({ inline: { display: 'inline-flex' diff --git a/packages/react-native-web/src/modules/useMergeRefs/__tests__/index-test.js b/packages/react-native-web/src/modules/useMergeRefs/__tests__/index-test.js index 0c9d7c7f..89c62be8 100644 --- a/packages/react-native-web/src/modules/useMergeRefs/__tests__/index-test.js +++ b/packages/react-native-web/src/modules/useMergeRefs/__tests__/index-test.js @@ -58,7 +58,7 @@ describe('modules/useMergeRefs', () => { expect(nextRef).toHaveBeenCalled(); }); - test.skip('ref is not called for each rerender', () => { + test('ref is not called for each rerender', () => { const ref = jest.fn(); let rerender; @@ -72,7 +72,7 @@ describe('modules/useMergeRefs', () => { expect(ref).toHaveBeenCalledTimes(1); }); - test.skip('ref is not called for props changes', () => { + test('ref is not called for props changes', () => { const ref = jest.fn(); let rerender;