resolve conflicts

react-component · Feb 5, 2021 · f037fd1 · f037fd1
1 parent 58ec0e6
commit f037fd1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/Image.tsx b/src/Image.tsx
@@ -176,6 +176,9 @@ const ImageInternal: CompoundedComponent<ImageProps> = ({
   // Keep order end
 
   React.useEffect(() => {
+    if (isError) {
+      setStatus('normal');
+    }
     if (isCustomPlaceholder) {
       setStatus('loading');
     }

diff --git a/tests/fallback.test.tsx b/tests/fallback.test.tsx
@@ -58,4 +58,18 @@ describe('Fallback', () => {
 
     expect(onErrorMock).toHaveBeenCalledTimes(1);
   });
+
+  it('should change image, not error', () => {
+    const wrapper = mount(<Image width={200} src="error" fallback='https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png' />);
+    act(() => {
+      wrapper.setProps({
+        src: 'https://gw.alipayobjects.com/mdn/rms_08e378/afts/img/A*NZuwQp_vcIQAAAAAAAAAAABkARQnAQ',
+      });
+      jest.runAllTimers();
+      wrapper.update();
+    });
+    expect(wrapper.find('.rc-image-img').prop('src')).toBe(
+      'https://gw.alipayobjects.com/mdn/rms_08e378/afts/img/A*NZuwQp_vcIQAAAAAAAAAAABkARQnAQ',
+    );
+  });
 });