fix(types): input prefix prop types (vueComponent#2880)

ifengjin · Sep 23, 2020 · 12afa05 · 12afa05
1 parent 0367f3e
commit 12afa05
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/types/input/input-search.d.ts b/types/input/input-search.d.ts
@@ -2,24 +2,23 @@
 // Definitions by: akki-jat <https://github.com/akki-jat>
 // Definitions: https://github.com/vueComponent/ant-design-vue/types
 
-import { AntdComponent, AntdProps } from '../component';
+import { AntdComponent } from '../component';
 import { VNodeChild } from 'vue';
 import { InputProps } from './input';
 
 export declare class InputSearch extends AntdComponent {
-  $props: AntdProps &
-    InputProps & {
-      /**
-       * to show an enter button after input
-       * @default false
-       * @type any (boolean | slot)
-       */
-      enterButton?: boolean | VNodeChild | JSX.Element;
+  $props: InputProps & {
+    /**
+     * to show an enter button after input
+     * @default false
+     * @type any (boolean | slot)
+     */
+    enterButton?: boolean | VNodeChild | JSX.Element;
 
-      /**
-       * Callback when search is clicked or enter is pressed
-       * @type Function
-       */
-      onSearch?: (value: string | number, event: Event) => void;
-    };
+    /**
+     * Callback when search is clicked or enter is pressed
+     * @type Function
+     */
+    onSearch?: (value: string | number, event: Event) => void;
+  };
 }
diff --git a/types/input/input.d.ts b/types/input/input.d.ts
@@ -9,7 +9,7 @@ import { TextArea } from './textarea';
 import { Password } from './password';
 import { VNodeChild } from 'vue';
 
-export type InputProps = {
+export type InputProps = Omit<AntdProps, 'prefix'> & {
   /**
    * The label text displayed after (on the right side of) the input field.
    * @type any (string | slot)
@@ -83,5 +83,5 @@ export declare class Input extends AntdComponent {
   static Search: typeof InputSearch;
   static TextArea: typeof TextArea;
   static Password: typeof Password;
-  $props: AntdProps & InputProps;
+  $props: InputProps;
 }
diff --git a/types/input/password.d.ts b/types/input/password.d.ts
@@ -2,16 +2,15 @@
 // Definitions by: akki-jat <https://github.com/akki-jat>
 // Definitions: https://github.com/vueComponent/ant-design-vue/types
 
-import { AntdComponent, AntdProps } from '../component';
+import { AntdComponent } from '../component';
 import { InputProps } from './input';
 
 export declare class Password extends AntdComponent {
-  $props: AntdProps &
-    Omit<InputProps, 'type' | 'suffix'> & {
-      /**
-       * Whether show toggle button
-       * @default true
-       */
-      visibilityToggle?: boolean;
-    };
+  $props: Omit<InputProps, 'type' | 'suffix'> & {
+    /**
+     * Whether show toggle button
+     * @default true
+     */
+    visibilityToggle?: boolean;
+  };
 }