fix(message): getContainer prop doesn't work (#6942)

vueComponent · Sep 15, 2023 · 2f7f0e6 · 2f7f0e6
1 parent 2c4d465
commit 2f7f0e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/components/_util/Portal.tsx b/components/_util/Portal.tsx
@@ -1,5 +1,13 @@
 import PropTypes from './vue-types';
-import { defineComponent, nextTick, onBeforeMount, onUpdated, Teleport, watch } from 'vue';
+import {
+  defineComponent,
+  nextTick,
+  onBeforeMount,
+  onMounted,
+  onUpdated,
+  Teleport,
+  watch,
+} from 'vue';
 import { useInjectPortal } from '../vc-trigger/context';
 
 export default defineComponent({
@@ -17,6 +25,8 @@ export default defineComponent({
     const { shouldRender } = useInjectPortal();
     onBeforeMount(() => {
       isSSR = false;
+    });
+    onMounted(() => {
       if (shouldRender.value) {
         container = props.getContainer();
       }

diff --git a/components/config-provider/hooks/useConfigInject.ts b/components/config-provider/hooks/useConfigInject.ts
@@ -24,7 +24,7 @@ export default (name: string, props: Record<any, any>) => {
     () => props.getTargetContainer ?? configProvider.getTargetContainer?.value,
   );
   const getPopupContainer = computed(
-    () => props.getPopupContainer ?? configProvider.getPopupContainer?.value,
+    () => props.getContainer ?? props.getPopupContainer ?? configProvider.getPopupContainer?.value,
   );
 
   const dropdownMatchSelectWidth = computed<boolean | number>(