diff --git a/src-next/popup/index.js b/src-next/popup/index.js
index 0c4720d32..23b900006 100644
--- a/src-next/popup/index.js
+++ b/src-next/popup/index.js
@@ -49,10 +49,6 @@ export default createComponent({
},
render() {
- if (!this.shouldRender) {
- return;
- }
-
const { round, position, duration } = this;
const isCenter = position === 'center';
@@ -76,29 +72,31 @@ export default createComponent({
onAfterEnter={this.onOpened}
onAfterLeave={this.onClosed}
>
-
- {this.$slots.default?.()}
- {this.closeable && (
-
- )}
-
+ {this.shouldRender ? (
+
+ {this.$slots.default?.()}
+ {this.closeable && (
+
+ )}
+
+ ) : null}
>
);
diff --git a/src-next/popup/index.less b/src-next/popup/index.less
index 9a9234ab7..88eec745b 100644
--- a/src-next/popup/index.less
+++ b/src-next/popup/index.less
@@ -82,22 +82,22 @@
transition-timing-function: ease-in;
}
- &-slide-top-enter,
+ &-slide-top-enter-from,
&-slide-top-leave-active {
transform: translate3d(0, -100%, 0);
}
- &-slide-right-enter,
+ &-slide-right-enter-from,
&-slide-right-leave-active {
transform: translate3d(100%, -50%, 0);
}
- &-slide-bottom-enter,
+ &-slide-bottom-enter-from,
&-slide-bottom-leave-active {
transform: translate3d(0, 100%, 0);
}
- &-slide-left-enter,
+ &-slide-left-enter-from,
&-slide-left-leave-active {
transform: translate3d(-100%, -50%, 0);
}