From 3fd9f9ae71b960d1500632a344a5517387a914fe Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sun, 29 Aug 2021 10:44:24 +0800
Subject: [PATCH] fix: update EventHandlerNonNull to EventHandler

---
 components/_util/EventInterface.ts         | 10 +++
 components/checkbox/Checkbox.tsx           |  5 +-
 components/date-picker/interface.tsx       |  5 +-
 components/input-number/index.tsx          |  3 +-
 components/typography/Base.tsx             |  3 +-
 components/vc-select/OptionList.tsx        |  7 +-
 components/vc-select/Selector/Input.tsx    | 93 ++++++++++++++--------
 components/vc-select/Selector/index.tsx    |  5 +-
 components/vc-select/Selector/interface.ts | 13 +--
 components/vc-select/generate.tsx          | 27 ++++---
 tsconfig.json                              |  1 -
 v2-doc                                     |  2 +-
 12 files changed, 108 insertions(+), 66 deletions(-)
 create mode 100644 components/_util/EventInterface.ts

diff --git a/components/_util/EventInterface.ts b/components/_util/EventInterface.ts
new file mode 100644
index 000000000..b9d0bd019
--- /dev/null
+++ b/components/_util/EventInterface.ts
@@ -0,0 +1,10 @@
+export type FocusEventHandler = (e: FocusEvent) => void;
+export type MouseEventHandler = (e: MouseEvent) => void;
+export type KeyboardEventHandler = (e: KeyboardEvent) => void;
+export type ChangeEvent = Event & {
+  target: {
+    value?: string | undefined;
+  };
+};
+
+export type EventHandler = (...args: any[]) => void;
diff --git a/components/checkbox/Checkbox.tsx b/components/checkbox/Checkbox.tsx
index 6adc99b22..6ae6f8de2 100644
--- a/components/checkbox/Checkbox.tsx
+++ b/components/checkbox/Checkbox.tsx
@@ -6,6 +6,7 @@ import hasProp, { getOptionProps, getSlot } from '../_util/props-util';
 import { defaultConfigProvider } from '../config-provider';
 import warning from '../_util/warning';
 import type { RadioChangeEvent } from '../radio/interface';
+import type { EventHandler } from '../_util/EventInterface';
 function noop() {}
 
 export default defineComponent({
@@ -127,8 +128,8 @@ export default defineComponent({
       <label
         class={classString}
         style={style}
-        onMouseenter={onMouseenter as EventHandlerNonNull}
-        onMouseleave={onMouseleave as EventHandlerNonNull}
+        onMouseenter={onMouseenter as EventHandler}
+        onMouseleave={onMouseleave as EventHandler}
       >
         <VcCheckbox {...checkboxProps} class={checkboxClass} ref="vcCheckbox" />
         {children.length ? <span>{children}</span> : null}
diff --git a/components/date-picker/interface.tsx b/components/date-picker/interface.tsx
index d0bfc1141..55e093fbb 100644
--- a/components/date-picker/interface.tsx
+++ b/components/date-picker/interface.tsx
@@ -1,5 +1,6 @@
 import type moment from 'moment';
 import type { CSSProperties } from 'vue';
+import type { EventHandler } from '../_util/EventInterface';
 import type { VueNode } from '../_util/type';
 import { tuple } from '../_util/type';
 
@@ -37,8 +38,8 @@ export interface PickerProps {
   disabledDate?: (current: moment.Moment | null) => boolean;
   dateRender?: (current: moment.Moment, today: moment.Moment) => any;
   autofocus?: boolean;
-  onFocus?: EventHandlerNonNull;
-  onBlur?: EventHandlerNonNull;
+  onFocus?: EventHandler;
+  onBlur?: EventHandler;
 }
 
 export interface SinglePickerProps {
diff --git a/components/input-number/index.tsx b/components/input-number/index.tsx
index f3466b36e..40c503edd 100644
--- a/components/input-number/index.tsx
+++ b/components/input-number/index.tsx
@@ -8,6 +8,7 @@ import DownOutlined from '@ant-design/icons-vue/DownOutlined';
 import VcInputNumber from '../vc-input-number/src';
 import { defaultConfigProvider } from '../config-provider';
 import { tuple, withInstall } from '../_util/type';
+import type { EventHandler } from '../_util/EventInterface';
 
 const inputNumberProps = {
   prefixCls: PropTypes.string,
@@ -28,7 +29,7 @@ const inputNumberProps = {
   precision: PropTypes.number,
   autofocus: PropTypes.looseBool,
   onPressEnter: {
-    type: Function as PropType<EventHandlerNonNull>,
+    type: Function as PropType<EventHandler>,
   },
   onChange: Function as PropType<(num: number) => void>,
 };
diff --git a/components/typography/Base.tsx b/components/typography/Base.tsx
index cf99080a5..5e67d9567 100644
--- a/components/typography/Base.tsx
+++ b/components/typography/Base.tsx
@@ -30,6 +30,7 @@ import {
 } from 'vue';
 import type { AutoSizeType } from '../input/ResizableTextArea';
 import useConfigInject from '../_util/hooks/useConfigInject';
+import type { EventHandler } from '../_util/EventInterface';
 
 export type BaseType = 'secondary' | 'success' | 'warning' | 'danger';
 
@@ -58,7 +59,7 @@ export interface EllipsisConfig {
   expandable?: boolean;
   suffix?: string;
   symbol?: string;
-  onExpand?: EventHandlerNonNull;
+  onExpand?: EventHandler;
   onEllipsis?: (ellipsis: boolean) => void;
   tooltip?: boolean;
 }
diff --git a/components/vc-select/OptionList.tsx b/components/vc-select/OptionList.tsx
index a61876512..03439b28e 100644
--- a/components/vc-select/OptionList.tsx
+++ b/components/vc-select/OptionList.tsx
@@ -16,6 +16,7 @@ import type {
 } from './interface';
 import type { RawValueType, FlattenOptionsType } from './interface/generator';
 import useMemo from '../_util/hooks/useMemo';
+import type { EventHandler } from '../_util/EventInterface';
 export interface OptionListProps {
   prefixCls: string;
   id: string;
@@ -37,10 +38,10 @@ export interface OptionListProps {
   onToggleOpen: (open?: boolean) => void;
   /** Tell Select that some value is now active to make accessibility work */
   onActiveValue: OnActiveValue;
-  onScroll: EventHandlerNonNull;
+  onScroll: EventHandler;
 
   /** Tell Select that mouse enter the popup to force re-render */
-  onMouseenter?: EventHandlerNonNull;
+  onMouseenter?: EventHandler;
 }
 
 const OptionListProps = {
@@ -90,7 +91,7 @@ const OptionList = defineComponent<OptionListProps, { state?: any }>({
     // =========================== List ===========================
     const listRef = createRef();
 
-    const onListMouseDown: EventHandlerNonNull = event => {
+    const onListMouseDown: EventHandler = event => {
       event.preventDefault();
     };
 
diff --git a/components/vc-select/Selector/Input.tsx b/components/vc-select/Selector/Input.tsx
index b29c6edf0..16789d1eb 100644
--- a/components/vc-select/Selector/Input.tsx
+++ b/components/vc-select/Selector/Input.tsx
@@ -5,6 +5,7 @@ import PropTypes from '../../_util/vue-types';
 import type { RefObject } from '../../_util/createRef';
 import antInput from '../../_util/antInputDirective';
 import classNames from '../../_util/classNames';
+import type { EventHandler } from '../../_util/EventInterface';
 
 interface InputProps {
   prefixCls: string;
@@ -21,19 +22,43 @@ interface InputProps {
   /** Pass accessibility props to input */
   attrs: object;
   inputRef: RefObject;
-  onKeydown: EventHandlerNonNull;
-  onMousedown: EventHandlerNonNull;
-  onChange: EventHandlerNonNull;
-  onPaste: EventHandlerNonNull;
-  onCompositionstart: EventHandlerNonNull;
-  onCompositionend: EventHandlerNonNull;
-  onFocus: EventHandlerNonNull;
-  onBlur: EventHandlerNonNull;
+  onKeydown: EventHandler;
+  onMousedown: EventHandler;
+  onChange: EventHandler;
+  onPaste: EventHandler;
+  onCompositionstart: EventHandler;
+  onCompositionend: EventHandler;
+  onFocus: EventHandler;
+  onBlur: EventHandler;
 }
 
-const Input = defineComponent<InputProps, { VCSelectContainerEvent: any; blurTimeout: any }>({
+const Input = defineComponent({
   name: 'Input',
   inheritAttrs: false,
+  props: {
+    inputRef: PropTypes.any,
+    prefixCls: PropTypes.string,
+    id: PropTypes.string,
+    inputElement: PropTypes.any,
+    disabled: PropTypes.looseBool,
+    autofocus: PropTypes.looseBool,
+    autocomplete: PropTypes.string,
+    editable: PropTypes.looseBool,
+    accessibilityIndex: PropTypes.number,
+    value: PropTypes.string,
+    open: PropTypes.looseBool,
+    tabindex: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+    /** Pass accessibility props to input */
+    attrs: PropTypes.object,
+    onKeydown: PropTypes.func,
+    onMousedown: PropTypes.func,
+    onChange: PropTypes.func,
+    onPaste: PropTypes.func,
+    onCompositionstart: PropTypes.func,
+    onCompositionend: PropTypes.func,
+    onFocus: PropTypes.func,
+    onBlur: PropTypes.func,
+  },
   setup(props) {
     if (process.env.NODE_ENV === 'test') {
       onMounted(() => {
@@ -47,7 +72,7 @@ const Input = defineComponent<InputProps, { VCSelectContainerEvent: any; blurTim
     }
     return {
       blurTimeout: null,
-      VCSelectContainerEvent: inject('VCSelectContainerEvent'),
+      VCSelectContainerEvent: inject('VCSelectContainerEvent') as any,
     };
   },
   render() {
@@ -164,29 +189,29 @@ const Input = defineComponent<InputProps, { VCSelectContainerEvent: any; blurTim
   },
 });
 
-Input.props = {
-  inputRef: PropTypes.any,
-  prefixCls: PropTypes.string,
-  id: PropTypes.string,
-  inputElement: PropTypes.any,
-  disabled: PropTypes.looseBool,
-  autofocus: PropTypes.looseBool,
-  autocomplete: PropTypes.string,
-  editable: PropTypes.looseBool,
-  accessibilityIndex: PropTypes.number,
-  value: PropTypes.string,
-  open: PropTypes.looseBool,
-  tabindex: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  /** Pass accessibility props to input */
-  attrs: PropTypes.object,
-  onKeydown: PropTypes.func,
-  onMousedown: PropTypes.func,
-  onChange: PropTypes.func,
-  onPaste: PropTypes.func,
-  onCompositionstart: PropTypes.func,
-  onCompositionend: PropTypes.func,
-  onFocus: PropTypes.func,
-  onBlur: PropTypes.func,
-};
+// Input.props = {
+//   inputRef: PropTypes.any,
+//   prefixCls: PropTypes.string,
+//   id: PropTypes.string,
+//   inputElement: PropTypes.any,
+//   disabled: PropTypes.looseBool,
+//   autofocus: PropTypes.looseBool,
+//   autocomplete: PropTypes.string,
+//   editable: PropTypes.looseBool,
+//   accessibilityIndex: PropTypes.number,
+//   value: PropTypes.string,
+//   open: PropTypes.looseBool,
+//   tabindex: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+//   /** Pass accessibility props to input */
+//   attrs: PropTypes.object,
+//   onKeydown: PropTypes.func,
+//   onMousedown: PropTypes.func,
+//   onChange: PropTypes.func,
+//   onPaste: PropTypes.func,
+//   onCompositionstart: PropTypes.func,
+//   onCompositionend: PropTypes.func,
+//   onFocus: PropTypes.func,
+//   onBlur: PropTypes.func,
+// };
 
 export default Input;
diff --git a/components/vc-select/Selector/index.tsx b/components/vc-select/Selector/index.tsx
index e6dd0f9a1..40a4ae160 100644
--- a/components/vc-select/Selector/index.tsx
+++ b/components/vc-select/Selector/index.tsx
@@ -19,6 +19,7 @@ import { defineComponent } from 'vue';
 import createRef from '../../_util/createRef';
 import PropTypes from '../../_util/vue-types';
 import type { VueNode } from '../../_util/type';
+import type { EventHandler } from '../../_util/EventInterface';
 
 export interface SelectorProps {
   id: string;
@@ -57,7 +58,7 @@ export interface SelectorProps {
   onSearch: (searchText: string, fromTyping: boolean, isCompositing: boolean) => boolean;
   onSearchSubmit: (searchText: string) => void;
   onSelect: (value: RawValueType, option: { selected: boolean }) => void;
-  onInputKeyDown?: EventHandlerNonNull;
+  onInputKeyDown?: EventHandler;
 
   /**
    * @private get real dom for trigger align.
@@ -106,7 +107,7 @@ const Selector = defineComponent<SelectorProps>({
     onSearch: PropTypes.func,
     onSearchSubmit: PropTypes.func,
     onSelect: PropTypes.func,
-    onInputKeyDown: PropTypes.func,
+    onInputKeyDown: { type: Function as PropType<EventHandler> },
 
     /**
      * @private get real dom for trigger align.
diff --git a/components/vc-select/Selector/interface.ts b/components/vc-select/Selector/interface.ts
index 2aa8b1e2c..b9d16da49 100644
--- a/components/vc-select/Selector/interface.ts
+++ b/components/vc-select/Selector/interface.ts
@@ -2,6 +2,7 @@ import type { RefObject } from '../../_util/createRef';
 import type { VNodeChild } from 'vue';
 import type { Mode } from '../interface';
 import type { LabelValueType } from '../interface/generator';
+import type { EventHandler } from '../../_util/EventInterface';
 
 export interface InnerSelectorProps {
   prefixCls: string;
@@ -18,10 +19,10 @@ export interface InnerSelectorProps {
   accessibilityIndex: number;
   open: boolean;
   tabindex?: number | string;
-  onInputKeyDown: EventHandlerNonNull;
-  onInputMouseDown: EventHandlerNonNull;
-  onInputChange: EventHandlerNonNull;
-  onInputPaste: EventHandlerNonNull;
-  onInputCompositionStart: EventHandlerNonNull;
-  onInputCompositionEnd: EventHandlerNonNull;
+  onInputKeyDown: EventHandler;
+  onInputMouseDown: EventHandler;
+  onInputChange: EventHandler;
+  onInputPaste: EventHandler;
+  onInputCompositionStart: EventHandler;
+  onInputCompositionEnd: EventHandler;
 }
diff --git a/components/vc-select/generate.tsx b/components/vc-select/generate.tsx
index f0049771e..ffadc8501 100644
--- a/components/vc-select/generate.tsx
+++ b/components/vc-select/generate.tsx
@@ -38,7 +38,7 @@ import { getSeparatedContent } from './utils/valueUtil';
 import useSelectTriggerControl from './hooks/useSelectTriggerControl';
 import useCacheDisplayValue from './hooks/useCacheDisplayValue';
 import useCacheOptions from './hooks/useCacheOptions';
-import type { CSSProperties, DefineComponent, VNode, VNodeChild } from 'vue';
+import type { CSSProperties, DefineComponent, PropType, VNode, VNodeChild } from 'vue';
 import {
   computed,
   defineComponent,
@@ -54,6 +54,7 @@ import PropTypes, { withUndefined } from '../_util/vue-types';
 import initDefaultProps from '../_util/props-util/initDefaultProps';
 import warning from '../_util/warning';
 import isMobile from '../vc-util/isMobile';
+import type { EventHandler } from '../_util/EventInterface';
 
 const DEFAULT_OMIT_PROPS = [
   'children',
@@ -148,7 +149,7 @@ export const BaseProps = () => ({
   onDropdownVisibleChange: PropTypes.func,
   onSelect: PropTypes.func,
   onDeselect: PropTypes.func,
-  onInputKeyDown: PropTypes.func,
+  onInputKeyDown: { type: Function as PropType<EventHandler> },
   onClick: PropTypes.func,
   onChange: PropTypes.func,
   onBlur: PropTypes.func,
@@ -244,20 +245,20 @@ export interface SelectProps<OptionsType extends object[], ValueType> {
   tabindex?: number | string;
 
   // Events
-  onKeyup?: EventHandlerNonNull;
-  onKeydown?: EventHandlerNonNull;
-  onPopupScroll?: EventHandlerNonNull;
+  onKeyup?: EventHandler;
+  onKeydown?: EventHandler;
+  onPopupScroll?: EventHandler;
   onDropdownVisibleChange?: (open: boolean) => void;
   onSelect?: (value: SingleType<ValueType>, option: OptionsType[number]) => void;
   onDeselect?: (value: SingleType<ValueType>, option: OptionsType[number]) => void;
-  onInputKeyDown?: EventHandlerNonNull;
-  onClick?: EventHandlerNonNull;
+  onInputKeyDown?: EventHandler;
+  onClick?: EventHandler;
   onChange?: (value: ValueType, option: OptionsType[number] | OptionsType) => void;
-  onBlur?: EventHandlerNonNull;
-  onFocus?: EventHandlerNonNull;
-  onMousedown?: EventHandlerNonNull;
-  onMouseenter?: EventHandlerNonNull;
-  onMouseleave?: EventHandlerNonNull;
+  onBlur?: EventHandler;
+  onFocus?: EventHandler;
+  onMousedown?: EventHandler;
+  onMouseenter?: EventHandler;
+  onMouseleave?: EventHandler;
 
   // Motion
   choiceTransitionName?: string;
@@ -1326,7 +1327,7 @@ export default function generateSelector<
             getTriggerDOMNode={() => selectorDomRef.current}
           >
             <Selector
-              {...this.$props}
+              {...(this.$props as any)}
               domRef={selectorDomRef}
               prefixCls={prefixCls}
               inputElement={customizeInputElement}
diff --git a/tsconfig.json b/tsconfig.json
index 14c4d2a04..69de31759 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,6 @@
       "ant-design-vue/es/*": ["components/*"]
     },
     "strictNullChecks": false,
-    "strict": true,
     "moduleResolution": "node",
     "esModuleInterop": true,
     "experimentalDecorators": true,
diff --git a/v2-doc b/v2-doc
index e7db31900..17abe8a32 160000
--- a/v2-doc
+++ b/v2-doc
@@ -1 +1 @@
-Subproject commit e7db31900631a7da14f40b7f2ab0e3f266a26e00
+Subproject commit 17abe8a32a993726902f52e153f5470c1ffba02a