From 213c67d9107960e02dff6baf8861770a8a822272 Mon Sep 17 00:00:00 2001 From: Kyrielin Date: Thu, 21 Apr 2022 15:14:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=9C=A8=E7=AB=96=E5=9E=8B=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=20(#662)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/divider/Divider.tsx | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/divider/Divider.tsx b/src/divider/Divider.tsx index d578f31c8..dd78284ba 100644 --- a/src/divider/Divider.tsx +++ b/src/divider/Divider.tsx @@ -30,24 +30,20 @@ const Divider = (props: DividerProps) => { } = props; const { classPrefix } = useConfig(); - const hasChildren = typeof children !== 'undefined'; - const hasContent = typeof content !== 'undefined'; - let childrenNode = children; + const childrenNode = content || children; + + const showText = layout !== 'vertical' && !!childrenNode; - if (!hasChildren && hasContent) { - childrenNode = content; - } const dividerClassNames = classNames(`${classPrefix}-divider`, className, { - [`${classPrefix}-divider--horizontal`]: layout === 'horizontal', - [`${classPrefix}-divider--vertical`]: layout === 'vertical', + [`${classPrefix}-divider--${layout}`]: layout, [`${classPrefix}-divider--dashed`]: !!dashed, - [`${classPrefix}-divider--with-text`]: !!childrenNode, - [`${classPrefix}-divider--with-text-${align}`]: !!childrenNode, + [`${classPrefix}-divider--with-text`]: showText, + [`${classPrefix}-divider--with-text-${align}`]: showText, }); return (
- {childrenNode ? {childrenNode} : null} + {showText ? {childrenNode} : null}
); };