blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

fix(Popup): fix failed to inherit scopedId (#12327)

Browse Source
This commit is contained in:
neverland 2023-09-29 21:09:08 +08:00 committed by GitHub
parent c24b7f7d80
commit 24e9176433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/vant/src/composables/use-scope-id.ts Normal file
View File

@ -0,0 +1,8 @@
import { getCurrentInstance } from 'vue';
// Fix failed to get scopeId when using teleport & fragment
// https://github.com/vuejs/core/issues/2669
export const useScopeId = () => {
const { scopeId } = getCurrentInstance()?.vnode || {};
return scopeId ? { [scopeId]: '' } : null;
};

3
packages/vant/src/popup/Popup.tsx
View File

@ -32,6 +32,7 @@ import { useLockScroll } from '../composables/use-lock-scroll';
import { useLazyRender } from '../composables/use-lazy-render'; import { useLazyRender } from '../composables/use-lazy-render';
import { POPUP_TOGGLE_KEY } from '../composables/on-popup-reopen'; import { POPUP_TOGGLE_KEY } from '../composables/on-popup-reopen';
import { useGlobalZIndex } from '../composables/use-global-z-index'; import { useGlobalZIndex } from '../composables/use-global-z-index';
import { useScopeId } from '../composables/use-scope-id';
// Components // Components
import { Icon } from '../icon'; import { Icon } from '../icon';
@ -143,6 +144,7 @@ export default defineComponent({
customStyle={props.overlayStyle} customStyle={props.overlayStyle}
role={props.closeOnClickOverlay ? 'button' : undefined} role={props.closeOnClickOverlay ? 'button' : undefined}
tabindex={props.closeOnClickOverlay ? 0 : undefined} tabindex={props.closeOnClickOverlay ? 0 : undefined}
{...useScopeId()}
onClick={onClickOverlay} onClick={onClickOverlay}
/> />
); );
@ -205,6 +207,7 @@ export default defineComponent({
]} ]}
onKeydown={onKeydown} onKeydown={onKeydown}
{...attrs} {...attrs}
{...useScopeId()}
> >
{slots.default?.()} {slots.default?.()}
{renderCloseIcon()} {renderCloseIcon()}