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(popup): support duration #1736

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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
7 changes: 3 additions & 4 deletions src/dropdown-menu/dropdown-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const getUniqueID = uniqueFactory('dropdown-popup');

export default defineComponent({
name: `${prefix}-dropdown-item`,
components: { TPopup },
props,
emits: ['change', 'open', 'opened', 'close', 'closed', 'update:value', 'update:modelValue'],
setup(props) {
Expand Down Expand Up @@ -286,10 +285,10 @@ export default defineComponent({
return (
wrapperVisible.value && (
<div id={popupId} class={classes.value} style={{ ...expandStyle.value }}>
<t-popup
<TPopup
visible={isShowItems.value}
placement={menuProps.direction === 'up' ? 'bottom' : 'top'}
duration={duration.value}
duration={Number(duration.value)}
showOverlay={showOverlay.value}
style={popupStyle.value}
overlayProps={{ style: 'position: absolute' }}
Expand All @@ -300,7 +299,7 @@ export default defineComponent({
<div class={`${dropdownItemClass.value}__body`}>{content || defaultSlot()}</div>
{footer || footerSlot()}
</div>
</t-popup>
</TPopup>
</div>
)
);
Expand Down
3 changes: 2 additions & 1 deletion src/popup/popup.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ attach | String / Function | 'body' | Typescript:`AttachNode`。[see more ts d
closeBtn | Boolean / Slot / Function | - | Typescript:`boolean \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
closeOnOverlayClick | Boolean | true | \- | N
destroyOnClose | Boolean | false | \- | N
duration | Number | 240 | \- | N
overlayProps | Object | {} | Typescript:`OverlayProps`,[Overlay API Documents](./overlay?tab=api)。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/popup/type.ts) | N
placement | String | top | options: top/left/right/bottom/center | N
preventScrollThrough | Boolean | true | \- | N
Expand Down Expand Up @@ -41,4 +42,4 @@ Name | Default Value | Description
-- | -- | --
--td-popup-bg-color | @bg-color-container | -
--td-popup-border-radius | @radius-extra-large | -
--td-popup-close-btn-color | @text-color-primary | -
--td-popup-close-btn-color | @text-color-primary | -
3 changes: 2 additions & 1 deletion src/popup/popup.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ attach | String / Function | 'body' | 指定挂载节点。数据类型为 Strin
closeBtn | Boolean / Slot / Function | - | 是否展示关闭按钮,值为 `true` 显示默认关闭按钮;值为 `false` 则不显示关闭按钮;也可以自定义关闭按钮。TS 类型:`boolean \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
closeOnOverlayClick | Boolean | true | 点击遮罩层是否关闭 | N
destroyOnClose | Boolean | false | 是否在关闭浮层时销毁浮层 | N
duration | Number | 240 | 动画过渡时间 | N
overlayProps | Object | {} | 遮罩层的属性,透传至 overlay。TS 类型:`OverlayProps`,[Overlay API Documents](./overlay?tab=api)。[详细类型定义](https://github.com/Tencent/tdesign-mobile-vue/tree/develop/src/popup/type.ts) | N
placement | String | top | 浮层出现位置。可选项:top/left/right/bottom/center | N
preventScrollThrough | Boolean | true | 是否阻止背景滚动 | N
Expand Down Expand Up @@ -41,4 +42,4 @@ visible-change | `(visible: boolean, trigger: PopupSource) ` | 当浮层隐藏
-- | -- | --
--td-popup-bg-color | @bg-color-container | -
--td-popup-border-radius | @radius-extra-large | -
--td-popup-close-btn-color | @text-color-primary | -
--td-popup-close-btn-color | @text-color-primary | -
7 changes: 6 additions & 1 deletion src/popup/popup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,12 @@ export default defineComponent({
);

const renderContent = (
<Transition name={contentTransitionName.value} onAfterEnter={afterEnter} onAfterLeave={afterLeave}>
<Transition
name={contentTransitionName.value}
duration={props.duration}
onAfterEnter={afterEnter}
onAfterLeave={afterLeave}
>
<div
v-show={innerVisible.value}
ref={popupRef}
Expand Down
5 changes: 5 additions & 0 deletions src/popup/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ export default {
},
/** 是否在关闭浮层时销毁浮层 */
destroyOnClose: Boolean,
/** 动画过渡时间 */
duration: {
type: Number,
default: 240,
},
/** 遮罩层的属性,透传至 overlay */
overlayProps: {
type: Object as PropType<TdPopupProps['overlayProps']>,
Expand Down
5 changes: 5 additions & 0 deletions src/popup/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ export interface TdPopupProps {
* @default false
*/
destroyOnClose?: boolean;
/**
* 动画过渡时间
* @default 240
*/
duration?: number;
/**
* 遮罩层的属性,透传至 overlay
* @default {}
Expand Down
Loading