chore(PIcker): split PickerToolbar component (#10982)

packages/vant/src/picker/Picker.tsx

@@ -9,6 +9,7 @@ import {
 
 // Utils
 import {
+  pick,
   extend,
   unitToPx,
   truthProp,
@@ -17,18 +18,18 @@ import {
   preventDefault,
   makeStringProp,
   makeNumericProp,
-  createNamespace,
-  HAPTICS_FEEDBACK,
   BORDER_UNSET_TOP_BOTTOM,
   type Numeric,
 } from '../utils';
 import {
+  bem,
+  name,
   isOptionExist,
   getColumnsType,
   findOptionByValue,
+  assignDefaultFields,
   formatCascadeColumns,
   getFirstEnabledOption,
-  assignDefaultFields,
 } from './utils';
 
 // Composables
@@ -38,6 +39,11 @@ import { useExpose } from '../composables/use-expose';
 // Components
 import { Loading } from '../loading';
 import Column, { PICKER_KEY } from './PickerColumn';
+import Toolbar, {
+  pickerToolbarPropKeys,
+  pickerToolbarProps,
+  pickerToolbarSlots,
+} from './PickerToolbar';
 
 // Types
 import type {
@@ -48,20 +54,18 @@ import type {
   PickerToolbarPosition,
 } from './types';
 
-const [name, bem, t] = createNamespace('picker');
+export const pickerSharedProps = extend(
-
+  {
-export const pickerSharedProps = {
+    loading: Boolean,
-  title: String,
+    readonly: Boolean,
-  loading: Boolean,
+    allowHtml: Boolean,
-  readonly: Boolean,
+    optionHeight: makeNumericProp(44),
-  allowHtml: Boolean,
+    showToolbar: truthProp,
-  optionHeight: makeNumericProp(44),
+    swipeDuration: makeNumericProp(1000),
-  showToolbar: truthProp,
+    visibleOptionNum: makeNumericProp(6),
-  swipeDuration: makeNumericProp(1000),
+  },
-  visibleOptionNum: makeNumericProp(6),
+  pickerToolbarProps
-  cancelButtonText: String,
+);
-  confirmButtonText: String,
-};
 
 const pickerProps = extend({}, pickerSharedProps, {
   columns: makeArrayProp<PickerOption | PickerColumn>(),
@@ -167,53 +171,6 @@ export default defineComponent({
         selectedOptions: selectedOptions.value,
       });
 
-    const renderTitle = () => {
-      if (slots.title) {
-        return slots.title();
-      }
-      if (props.title) {
-        return <div class={[bem('title'), 'van-ellipsis']}>{props.title}</div>;
-      }
-    };
-
-    const renderCancel = () => {
-      const text = props.cancelButtonText || t('cancel');
-      return (
-        <button
-          type="button"
-          class={[bem('cancel'), HAPTICS_FEEDBACK]}
-          onClick={cancel}
-        >
-          {slots.cancel ? slots.cancel() : text}
-        </button>
-      );
-    };
-
-    const renderConfirm = () => {
-      const text = props.confirmButtonText || t('confirm');
-      return (
-        <button
-          type="button"
-          class={[bem('confirm'), HAPTICS_FEEDBACK]}
-          onClick={confirm}
-        >
-          {slots.confirm ? slots.confirm() : text}
-        </button>
-      );
-    };
-
-    const renderToolbar = () => {
-      if (props.showToolbar) {
-        return (
-          <div class={bem('toolbar')}>
-            {slots.toolbar
-              ? slots.toolbar()
-              : [renderCancel(), renderTitle(), renderConfirm()]}
-          </div>
-        );
-      }
-    };
-
     const renderColumnItems = () =>
       currentColumns.value.map((options, columnIndex) => (
         <Column
@@ -260,6 +217,19 @@ export default defineComponent({
       );
     };
 
+    const renderToolbar = () => {
+      if (props.showToolbar) {
+        return (
+          <Toolbar
+            v-slots={pick(slots, pickerToolbarSlots)}
+            {...pick(props, pickerToolbarPropKeys)}
+            onConfirm={confirm}
+            onCancel={cancel}
+          />
+        );
+      }
+    };
+
     watch(
       currentColumns,
       (columns) => {

packages/vant/src/picker/PickerToolbar.tsx

@@ -0,0 +1,75 @@
+import { defineComponent } from 'vue';
+import { bem, t } from './utils';
+import { createNamespace, HAPTICS_FEEDBACK } from '../utils';
+
+const [name] = createNamespace('picker-toolbar');
+
+export const pickerToolbarProps = {
+  title: String,
+  cancelButtonText: String,
+  confirmButtonText: String,
+};
+
+export const pickerToolbarSlots = ['cancel', 'confirm', 'title', 'toolbar'];
+
+export type PickerToolbarPropKeys = Array<keyof typeof pickerToolbarProps>;
+
+export const pickerToolbarPropKeys = Object.keys(
+  pickerToolbarProps
+) as PickerToolbarPropKeys;
+
+export default defineComponent({
+  name,
+
+  props: pickerToolbarProps,
+
+  emits: ['confirm', 'cancel'],
+
+  setup(props, { emit, slots }) {
+    const renderTitle = () => {
+      if (slots.title) {
+        return slots.title();
+      }
+      if (props.title) {
+        return <div class={[bem('title'), 'van-ellipsis']}>{props.title}</div>;
+      }
+    };
+
+    const onCancel = () => emit('cancel');
+    const onConfirm = () => emit('confirm');
+
+    const renderCancel = () => {
+      const text = props.cancelButtonText || t('cancel');
+      return (
+        <button
+          type="button"
+          class={[bem('cancel'), HAPTICS_FEEDBACK]}
+          onClick={onCancel}
+        >
+          {slots.cancel ? slots.cancel() : text}
+        </button>
+      );
+    };
+
+    const renderConfirm = () => {
+      const text = props.confirmButtonText || t('confirm');
+      return (
+        <button
+          type="button"
+          class={[bem('confirm'), HAPTICS_FEEDBACK]}
+          onClick={onConfirm}
+        >
+          {slots.confirm ? slots.confirm() : text}
+        </button>
+      );
+    };
+
+    return () => (
+      <div class={bem('toolbar')}>
+        {slots.toolbar
+          ? slots.toolbar()
+          : [renderCancel(), renderTitle(), renderConfirm()]}
+      </div>
+    );
+  },
+});

packages/vant/src/picker/utils.ts

@@ -1,7 +1,11 @@
-import { isDef, clamp, extend, type Numeric } from '../utils';
+import { isDef, clamp, extend, createNamespace, type Numeric } from '../utils';
 import type { Ref } from 'vue';
 import type { PickerOption, PickerColumn, PickerFieldNames } from './types';
 
+const [name, bem, t] = createNamespace('picker');
+
+export { name, bem, t };
+
 export const getFirstEnabledOption = (
   options: PickerOption[]
 ): PickerOption | undefined =>