From f437e9124da6664c616e7f52dc7af4bb937c4795 Mon Sep 17 00:00:00 2001 From: meteor Date: Sun, 23 May 2021 20:24:41 +0800 Subject: [PATCH] fix(date-picker): when default slot is a comment node, date-picker will not display (#4105) --- components/_util/props-util/index.js | 4 ++++ components/date-picker/createPicker.tsx | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/_util/props-util/index.js b/components/_util/props-util/index.js index 86eb35642..1004d47f8 100644 --- a/components/_util/props-util/index.js +++ b/components/_util/props-util/index.js @@ -341,6 +341,10 @@ export function isEmptyElement(c) { ); } +export function isEmptySlot(c) { + return !c || c().every(isEmptyElement); +} + export function isStringElement(c) { return c && c.type === Text; } diff --git a/components/date-picker/createPicker.tsx b/components/date-picker/createPicker.tsx index 0a3175223..3d317416e 100644 --- a/components/date-picker/createPicker.tsx +++ b/components/date-picker/createPicker.tsx @@ -14,6 +14,7 @@ import { hasProp, getOptionProps, getComponent, isValidElement } from '../_util/ import { cloneElement } from '../_util/vnode'; import { formatDate } from './utils'; import { getDataAndAriaProps } from '../_util/util'; +import { isEmptySlot } from '../_util/props-util'; export interface PickerProps { value?: moment.Moment; @@ -255,7 +256,7 @@ export default function createPicker

( > );