Merge pull request #438 from webzard-io/feat/arco

fix some arco bugs
This commit is contained in:
tanbowensg 2022-06-09 17:31:22 +08:00 committed by GitHub
commit 512a0c3a2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 18 deletions

View File

@ -152,7 +152,7 @@ export const Cascader = implementRuntimeComponent({
options={convertArrToTree(options)}
placeholder={placeholder}
>
{content}
{content ? <div>{content}</div> : null}
</BaseCascader>
);
});

View File

@ -90,7 +90,7 @@ export const Modal = implementRuntimeComponent({
}}
afterClose={afterClose}
afterOpen={afterOpen}
footer={slotsElements.footer ? slotsElements.footer({}) : null}
footer={slotsElements.footer ? slotsElements.footer({}) : undefined}
className={css(customStyle?.content)}
mountOnEnter={true}
{...cProps}

View File

@ -64,6 +64,7 @@ export const Popover = implementRuntimeComponent({
return controlled ? (
<BasePopover
className={css(customStyle?.content)}
popupVisible={popupVisible}
{...cProps}
content={slotsElements.popupContent ? slotsElements.popupContent({}) : null}
>

View File

@ -119,15 +119,21 @@ export const Tabs = implementRuntimeComponent({
activeTab={String(activeTab)}
ref={ref}
>
{tabs.map((tabName, idx) => (
<TabPane key={String(idx)} title={tabName}>
{slotsElements?.content
? slotsElements.content({
tabIndex: idx,
})
: null}
</TabPane>
))}
{tabs.map((tabItem, idx) =>
tabItem.hidden ? null : (
<TabPane
destroyOnHide={tabItem.destroyOnHide}
key={String(idx)}
title={tabItem.title}
>
{slotsElements?.content
? slotsElements.content({
tabIndex: idx,
})
: null}
</TabPane>
)
)}
</BaseTabs>
);
});

View File

@ -64,9 +64,6 @@ export const TimePicker = implementRuntimeComponent({
footer: {
slotProps: Type.Object({}),
},
triggerElement: {
slotProps: Type.Object({}),
},
},
styleSlots: ['content'],
events: ['onChange', 'onClear', 'onVisibleChange'],
@ -84,7 +81,7 @@ export const TimePicker = implementRuntimeComponent({
const { elementRef, customStyle, slotsElements, callbackMap, mergeState } = props;
const pickerProps = {
extra: slotsElements.footer,
extra: slotsElements.footer && slotsElements.footer({}),
utcOffset: useUtcOffset ? utcOffset : undefined,
onChange: (timeString: string | string[], time: Dayjs | Dayjs[]) => {
mergeState({

View File

@ -38,6 +38,9 @@ export const Tooltip = implementRuntimeComponent({
slots: {
content: { slotProps: Type.Object({}) },
},
annotations: {
category: 'Display',
},
styleSlots: ['content'],
events: [],
},

View File

@ -29,9 +29,11 @@ export const PopoverPropsSpec = {
controlled: Type.Boolean({
title: 'Controlled',
category: Category.Basic,
description:
'Control the opening and closing of popups via openPopupover and closePopupover events',
}),
unmountOnExit:Type.Boolean({
title:'Destroy On Hide',
unmountOnExit: Type.Boolean({
title: 'Destroy On Hide',
category: Category.Behavior,
})
}),
};