fix: Inconsistent use of accents in Safari react-component#16

blacktail · Jul 18, 2022 · 61a4ee9 · 61a4ee9
1 parent 12dc37f
commit 61a4ee9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/ResizableTextArea.tsx b/src/ResizableTextArea.tsx
@@ -1,10 +1,10 @@
-import * as React from 'react';
+import classNames from 'classnames';
 import ResizeObserver from 'rc-resize-observer';
 import omit from 'rc-util/lib/omit';
-import classNames from 'classnames';
-import calculateNodeHeight from './calculateNodeHeight';
-import type { TextAreaProps } from '.';
+import * as React from 'react';
 import shallowEqual from 'shallowequal';
+import type { TextAreaProps } from '.';
+import calculateNodeHeight from './calculateNodeHeight';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 enum RESIZE_STATUS {
@@ -109,7 +109,10 @@ class ResizableTextArea extends React.Component<TextAreaProps, TextAreaState> {
   // https://github.com/ant-design/ant-design/issues/21870
   fixFirefoxAutoScroll() {
     try {
-      if (document.activeElement === this.textArea) {
+      if (
+        navigator.userAgent.includes('Firefox') &&
+        document.activeElement === this.textArea
+      ) {
         const currentStart = this.textArea.selectionStart;
         const currentEnd = this.textArea.selectionEnd;
         this.textArea.setSelectionRange(currentStart, currentEnd);

diff --git a/tests/index.spec.js b/tests/index.spec.js
@@ -1,13 +1,18 @@
-import React from 'react';
 import { mount } from 'enzyme';
 import TextArea from '../src';
-import { focusTest, sleep } from './utils';
 import calculateNodeHeight, {
   calculateNodeStyling,
 } from '../src/calculateNodeHeight';
+import { focusTest, sleep } from './utils';
 
 focusTest(TextArea);
 
+let userAgentGetter;
+
+beforeEach(() => {
+  userAgentGetter = jest.spyOn(window.navigator, 'userAgent', 'get');
+});
+
 describe('TextArea', () => {
   const originalGetComputedStyle = window.getComputedStyle;
   beforeAll(() => {
@@ -241,6 +246,9 @@ describe('TextArea', () => {
   });
 
   it('scroll to bottom when autoSize', async () => {
+    userAgentGetter.mockReturnValue(
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Firefox/102.0',
+    );
     const wrapper = mount(<TextArea autoSize />, { attachTo: document.body });
     wrapper.find('textarea').simulate('focus');
     wrapper.find('textarea').getDOMNode().focus();
@@ -250,7 +258,8 @@ describe('TextArea', () => {
     );
     wrapper.find('textarea').simulate('change', { target: { value: '\n1' } });
     await sleep(100);
-    expect(setSelectionRangeFn).toHaveBeenCalled();
+    if (navigator.userAgent.includes('Firefox'))
+      expect(setSelectionRangeFn).toHaveBeenCalled();
     wrapper.unmount();
   });
 });