revert: revert accessbility (#195)

* Revert "Fix crash in useAccessibility (#193)"

This reverts commit 60b63b2.

* Revert "Accessible dropdown (#182)"

This reverts commit 957e16f.

Author: MadCcc

package.json

@@ -52,7 +52,7 @@
     "jquery": "^3.3.1",
     "less": "^3.11.1",
     "np": "^6.0.0",
-    "rc-menu": "^9.2.1",
+    "rc-menu": "^8.0.0-alpha.2",
     "rc-util": "^5.2.0",
     "react": "^16.11.0",
     "react-dom": "^16.0.0",

src/Dropdown.tsx

@@ -9,7 +9,6 @@ import type {
   ActionType,
 } from 'rc-trigger/lib/interface';
 import Placements from './placements';
-import useAccessibility from './hooks/useAccessibility';
 
 export interface DropdownProps
   extends Pick<
@@ -67,18 +66,6 @@ function Dropdown(props: DropdownProps, ref) {
   const triggerRef = React.useRef(null);
   React.useImperativeHandle(ref, () => triggerRef.current);
 
-  const menuRef = React.useRef(null);
-  const menuClassName = `${prefixCls}-menu`;
-
-  const { returnFocus } = useAccessibility({
-    visible: mergedVisible,
-    setTriggerVisible,
-    triggerRef,
-    menuRef,
-    menuClassName,
-    onVisibleChange: props.onVisibleChange,
-  });
-
   const getOverlayElement = (): React.ReactElement => {
     const { overlay } = props;
     let overlayElement: React.ReactElement;
@@ -101,7 +88,6 @@ function Dropdown(props: DropdownProps, ref) {
     if (overlayProps.onClick) {
       overlayProps.onClick(e);
     }
-    returnFocus();
   };
 
   const onVisibleChange = (newVisible: boolean) => {
@@ -115,7 +101,7 @@ function Dropdown(props: DropdownProps, ref) {
   const getMenuElement = () => {
     const overlayElement = getOverlayElement();
     const extraOverlayProps = {
-      prefixCls: menuClassName,
+      prefixCls: `${prefixCls}-menu`,
       onClick,
     };
     if (typeof overlayElement.type === 'string') {
@@ -124,7 +110,7 @@ function Dropdown(props: DropdownProps, ref) {
     return (
       <>
         {arrow && <div className={`${prefixCls}-arrow`} />}
-        <div ref={menuRef}>{React.cloneElement(overlayElement, extraOverlayProps)}</div>
+        {React.cloneElement(overlayElement, extraOverlayProps)}
       </>
     );
   };

src/hooks/useAccessibility.ts

@@ -1,8 +1,6 @@
 /* eslint-disable react/button-has-type,react/no-find-dom-node,react/no-render-return-value,object-shorthand,func-names,max-len */
 import React from 'react';
-import ReactDOM from 'react-dom';
-import { mount, shallow } from 'enzyme';
-import { act } from 'react-dom/test-utils';
+import { mount } from 'enzyme';
 import Menu, { Divider, Item as MenuItem } from 'rc-menu';
 import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
 import { getPopupDomNode, sleep } from './utils';
@@ -286,42 +284,4 @@ describe('dropdown', () => {
       getPopupDomNode(dropdown).firstElementChild.classList.contains('rc-dropdown-arrow'),
     ).toBe(true);
   });
-
-  it('Keyboard navigation works', async () => {
-    const overlay = (
-      <Menu>
-        <MenuItem key="1">
-          <span className="my-menuitem">one</span>
-        </MenuItem>
-        <MenuItem key="2">two</MenuItem>
-      </Menu>
-    );
-    const dropdown = mount(
-      <Dropdown trigger={['click']} overlay={overlay} className="trigger-button">
-        <button className="my-button">open</button>
-      </Dropdown>,
-      { attachTo: document.body },
-    );
-    const trigger = dropdown.find('.my-button');
-
-    // Open menu
-    trigger.simulate('click');
-    await sleep(200);
-    expect(getPopupDomNode(dropdown).classList.contains('rc-dropdown-hidden')).toBe(false);
-
-    // Close menu with Esc
-    window.dispatchEvent(new KeyboardEvent('keydown', { keyCode: 27 })); // Esc
-    await sleep(200);
-    expect(document.activeElement.className).toContain('my-button');
-
-    // Open menu
-    trigger.simulate('click');
-    await sleep(200);
-    expect(getPopupDomNode(dropdown).classList.contains('rc-dropdown-hidden')).toBe(false);
-
-    // Close menu with Tab
-    window.dispatchEvent(new KeyboardEvent('keydown', { keyCode: 9 })); // Tab
-    await sleep(200);
-    expect(document.activeElement.className).toContain('my-button');
-  });
 });

tests/basic.test.js

@@ -22,3 +22,4 @@
     "tslint-config-prettier"
   ]
 }
+