Skip to content

Commit 598964b

Browse files
committed
fix: fix build
1 parent 51f7e7d commit 598964b

File tree

3 files changed

+277
-276
lines changed

3 files changed

+277
-276
lines changed

src/cascader/Cascader.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import Tabs from '../tabs';
1010
import { StyledProps, TNode, TreeOptionData } from '../common';
1111
import { usePrefixClass } from '../hooks/useClass';
1212
import useDefaultProps from '../hooks/useDefaultProps';
13+
import parseTNode from '../_util/parseTNode';
1314
import { cascaderDefaultProps } from './defaultProps';
1415
import { TdCascaderProps } from './type';
1516

@@ -173,7 +174,7 @@ const Cascader: React.FC<CascaderProps> = (props) => {
173174
}}
174175
>
175176
<div className={classNames(cascaderClass, className)} style={style}>
176-
<div className={`${cascaderClass}__title`}>{title}</div>
177+
<div className={`${cascaderClass}__title`}>{parseTNode(title)}</div>
177178
<div
178179
className={`${cascaderClass}__close-btn`}
179180
onClick={() => {
@@ -186,7 +187,7 @@ const Cascader: React.FC<CascaderProps> = (props) => {
186187
onClose?.('close-btn');
187188
}}
188189
>
189-
{closeBtn === true ? <CloseIcon size={24} /> : closeBtn}
190+
{closeBtn === true ? <CloseIcon size={24} /> : parseTNode(closeBtn)}
190191
</div>
191192
<div className={`${cascaderClass}__content`}>
192193
{labelList.length ? (
@@ -212,7 +213,7 @@ const Cascader: React.FC<CascaderProps> = (props) => {
212213
[`${cascaderClass}__step-label--active`]: index === stepIndex,
213214
})}
214215
>
215-
{labeItem.label}
216+
{parseTNode(labeItem.label)}
216217
</div>
217218
<ChevronRightIcon size={22} className={`${cascaderClass}__step-arrow`} />
218219
</div>

src/dropdown-menu/DropdownMenu.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import DropdownItem from './DropdownItem';
88
import DropdownMenuContext from './DropdownMenuContext';
99
import type { TdDropdownMenuProps } from './type';
1010

11-
export interface DropdownMenuProps extends TdDropdownMenuProps, StyledProps {}
11+
export interface DropdownMenuProps extends TdDropdownMenuProps, StyledProps {
12+
children?: React.ReactNode;
13+
}
1214

1315
type DropdownMenuRef = {
1416
collapseMenu: () => void;
@@ -21,7 +23,7 @@ const DropdownMenu = forwardRef<DropdownMenuRef, DropdownMenuProps>((props, ref)
2123
const dropdownMenuClass = usePrefixClass('dropdown-menu');
2224

2325
const items = [];
24-
React.Children.forEach(props.children, (child: typeof DropdownItem) => {
26+
React.Children.forEach(props.children, (child: any) => {
2527
if (
2628
React.isValidElement<ComponentProps<typeof DropdownItem>>(child) &&
2729
(child.type as any)?.displayName === DropdownItem.displayName

0 commit comments

Comments
 (0)