Skip to content

Commit

Permalink
fix(tree): fix tree export treeItem (#2157)
Browse files Browse the repository at this point in the history
Co-authored-by: vermilionAnd <zhujiahong@growingio.com>
  • Loading branch information
zhuzilv and vermilionAnd committed Jun 14, 2023
1 parent 54d830a commit e7284e7
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export { default as Tag, TagProps } from './tag';
export { default as Toast, ToastConfigOptions, ToastType } from './toast';
export { default as Toggle, ToggleProps } from './toggle';
export { default as Tooltip, TooltipProps } from './tooltip';
export { default as Tree, TreeProps } from './tree';
export { default as Tree, TreeItem, TreeProps, TreeItemProps } from './tree';
export { default as Typography } from './typography';
export { default as Upload, UploadProps, UploadType, UploadStatus } from './upload';
export { default as Select, SelectProps, OptionProps } from './select';
Expand Down
6 changes: 4 additions & 2 deletions src/tree/Tree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ export const InnerTree = WithRef<HTMLDivElement, TreeProps>((props, ref?) => {
);
});

const Tree: React.ForwardRefExoticComponent<TreeProps & React.RefAttributes<HTMLDivElement>> & { isTree?: boolean } =
InnerTree;
const Tree: React.ForwardRefExoticComponent<TreeProps & React.RefAttributes<HTMLDivElement>> & {
isTree?: boolean;
TreeItem?: React.FC<TreeItemProps>;
} = InnerTree;
Tree.isTree = true;
export default Tree;
6 changes: 3 additions & 3 deletions src/tree/demos/Tree.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { Story, Meta } from '@storybook/react/types-6-0';
import { CheckOutlined, CopyOutlined, EventOutlined } from '@gio-design/icons';
import { Tree, TreeProps, TreeNode } from '../index';
import { Tree, TreeProps, TreeItem as TreeNode } from '../index';
import Docs from './TreePage';

export default {
Expand Down Expand Up @@ -209,12 +209,12 @@ export const Options = () => (

export const FilterTreeNode = () => (
<Tree filterTreeNode={(e) => e.value === '0-0'}>
<TreeNode value="0-0" label="产品团队" prefix={<EventOutlined />}>
<Tree.TreeItem value="0-0" label="产品团队" prefix={<EventOutlined />}>
<TreeNode value="0-0-0" label="产品经理团队" prefix={<EventOutlined />} disabled>
<TreeNode value="0-0-0-0" label="产品一组" prefix={<CheckOutlined />} disabled />
<TreeNode value="0-0-0-1" label="产品二组" prefix={<CheckOutlined />} />
</TreeNode>
<TreeNode value="0-0-1" label="设计师团队" prefix={<EventOutlined />} />
</TreeNode>
</Tree.TreeItem>
</Tree>
);
12 changes: 7 additions & 5 deletions src/tree/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { TreeProps, TreeItem as TreeNodeProps } from './interface';
import WithSubComponent from '../utils/withSubComponent';
import { TreeProps, TreeItemProps } from './interface';
import Tree from './Tree';
import TreeNode from './TreeItem';
import TreeItem from './TreeItem';

export type { TreeProps, TreeNodeProps };
export { Tree, TreeNode };
export default Tree;
export type { TreeProps, TreeItemProps };
export { Tree, TreeItem };

export default WithSubComponent(Tree, { TreeItem });

1 comment on commit e7284e7

@vercel
Copy link

@vercel vercel bot commented on e7284e7 Jun 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

gio-design – ./

gio-design.vercel.app
gio-design-growingio.vercel.app
gio-design-git-master-growingio.vercel.app

Please sign in to comment.