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

Revert "fix(DropdownMenu): fix recursive update when passing object literal to title-class (#12614)" (#12617)

Browse Source
This commit is contained in:
inottn 2024-02-04 22:44:32 +08:00 committed by GitHub
parent 3d494b87c2
commit 892d0186dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/vant/src/dropdown-menu/DropdownMenu.tsx
View File

@ -2,7 +2,6 @@ import {
ref, ref,
computed, computed,
defineComponent, defineComponent,
toRaw,
type InjectionKey, type InjectionKey,
type CSSProperties, type CSSProperties,
type ExtractPropTypes, type ExtractPropTypes,
@ -18,6 +17,7 @@ import {
makeNumericProp, makeNumericProp,
createNamespace, createNamespace,
HAPTICS_FEEDBACK, HAPTICS_FEEDBACK,
type ComponentInstance,
} from '../utils'; } from '../utils';
// Composables // Composables
@ -33,7 +33,6 @@ import {
// Types // Types
import type { DropdownMenuProvide, DropdownMenuDirection } from './types'; import type { DropdownMenuProvide, DropdownMenuDirection } from './types';
import type { DropdownItemInstance } from '../dropdown-item';
const [name, bem] = createNamespace('dropdown-menu'); const [name, bem] = createNamespace('dropdown-menu');
@ -64,10 +63,7 @@ export default defineComponent({
const barRef = ref<HTMLElement>(); const barRef = ref<HTMLElement>();
const offset = ref(0); const offset = ref(0);
const { children, linkChildren } = useChildren< const { children, linkChildren } = useChildren(DROPDOWN_KEY);
DropdownItemInstance,
unknown
>(DROPDOWN_KEY);
const scrollParent = useScrollParent(root); const scrollParent = useScrollParent(root);
const opened = computed(() => const opened = computed(() =>
@ -125,9 +121,9 @@ export default defineComponent({
}); });
}; };
const renderTitle = (item: DropdownItemInstance, index: number) => { const renderTitle = (item: ComponentInstance, index: number) => {
const { showPopup } = item.state; const { showPopup } = item.state;
const { disabled, titleClass } = toRaw(item.$props); const { disabled, titleClass } = item;
return ( return (
<div <div

25
packages/vant/src/dropdown-menu/test/index.spec.tsx
View File

@ -367,28 +367,3 @@ test('auto-locate prop', async () => {
vi.doUnmock('../../utils/dom'); vi.doUnmock('../../utils/dom');
}); });
test('title-class prop', async () => {
const titleClass = ref({ custom: true });
const wrapper = mount({
setup() {
return () => (
<DropdownMenu>
<DropdownItem titleClass={{ custom: true }} />
<DropdownItem titleClass={titleClass.value} />
</DropdownMenu>
);
},
});
await later();
const titles = wrapper.findAll('.van-dropdown-menu__title');
// using object literal should work
expect(titles[0].classes()).toContain('custom');
expect(titles[1].classes()).toContain('custom');
titleClass.value.custom = false;
await later();
expect(titles[1].classes()).not.toContain('custom');
});