diff --git a/packages/react-native-web/src/modules/mergeRefs/__tests__/index-test.js b/packages/react-native-web/src/modules/mergeRefs/__tests__/index-test.js
index 6b11d96e..645ab2ce 100644
--- a/packages/react-native-web/src/modules/mergeRefs/__tests__/index-test.js
+++ b/packages/react-native-web/src/modules/mergeRefs/__tests__/index-test.js
@@ -24,8 +24,8 @@ describe('modules/mergeRefs', () => {
render();
- expect(ref.current).not.toBe(null);
- expect(hookRef.current).not.toBe(null);
- expect(functionRefValue).not.toBe(null);
+ expect(ref.current).toBeInstanceOf(HTMLDivElement);
+ expect(hookRef.current).toBeInstanceOf(HTMLDivElement);
+ expect(functionRefValue).toBeInstanceOf(HTMLDivElement);
});
});
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 61024a90..0c9d7c7f 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
@@ -18,28 +18,29 @@ describe('modules/useMergeRefs', () => {
afterEach(cleanup);
- it('handles no refs', () => {
+ test('handles no refs', () => {
act(() => {
render();
});
});
test('merges any number of varying refs', () => {
- const callbackRefs = Array(10).map(() => jest.fn());
- const objectRefs = Array(10).map(() => ({ current: null }));
- const nullRefs = Array(10).map(() => null);
+ const callbackRef1 = jest.fn();
+ const callbackRef2 = jest.fn();
+ const objectRef1 = React.createRef();
+ const objectRef2 = React.createRef();
+ const nullRef = null;
act(() => {
- render();
+ render(
+
+ );
});
- callbackRefs.forEach(ref => {
- expect(ref).toHaveBeenCalledTimes(1);
- });
-
- objectRefs.forEach(ref => {
- expect(ref.current).toBeInstanceOf(HTMLButtonElement);
- });
+ expect(callbackRef1).toHaveBeenCalledTimes(1);
+ expect(callbackRef2).toHaveBeenCalledTimes(1);
+ expect(objectRef1.current).toBeInstanceOf(HTMLDivElement);
+ expect(objectRef2.current).toBeInstanceOf(HTMLDivElement);
});
test('ref is called when ref changes', () => {
@@ -57,7 +58,7 @@ describe('modules/useMergeRefs', () => {
expect(nextRef).toHaveBeenCalled();
});
- test('ref is not called for each rerender', () => {
+ test.skip('ref is not called for each rerender', () => {
const ref = jest.fn();
let rerender;
@@ -71,7 +72,7 @@ describe('modules/useMergeRefs', () => {
expect(ref).toHaveBeenCalledTimes(1);
});
- test('ref is not called for props changes', () => {
+ test.skip('ref is not called for props changes', () => {
const ref = jest.fn();
let rerender;
diff --git a/packages/react-native-web/src/modules/useMergeRefs/index.js b/packages/react-native-web/src/modules/useMergeRefs/index.js
index c17dd053..73d8d94a 100644
--- a/packages/react-native-web/src/modules/useMergeRefs/index.js
+++ b/packages/react-native-web/src/modules/useMergeRefs/index.js
@@ -11,11 +11,6 @@ import * as React from 'react';
import mergeRefs from '../mergeRefs';
export default function useMergeRefs(...args: $ReadOnlyArray>) {
- return React.useMemo(
- () => mergeRefs(...args),
- // Disable linter because args is always an array, and it is spread as
- // arguments to mergeRefs correctly
- // eslint-disable-next-line
- [...args]
- );
+ // TODO(memoize) #1755
+ return /*React.useMemo(() => */ mergeRefs(...args) /*, [args])*/;
}