From e943b081f8143701c458289d01f6700efcd2789c Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Fri, 12 Feb 2021 13:26:25 +0800
Subject: [PATCH] chore(Picker): move shared props (#8142)

---
 src/area/index.tsx                |  3 +--
 src/datetime-picker/DatePicker.js |  3 +--
 src/datetime-picker/TimePicker.js |  3 +--
 src/datetime-picker/utils.ts      |  2 +-
 src/picker/PickerColumn.tsx       |  3 ++-
 src/picker/index.tsx              | 27 ++++++++++++++++++++++++++-
 src/picker/shared.ts              | 26 --------------------------
 7 files changed, 32 insertions(+), 35 deletions(-)
 delete mode 100644 src/picker/shared.ts

diff --git a/src/area/index.tsx b/src/area/index.tsx
index 0f8f2e420..f65d511e8 100644
--- a/src/area/index.tsx
+++ b/src/area/index.tsx
@@ -18,8 +18,7 @@ import { createNamespace, pick } from '../utils';
 import { useExpose } from '../composables/use-expose';
 
 // Components
-import Picker from '../picker';
-import { pickerProps } from '../picker/shared';
+import Picker, { pickerProps } from '../picker';
 
 const [createComponent, bem] = createNamespace('area');
 
diff --git a/src/datetime-picker/DatePicker.js b/src/datetime-picker/DatePicker.js
index 086efdde6..c412dea47 100644
--- a/src/datetime-picker/DatePicker.js
+++ b/src/datetime-picker/DatePicker.js
@@ -9,8 +9,7 @@ import { times, sharedProps, getTrueValue, getMonthEndDay } from './utils';
 import { useExpose } from '../composables/use-expose';
 
 // Components
-import Picker from '../picker';
-import { pickerProps } from '../picker/shared';
+import Picker, { pickerProps } from '../picker';
 
 const currentYear = new Date().getFullYear();
 const [createComponent] = createNamespace('date-picker');
diff --git a/src/datetime-picker/TimePicker.js b/src/datetime-picker/TimePicker.js
index 52ff16520..5e8fc9ac2 100644
--- a/src/datetime-picker/TimePicker.js
+++ b/src/datetime-picker/TimePicker.js
@@ -8,8 +8,7 @@ import { times, sharedProps } from './utils';
 import { useExpose } from '../composables/use-expose';
 
 // Components
-import Picker from '../picker';
-import { pickerProps } from '../picker/shared';
+import Picker, { pickerProps } from '../picker';
 
 const [createComponent] = createNamespace('time-picker');
 
diff --git a/src/datetime-picker/utils.ts b/src/datetime-picker/utils.ts
index 12c1ba727..623d296a3 100644
--- a/src/datetime-picker/utils.ts
+++ b/src/datetime-picker/utils.ts
@@ -1,5 +1,5 @@
 import { isNaN } from '../utils/validate/number';
-import { pickerProps } from '../picker/shared';
+import { pickerProps } from '../picker';
 
 export const sharedProps = {
   ...pickerProps,
diff --git a/src/picker/PickerColumn.tsx b/src/picker/PickerColumn.tsx
index 3612d8a6d..1e261b46d 100644
--- a/src/picker/PickerColumn.tsx
+++ b/src/picker/PickerColumn.tsx
@@ -1,6 +1,5 @@
 /* eslint-disable no-use-before-define */
 import { ref, watch, reactive, PropType } from 'vue';
-import { PICKER_KEY } from './shared';
 
 // Utils
 import { deepClone } from '../utils/deep-clone';
@@ -29,6 +28,8 @@ function getElementTranslateY(element: Element) {
   return Number(translateY);
 }
 
+export const PICKER_KEY = 'vanPicker';
+
 export type PickerObjectOption = {
   text?: string;
   disabled?: boolean;
diff --git a/src/picker/index.tsx b/src/picker/index.tsx
index 109ca64f0..cf96b47a0 100644
--- a/src/picker/index.tsx
+++ b/src/picker/index.tsx
@@ -1,5 +1,4 @@
 import { ref, watch, computed, PropType, ComponentPublicInstance } from 'vue';
-import { pickerProps, PICKER_KEY } from './shared';
 
 // Utils
 import { unitToPx, preventDefault, createNamespace } from '../utils';
@@ -12,6 +11,7 @@ import { useExpose } from '../composables/use-expose';
 // Components
 import Loading from '../loading';
 import Column, {
+  PICKER_KEY,
   PickerColumn,
   PickerOption,
   PickerObjectColumn,
@@ -35,6 +35,31 @@ export type {
   PickerObjectOption,
 };
 
+export const pickerProps = {
+  title: String,
+  loading: Boolean,
+  readonly: Boolean,
+  allowHtml: Boolean,
+  cancelButtonText: String,
+  confirmButtonText: String,
+  itemHeight: {
+    type: [Number, String],
+    default: 44,
+  },
+  showToolbar: {
+    type: Boolean,
+    default: true,
+  },
+  visibleItemCount: {
+    type: [Number, String],
+    default: 6,
+  },
+  swipeDuration: {
+    type: [Number, String],
+    default: 1000,
+  },
+};
+
 export default createComponent({
   props: {
     ...pickerProps,
diff --git a/src/picker/shared.ts b/src/picker/shared.ts
deleted file mode 100644
index 78e9aa35b..000000000
--- a/src/picker/shared.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export const PICKER_KEY = 'vanPicker';
-
-export const pickerProps = {
-  title: String,
-  loading: Boolean,
-  readonly: Boolean,
-  allowHtml: Boolean,
-  cancelButtonText: String,
-  confirmButtonText: String,
-  itemHeight: {
-    type: [Number, String],
-    default: 44,
-  },
-  showToolbar: {
-    type: Boolean,
-    default: true,
-  },
-  visibleItemCount: {
-    type: [Number, String],
-    default: 6,
-  },
-  swipeDuration: {
-    type: [Number, String],
-    default: 1000,
-  },
-};