From a3380f08c06f5fd32443e9b033e3d8a29c1f726a Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 23 Sep 2021 10:15:48 +0800 Subject: [PATCH] types: export props types --- packages/vant/src/address-edit/index.ts | 3 ++- packages/vant/src/area/index.ts | 3 ++- packages/vant/src/calendar/index.ts | 3 ++- packages/vant/src/checkbox-group/index.ts | 3 ++- packages/vant/src/checkbox/index.ts | 3 ++- packages/vant/src/collapse-item/index.ts | 3 ++- packages/vant/src/count-down/CountDown.tsx | 25 +++------------------- packages/vant/src/count-down/index.ts | 5 +++-- packages/vant/src/count-down/types.ts | 16 ++++++++++++++ packages/vant/src/datetime-picker/index.ts | 3 ++- packages/vant/src/dropdown-item/index.ts | 3 ++- packages/vant/src/dropdown-menu/index.ts | 3 ++- packages/vant/src/field/index.ts | 3 ++- packages/vant/src/form/index.ts | 3 ++- packages/vant/src/image-preview/index.ts | 2 ++ packages/vant/src/index-bar/index.ts | 3 ++- packages/vant/src/list/index.ts | 3 ++- packages/vant/src/notice-bar/index.ts | 3 ++- packages/vant/src/picker/index.ts | 3 ++- packages/vant/src/progress/index.ts | 3 ++- packages/vant/src/search/index.ts | 3 ++- packages/vant/src/swipe-cell/index.ts | 3 ++- packages/vant/src/swipe/index.ts | 3 ++- packages/vant/src/tabs/index.ts | 3 ++- packages/vant/src/uploader/index.ts | 3 ++- 25 files changed, 66 insertions(+), 45 deletions(-) create mode 100644 packages/vant/src/count-down/types.ts diff --git a/packages/vant/src/address-edit/index.ts b/packages/vant/src/address-edit/index.ts index 7eebd3e36..506dfcbf7 100644 --- a/packages/vant/src/address-edit/index.ts +++ b/packages/vant/src/address-edit/index.ts @@ -1,8 +1,9 @@ import { withInstall } from '../utils'; -import _AddressEdit from './AddressEdit'; +import _AddressEdit, { AddressEditProps } from './AddressEdit'; export const AddressEdit = withInstall(_AddressEdit); export default AddressEdit; +export type { AddressEditProps }; export type { AddressEditInfo, AddressEditInstance, diff --git a/packages/vant/src/area/index.ts b/packages/vant/src/area/index.ts index 1467a7eaa..69ea4d360 100644 --- a/packages/vant/src/area/index.ts +++ b/packages/vant/src/area/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _Area from './Area'; +import _Area, { AreaProps } from './Area'; export const Area = withInstall(_Area); export default Area; +export type { AreaProps }; export type { AreaList, AreaInstance, AreaColumnOption } from './types'; diff --git a/packages/vant/src/calendar/index.ts b/packages/vant/src/calendar/index.ts index 25dd1cc69..b098ffac3 100644 --- a/packages/vant/src/calendar/index.ts +++ b/packages/vant/src/calendar/index.ts @@ -1,8 +1,9 @@ import { withInstall } from '../utils'; -import _Calendar from './Calendar'; +import _Calendar, { CalendarProps } from './Calendar'; export const Calendar = withInstall(_Calendar); export default Calendar; +export type { CalendarProps }; export type { CalendarType, CalendarDayItem, diff --git a/packages/vant/src/checkbox-group/index.ts b/packages/vant/src/checkbox-group/index.ts index 7e8a9f62b..6de4d9b00 100644 --- a/packages/vant/src/checkbox-group/index.ts +++ b/packages/vant/src/checkbox-group/index.ts @@ -1,8 +1,9 @@ import { withInstall } from '../utils'; -import _CheckboxGroup from './CheckboxGroup'; +import _CheckboxGroup, { CheckboxGroupProps } from './CheckboxGroup'; export const CheckboxGroup = withInstall(_CheckboxGroup); export default CheckboxGroup; +export type { CheckboxGroupProps }; export type { CheckboxGroupInstance, CheckboxGroupToggleAllOptions, diff --git a/packages/vant/src/checkbox/index.ts b/packages/vant/src/checkbox/index.ts index d67f58ab9..33a7e867e 100644 --- a/packages/vant/src/checkbox/index.ts +++ b/packages/vant/src/checkbox/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _Checkbox from './Checkbox'; +import _Checkbox, { CheckboxProps } from './Checkbox'; export const Checkbox = withInstall(_Checkbox); export default Checkbox; +export type { CheckboxProps }; export type { CheckboxInstance } from './types'; diff --git a/packages/vant/src/collapse-item/index.ts b/packages/vant/src/collapse-item/index.ts index b2f0aefa1..660eac0a7 100644 --- a/packages/vant/src/collapse-item/index.ts +++ b/packages/vant/src/collapse-item/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _CollapseItem from './CollapseItem'; +import _CollapseItem, { CollapseItemProps } from './CollapseItem'; export const CollapseItem = withInstall(_CollapseItem); export default CollapseItem; +export type { CollapseItemProps }; export type { CollapseItemInstance } from './types'; diff --git a/packages/vant/src/count-down/CountDown.tsx b/packages/vant/src/count-down/CountDown.tsx index 63b8c5527..a14486b13 100644 --- a/packages/vant/src/count-down/CountDown.tsx +++ b/packages/vant/src/count-down/CountDown.tsx @@ -1,17 +1,11 @@ -import { - watch, - computed, - defineComponent, - ExtractPropTypes, - ComponentPublicInstance, -} from 'vue'; +import { watch, computed, defineComponent, ExtractPropTypes } from 'vue'; // Utils import { truthProp, createNamespace } from '../utils'; import { parseFormat } from './utils'; // Composables -import { useCountDown, CurrentTime } from '@vant/use'; +import { useCountDown } from '@vant/use'; import { useExpose } from '../composables/use-expose'; const [name, bem] = createNamespace('count-down'); @@ -29,20 +23,7 @@ const props = { }, }; -type CountDownProps = ExtractPropTypes; - -type CountDownExpose = { - start: () => void; - pause: () => void; - reset: () => void; -}; - -export type CountDownInstance = ComponentPublicInstance< - CountDownProps, - CountDownExpose ->; - -export type CountDownCurrentTime = CurrentTime; +export type CountDownProps = ExtractPropTypes; export default defineComponent({ name, diff --git a/packages/vant/src/count-down/index.ts b/packages/vant/src/count-down/index.ts index 616f70471..e557a8f0e 100644 --- a/packages/vant/src/count-down/index.ts +++ b/packages/vant/src/count-down/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _CountDown from './CountDown'; +import _CountDown, { CountDownProps } from './CountDown'; export const CountDown = withInstall(_CountDown); export default CountDown; -export type { CountDownInstance, CountDownCurrentTime } from './CountDown'; +export type { CountDownProps }; +export type { CountDownInstance, CountDownCurrentTime } from './types'; diff --git a/packages/vant/src/count-down/types.ts b/packages/vant/src/count-down/types.ts new file mode 100644 index 000000000..779b80bd3 --- /dev/null +++ b/packages/vant/src/count-down/types.ts @@ -0,0 +1,16 @@ +import type { ComponentPublicInstance } from 'vue'; +import type { CurrentTime } from '@vant/use'; +import type { CountDownProps } from './CountDown'; + +type CountDownExpose = { + start: () => void; + pause: () => void; + reset: () => void; +}; + +export type CountDownInstance = ComponentPublicInstance< + CountDownProps, + CountDownExpose +>; + +export type CountDownCurrentTime = CurrentTime; diff --git a/packages/vant/src/datetime-picker/index.ts b/packages/vant/src/datetime-picker/index.ts index 4befcf976..45756fd27 100644 --- a/packages/vant/src/datetime-picker/index.ts +++ b/packages/vant/src/datetime-picker/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _DatetimePicker from './DatetimePicker'; +import _DatetimePicker, { DatetimePickerProps } from './DatetimePicker'; export const DatetimePicker = withInstall(_DatetimePicker); export default DatetimePicker; +export type { DatetimePickerProps }; export type { DatetimePickerType, DatetimePickerInstance } from './types'; diff --git a/packages/vant/src/dropdown-item/index.ts b/packages/vant/src/dropdown-item/index.ts index 994cca3a6..41973bb12 100644 --- a/packages/vant/src/dropdown-item/index.ts +++ b/packages/vant/src/dropdown-item/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _DropdownItem from './DropdownItem'; +import _DropdownItem, { DropdownItemProps } from './DropdownItem'; export const DropdownItem = withInstall(_DropdownItem); export default DropdownItem; +export type { DropdownItemProps }; export type { DropdownItemInstance, DropdownItemOption } from './types'; diff --git a/packages/vant/src/dropdown-menu/index.ts b/packages/vant/src/dropdown-menu/index.ts index 7679172d3..fa60bd0af 100644 --- a/packages/vant/src/dropdown-menu/index.ts +++ b/packages/vant/src/dropdown-menu/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _DropdownMenu from './DropdownMenu'; +import _DropdownMenu, { DropdownMenuProps } from './DropdownMenu'; export const DropdownMenu = withInstall(_DropdownMenu); export default DropdownMenu; +export type { DropdownMenuProps }; export type { DropdownMenuDirection } from './types'; diff --git a/packages/vant/src/field/index.ts b/packages/vant/src/field/index.ts index ae188d789..9b0c7610b 100644 --- a/packages/vant/src/field/index.ts +++ b/packages/vant/src/field/index.ts @@ -1,8 +1,9 @@ import { withInstall } from '../utils'; -import _Field from './Field'; +import _Field, { FieldProps } from './Field'; export const Field = withInstall(_Field); export default Field; +export type { FieldProps }; export type { FieldType, FieldRule, diff --git a/packages/vant/src/form/index.ts b/packages/vant/src/form/index.ts index 07b77bfcf..496906bed 100644 --- a/packages/vant/src/form/index.ts +++ b/packages/vant/src/form/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _Form from './Form'; +import _Form, { FormProps } from './Form'; export const Form = withInstall(_Form); export default Form; +export type { FormProps }; export type { FormInstance } from './types'; diff --git a/packages/vant/src/image-preview/index.ts b/packages/vant/src/image-preview/index.ts index 3a64112a2..fec37ead1 100644 --- a/packages/vant/src/image-preview/index.ts +++ b/packages/vant/src/image-preview/index.ts @@ -1,7 +1,9 @@ import { ImagePreview } from './function-call'; +import type { ImagePreviewProps } from './ImagePreview'; export default ImagePreview; export { ImagePreview }; +export type { ImagePreviewProps }; export type { ImagePreviewOptions, ImagePreviewInstance, diff --git a/packages/vant/src/index-bar/index.ts b/packages/vant/src/index-bar/index.ts index 21bb411e6..1a56788da 100644 --- a/packages/vant/src/index-bar/index.ts +++ b/packages/vant/src/index-bar/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _IndexBar from './IndexBar'; +import _IndexBar, { IndexBarProps } from './IndexBar'; export const IndexBar = withInstall(_IndexBar); export default IndexBar; +export type { IndexBarProps }; export type { IndexBarInstance } from './types'; diff --git a/packages/vant/src/list/index.ts b/packages/vant/src/list/index.ts index c6b95eb94..f0ea15342 100644 --- a/packages/vant/src/list/index.ts +++ b/packages/vant/src/list/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _List from './List'; +import _List, { ListProps } from './List'; export const List = withInstall(_List); export default List; +export type { ListProps }; export type { ListInstance, ListDirection } from './types'; diff --git a/packages/vant/src/notice-bar/index.ts b/packages/vant/src/notice-bar/index.ts index 7d34665ad..ec0cbd1eb 100644 --- a/packages/vant/src/notice-bar/index.ts +++ b/packages/vant/src/notice-bar/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _NoticeBar from './NoticeBar'; +import _NoticeBar, { NoticeBarProps } from './NoticeBar'; export const NoticeBar = withInstall(_NoticeBar); export default NoticeBar; +export type { NoticeBarProps }; export type { NoticeBarMode, NoticeBarInstance } from './types'; diff --git a/packages/vant/src/picker/index.ts b/packages/vant/src/picker/index.ts index d81b40f1b..4fc7c46ab 100644 --- a/packages/vant/src/picker/index.ts +++ b/packages/vant/src/picker/index.ts @@ -1,8 +1,9 @@ import { withInstall } from '../utils'; -import _Picker from './Picker'; +import _Picker, { PickerProps } from './Picker'; export const Picker = withInstall(_Picker); export default Picker; +export type { PickerProps }; export type { PickerColumn, PickerOption, diff --git a/packages/vant/src/progress/index.ts b/packages/vant/src/progress/index.ts index dd5149086..322f77396 100644 --- a/packages/vant/src/progress/index.ts +++ b/packages/vant/src/progress/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _Progress from './Progress'; +import _Progress, { ProgressProps } from './Progress'; export const Progress = withInstall(_Progress); export default Progress; +export type { ProgressProps }; export type { ProgressInstance } from './types'; diff --git a/packages/vant/src/search/index.ts b/packages/vant/src/search/index.ts index 06b6134e2..0296647ac 100644 --- a/packages/vant/src/search/index.ts +++ b/packages/vant/src/search/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _Search from './Search'; +import _Search, { SearchProps } from './Search'; export const Search = withInstall(_Search); export default Search; +export type { SearchProps }; export type { SearchShape, SearchInstance } from './types'; diff --git a/packages/vant/src/swipe-cell/index.ts b/packages/vant/src/swipe-cell/index.ts index 4acde3def..ab5cb810e 100644 --- a/packages/vant/src/swipe-cell/index.ts +++ b/packages/vant/src/swipe-cell/index.ts @@ -1,8 +1,9 @@ import { withInstall } from '../utils'; -import _SwipeCell from './SwipeCell'; +import _SwipeCell, { SwipeCellProps } from './SwipeCell'; export const SwipeCell = withInstall(_SwipeCell); export default SwipeCell; +export type { SwipeCellProps }; export type { SwipeCellSide, SwipeCellPosition, diff --git a/packages/vant/src/swipe/index.ts b/packages/vant/src/swipe/index.ts index f63fb43e6..8b8bf881c 100644 --- a/packages/vant/src/swipe/index.ts +++ b/packages/vant/src/swipe/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _Swipe from './Swipe'; +import _Swipe, { SwipeProps } from './Swipe'; export const Swipe = withInstall(_Swipe); export default Swipe; +export type { SwipeProps }; export type { SwipeInstance, SwipeToOptions } from './types'; diff --git a/packages/vant/src/tabs/index.ts b/packages/vant/src/tabs/index.ts index 404a6e6de..5384a4e95 100644 --- a/packages/vant/src/tabs/index.ts +++ b/packages/vant/src/tabs/index.ts @@ -1,6 +1,7 @@ import { withInstall } from '../utils'; -import _Tabs from './Tabs'; +import _Tabs, { TabsProps } from './Tabs'; export const Tabs = withInstall(_Tabs); export default Tabs; +export type { TabsProps }; export type { TabsType, TabsInstance } from './types'; diff --git a/packages/vant/src/uploader/index.ts b/packages/vant/src/uploader/index.ts index 557704fa1..1282553a9 100644 --- a/packages/vant/src/uploader/index.ts +++ b/packages/vant/src/uploader/index.ts @@ -1,8 +1,9 @@ import { withInstall } from '../utils'; -import _Uploader from './Uploader'; +import _Uploader, { UploaderProps } from './Uploader'; export const Uploader = withInstall(_Uploader); export default Uploader; +export type { UploaderProps }; export type { UploaderInstance, UploaderResultType,