fix: autoFocus keeps in props. move test case

react-component · Apr 1, 2021 · 9c42d35 · 9c42d35
1 parent 5924b87
commit 9c42d35
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/src/DrawerWrapper.tsx b/src/DrawerWrapper.tsx
@@ -101,7 +101,6 @@ class DrawerWrapper extends React.Component<IDrawerProps, IState> {
       wrapperClassName,
       forceRender,
       handler,
-      autoFocus,
       ...props
     } = this.props;
     const { open } = this.state;

diff --git a/tests/drawer.spec.tsx b/tests/drawer.spec.tsx
@@ -74,22 +74,6 @@ const DrawerTesterBoolean = props => (
   </div>
 );
 
-/* eslint react/no-multi-comp: 0 */
-// tslint:disable-next-line:max-classes-per-file
-const DrawerTesterAutoFocus = props => (
-  <div>
-    <Drawer
-      {...props}
-      autoFocus={false}
-      open={true}
-      getContainer={false}
-      wrapperClassName="autofocus-test-wrapper-class-name"
-    >
-      <p className="text">Here is content of Drawer</p>
-    </Drawer>
-  </div>
-);
-
 describe('Drawer', () => {
   it('render function', () => {
     const wrapper = mount(<DrawerTesterRef />);
@@ -105,12 +89,4 @@ describe('Drawer', () => {
     const wrapper = mount(<DrawerTesterBoolean />);
     expect(toJson(wrapper.render())).toMatchSnapshot();
   });
-
-  it('render autoFocus', () => {
-    const wrapper = mount(<DrawerTesterAutoFocus />);
-    expect(
-      wrapper.find('.autofocus-test-wrapper-class-name').is(':focus'),
-    ).toBe(false);
-    expect(toJson(wrapper.render())).toMatchSnapshot();
-  });
 });
diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx
@@ -225,4 +225,23 @@ describe('rc-drawer-menu', () => {
     const content = instance.find('.drawer-content-wrapper').instance() as any;
     expect(content.style.background).toBe('rgb(255, 0, 0)');
   });
+
+  it('autoFocus:false', () => {
+    instance = mount(
+      <div>
+        <Drawer
+          autoFocus={false}
+          open={true}
+          getContainer={false}
+          wrapperClassName="autofocus-test-wrapper-class-name"
+        >
+          <p className="text">Here is content of Drawer</p>
+        </Drawer>
+      </div>,
+    );
+
+    expect(
+      instance.find('.autofocus-test-wrapper-class-name').is(':focus'),
+    ).toBe(false);
+  });
 });