chore(searchbar): improve type def

jdf2e · Dec 16, 2023 · 64bbe73 · 64bbe73
1 parent aec33ce
commit 64bbe73
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/packages/__VUE/searchbar/index.taro.vue b/src/packages/__VUE/searchbar/index.taro.vue
@@ -56,10 +56,9 @@
 import { toRefs, reactive, computed, ref, onMounted, PropType, Ref, CSSProperties } from 'vue';
 import { createComponent, renderIcon } from '@/packages/utils/create';
 import { CircleClose } from '@nutui/icons-vue-taro';
-import { TextAlign } from './type';
+import { SearchbarConfirmType, SearchbarInputAlign, SearchbarShape } from './types';
 import { useLocale } from '@/packages/utils/useLocale';
 const { create } = createComponent('searchbar');
-export type confirmTextType = 'send' | 'search' | 'next' | 'go' | 'done';
 
 const cN = 'NutSearchbar';
 
@@ -74,7 +73,7 @@ export default create({
       default: 'text'
     },
     shape: {
-      type: String,
+      type: String as PropType<SearchbarShape>,
       default: 'round'
     },
     maxLength: {
@@ -118,11 +117,11 @@ export default create({
       default: false
     },
     inputAlign: {
-      type: String,
+      type: String as PropType<SearchbarInputAlign>,
       default: 'left'
     },
     confirmType: {
-      type: String as PropType<confirmTextType>,
+      type: String as PropType<SearchbarConfirmType>,
       default: 'done'
     },
     safeAreaInsetBottom: {
@@ -222,7 +221,7 @@ export default create({
 
     const styleSearchbar = computed(() => {
       const style: CSSProperties = {
-        textAlign: props.inputAlign as TextAlign
+        textAlign: props.inputAlign
       };
       return style;
     });

diff --git a/src/packages/__VUE/searchbar/index.vue b/src/packages/__VUE/searchbar/index.vue
@@ -55,10 +55,10 @@
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, computed, onMounted, ref, Ref, CSSProperties } from 'vue';
+import { toRefs, reactive, computed, onMounted, ref, Ref, CSSProperties, PropType } from 'vue';
 import { createComponent, renderIcon } from '@/packages/utils/create';
 import { CircleClose } from '@nutui/icons-vue';
-import { TextAlign } from './type';
+import { SearchbarInputAlign, SearchbarShape } from './types';
 import { useLocale } from '@/packages/utils/useLocale';
 const { create } = createComponent('searchbar');
 
@@ -79,7 +79,7 @@ export default create({
       default: ''
     },
     shape: {
-      type: String,
+      type: String as PropType<SearchbarShape>,
       default: 'round'
     },
     maxLength: {
@@ -123,7 +123,7 @@ export default create({
       default: false
     },
     inputAlign: {
-      type: String,
+      type: String as PropType<SearchbarInputAlign>,
       default: 'left'
     },
     safeAreaInsetBottom: {
@@ -219,7 +219,7 @@ export default create({
 
     const styleSearchbar = computed(() => {
       const style: CSSProperties = {
-        textAlign: props.inputAlign as TextAlign
+        textAlign: props.inputAlign
       };
       return style;
     });
@@ -251,3 +251,4 @@ export default create({
   }
 });
 </script>
+./types
diff --git a/src/packages/__VUE/searchbar/type.ts b/src/packages/__VUE/searchbar/type.ts
diff --git a/src/packages/__VUE/searchbar/types.ts b/src/packages/__VUE/searchbar/types.ts
@@ -0,0 +1,3 @@
+export type SearchbarInputAlign = 'start' | 'end' | 'left' | 'right' | 'center' | 'justify' | 'match-parent';
+export type SearchbarConfirmType = 'send' | 'search' | 'next' | 'go' | 'done';
+export type SearchbarShape = 'round' | 'square';