Revert "fix(DropdownMenu): fix recursive update when passing object l…

…iteral to title-class (#12614)" (#12617)
youzan · Feb 4, 2024 · 892d018 · 892d018
1 parent 3d494b8
commit 892d018
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 33 deletions.
diff --git a/packages/vant/src/dropdown-menu/DropdownMenu.tsx b/packages/vant/src/dropdown-menu/DropdownMenu.tsx
@@ -2,7 +2,6 @@ import {
   ref,
   computed,
   defineComponent,
-  toRaw,
   type InjectionKey,
   type CSSProperties,
   type ExtractPropTypes,
@@ -18,6 +17,7 @@ import {
   makeNumericProp,
   createNamespace,
   HAPTICS_FEEDBACK,
+  type ComponentInstance,
 } from '../utils';
 
 // Composables
@@ -33,7 +33,6 @@ import {
 
 // Types
 import type { DropdownMenuProvide, DropdownMenuDirection } from './types';
-import type { DropdownItemInstance } from '../dropdown-item';
 
 const [name, bem] = createNamespace('dropdown-menu');
 
@@ -64,10 +63,7 @@ export default defineComponent({
     const barRef = ref<HTMLElement>();
     const offset = ref(0);
 
-    const { children, linkChildren } = useChildren<
-      DropdownItemInstance,
-      unknown
-    >(DROPDOWN_KEY);
+    const { children, linkChildren } = useChildren(DROPDOWN_KEY);
     const scrollParent = useScrollParent(root);
 
     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 { disabled, titleClass } = toRaw(item.$props);
+      const { disabled, titleClass } = item;
 
       return (
         <div

diff --git a/packages/vant/src/dropdown-menu/test/index.spec.tsx b/packages/vant/src/dropdown-menu/test/index.spec.tsx
@@ -367,28 +367,3 @@ test('auto-locate prop', async () => {
 
   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');
-});