fix: type warning

react-component · May 9, 2022 · 7a4a215 · 7a4a215
1 parent 77bd8e4
commit 7a4a215
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 67 deletions.
diff --git a/docs/examples/antd.tsx b/docs/examples/antd.tsx
@@ -31,7 +31,7 @@ const verticalMotion: CSSMotionProps = {
   motionLeave: true,
 };
 
-const inlineMotion: CSSMotionProps = {
+export const inlineMotion: CSSMotionProps = {
   motionName: 'rc-menu-collapse',
   motionAppear: true,
   onAppearStart: collapseNode,

diff --git a/docs/examples/single.tsx b/docs/examples/single.tsx
@@ -4,67 +4,54 @@ import React from 'react';
 import Menu, { SubMenu, Item as MenuItem, Divider } from 'rc-menu';
 import '../../assets/index.less';
 
-export default () => {
-  const [destroy, setDestroy] = React.useState(false);
-
-  function handleSelect(info) {
-    console.log('selected ', info);
+const menu1List = [
+  {
+    titleLocalKey: "Properties",
+    key: "Properties"
+  },
+  {
+    titleLocalKey: "Resources",
+    key: "Resources",
+    children: [
+      {
+        titleLocalKey: "FAQ",
+        key: "Faq",
+        isSub: true
+      },
+      {
+        titleLocalKey: "Learn",
+        key: "Learn",
+        isSub: true
+      }
+    ]
+  },
+  {
+    titleLocalKey: "About Us",
+    key: "AboutUs"
   }
+];
 
-  function handleClick(info) {
-    console.log('click ', info);
+const menu1Items = (values) => {
+  if (!values) {
+    return undefined;
   }
-
-  const titleRight = <span>sub menu</span>;
-  const titleRight1 = <span>sub menu 1</span>;
-  const titleRight2 = <span>sub menu 2</span>;
-  const titleRight3 = <span>sub menu 3</span>;
-
-  const leftMenu = (
-    <Menu onSelect={handleSelect} defaultActiveFirst onClick={handleClick}>
-      <SubMenu title={titleRight} key="1">
-        <MenuItem key="1-1">0-1</MenuItem>
-        <MenuItem key="1-2">0-2</MenuItem>
-      </SubMenu>
-      <MenuItem>
-        <a href="http://taobao.com" target="_blank" rel="noopener noreferrer">
-          i do not need key
-        </a>
-      </MenuItem>
-      <MenuItem key="3">outer</MenuItem>
-      <SubMenu title={titleRight1} key="4">
-        <MenuItem key="4-1">inner inner</MenuItem>
-        <Divider />
-        <SubMenu key="4-2" title={titleRight2}>
-          <MenuItem key="4-2-1">inn</MenuItem>
-          <SubMenu title={titleRight3} key="4-2-2">
-            <MenuItem key="4-2-2-1">inner inner</MenuItem>
-            <MenuItem key="4-2-2-2">inner inner2</MenuItem>
-          </SubMenu>
-        </SubMenu>
-      </SubMenu>
-      <MenuItem disabled>disabled</MenuItem>
-      <MenuItem key="4-3">outer3</MenuItem>
-    </Menu>
-  );
-
-  return (
-    <div>
-      <h2>single selectable menu</h2>
-
-      <p>
-        <button
-          type="button"
-          onClick={() => {
-            setDestroy(true);
-          }}
-        >
-          destroy
-        </button>
-        &nbsp;
-        <a href="#">archor</a>
-      </p>
-      {!destroy && <div style={{ width: 400 }}>{leftMenu}</div>}
-    </div>
-  );
+  return values.map((item, index) => {
+    return {
+      label: <div>{item.titleLocalKey}</div>,
+      key: item.key,
+      children: menu1Items(item.children)
+    };
+  });
 };
+
+console.log(menu1Items(menu1List));
+
+export default () => (
+  <Menu
+  selectable={false}
+  mode="inline"
+  defaultOpenKeys={"Resources"}
+  style={{ width: "100%" }}
+  items={menu1Items(menu1List)}
+/>
+)
diff --git a/src/index.ts b/src/index.ts
@@ -1,10 +1,14 @@
-import Menu, { MenuProps } from './Menu';
-import MenuItem, { MenuItemProps } from './MenuItem';
-import SubMenu, { SubMenuProps } from './SubMenu';
-import MenuItemGroup, { MenuItemGroupProps } from './MenuItemGroup';
+import Menu from './Menu';
+import MenuItem from './MenuItem';
+import SubMenu from './SubMenu';
+import MenuItemGroup from './MenuItemGroup';
 import { useFullPath as useOriginFullPath } from './context/PathContext';
 import Divider from './Divider';
-import { MenuRef } from './interface';
+import type { MenuProps } from './Menu';
+import type { MenuItemProps } from './MenuItem';
+import type { SubMenuProps } from './SubMenu';
+import type { MenuItemGroupProps } from './MenuItemGroup';
+import type { MenuRef } from './interface';
 
 /** @private Only used for antd internal. Do not use in your production. */
 const useFullPath = useOriginFullPath;
@@ -16,11 +20,14 @@ export {
   MenuItemGroup,
   MenuItemGroup as ItemGroup,
   Divider,
+  useFullPath,
+};
+
+export type {
   MenuProps,
   SubMenuProps,
   MenuItemProps,
   MenuItemGroupProps,
-  useFullPath,
   MenuRef,
 };