Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(tree): 新增 icon 支持自定义渲染函数(#2960) #2964

Merged
merged 3 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/honest-tomatoes-work.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@hi-ui/tree": minor
---

feat: 新增 icon 支持自定义渲染函数
5 changes: 5 additions & 0 deletions .changeset/nine-kings-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@hi-ui/hiui": patch
---

feat(tree): 新增 icon 支持自定义渲染函数
7 changes: 7 additions & 0 deletions packages/ui/tree/src/Tree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export const Tree = forwardRef<HTMLUListElement | null, TreeProps>(
// others
showLine = false,
render: titleRender,
iconRender,
onContextMenu,
flattedData: flattedDataProp,
fieldNames,
Expand Down Expand Up @@ -184,6 +185,7 @@ export const Tree = forwardRef<HTMLUListElement | null, TreeProps>(
expandedIcon,
leafIcon,
titleRender,
iconRender,
onContextMenu,
expandOnSelect,
}),
Expand All @@ -206,6 +208,7 @@ export const Tree = forwardRef<HTMLUListElement | null, TreeProps>(
expandedIcon,
leafIcon,
titleRender,
iconRender,
onContextMenu,
expandOnSelect,
]
Expand Down Expand Up @@ -435,6 +438,10 @@ export interface TreeProps {
* 自定义渲染节点的 title 内容
*/
render?: (node: TreeNodeEventData) => React.ReactNode
/**
* 自定义渲染节点的 icon
*/
iconRender?: (node: TreeNodeEventData) => React.ReactNode
/**
* 自定义节点右键菜单
*/
Expand Down
17 changes: 15 additions & 2 deletions packages/ui/tree/src/TreeNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export const TreeNode = forwardRef<HTMLLIElement | null, TreeNodeProps>((props,
onCheck,
showLine,
titleRender,
iconRender,
collapsedIcon: collapseIconContext,
expandedIcon: expandIconContext,
leafIcon: leafIconContext,
Expand Down Expand Up @@ -284,7 +285,8 @@ export const TreeNode = forwardRef<HTMLLIElement | null, TreeNodeProps>((props,
collapsedIcon,
leafIcon,
onNodeExpand,
onLoadChildren
onLoadChildren,
iconRender
)}

{renderCheckbox(
Expand Down Expand Up @@ -434,8 +436,19 @@ const renderSwitcher = (
collapsedIcon: React.ReactNode,
leafIcon: React.ReactNode,
onNodeExpand: (evt: React.MouseEvent) => Promise<void>,
onLoadChildren?: (node: TreeNodeEventData) => void | Promise<any>
onLoadChildren?: (node: TreeNodeEventData) => void | Promise<any>,
iconRender?: (node: TreeNodeEventData) => React.ReactNode
) => {
if (iconRender) {
return (
<IconButton
tabIndex={-1}
className={cx(`${prefixCls}__switcher`, `${prefixCls}__switcher--noop`)}
icon={iconRender(node)}
/>
)
}

if (loading) {
return (
<IconButton
Expand Down
1 change: 1 addition & 0 deletions packages/ui/tree/src/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ interface TreeContext {
checkable?: boolean
onCheck?: (checkedNode: TreeNodeEventData, shouldChecked: boolean) => void
titleRender?: (node: TreeNodeEventData) => React.ReactNode
iconRender?: (node: TreeNodeEventData) => React.ReactNode
onFocus?: (node: TreeNodeEventData) => void
showLine?: boolean
collapsedIcon?: React.ReactNode
Expand Down
94 changes: 94 additions & 0 deletions packages/ui/tree/stories/icon-render.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import React from 'react'
import Tree, { useTreeAction } from '../src'
import { Modal } from '@hi-ui/modal'
import { FileOutlined, FolderOpenOutlined, FolderOutlined } from '@hi-ui/icons'

/**
* @title 自定义 icon 渲染函数
*/
export const IconRender = () => {
const ActionTree = useTreeAction(Tree)

return (
<>
<h1>IconRender for Tree</h1>
<div className="tree-icon-render__wrap">
<ActionTree
expandOnSelect
editPlaceholder="请填写菜单"
menuOptions={[
{
type: 'addChildNode',
title: '新建子节点',
},
{
type: 'addSiblingNode',
title: '新建兄弟节点',
},
{
// type: 'deleteNode',
title: '删除当前菜单',
onClick(node, action) {
action.closeMenu()

Modal.confirm({
title: '提示',
content: '确定删除吗?',
onConfirm: () => {
action.deleteNode()
},
})
},
},
{
type: 'editNode',
title: '编辑当前菜单',
},
{
title: 'Hello,自定义的菜单',
onClick(node, action) {
console.log(node)
action.closeMenu()
},
},
]}
data={[
{
id: 1,
title: '小米',
children: [
{
id: 2,
title: '研发',
children: [
{ id: 3, title: '后端' },
{ id: 4, title: '运维' },
{ id: 5, title: '前端' },
],
},
{ id: 6, title: '产品' },
],
},
{
id: 11,
title: '大米',
children: [
{ id: 22, title: '可视化' },
{ id: 66, title: 'HiUI' },
],
},
]}
iconRender={(node) => {
if (!node.children?.length) {
return <FileOutlined />
}

if (node.expanded) {
return <FolderOpenOutlined />
} else return <FolderOutlined />
}}
/>
</div>
</>
)
}
1 change: 1 addition & 0 deletions packages/ui/tree/stories/index.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export * from './custom-icon.stories'
export * from './expand-on-click.stories'
export * from './size.stories'
export * from './scroll-to.stories'
export * from './icon-render.stories'

export default {
title: 'Data Display/Tree',
Expand Down