fix: remove excluded props types from child components (#3657)

epicmaxco · Aug 3, 2023 · 66c8cbd · 66c8cbd
1 parent fdef6ac
commit 66c8cbd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/packages/ui/src/components/va-rating/VaRating.vue b/packages/ui/src/components/va-rating/VaRating.vue
@@ -60,18 +60,19 @@ import { useComponentPresetProp } from '../../composables/useComponentPreset'
 import VaRatingItem from './components/VaRatingItem/VaRatingItem.vue'
 import VaRatingItemNumberButton from './components/VaRatingItemNumberButton.vue'
 
-const VaRatingItemProps = extractComponentProps(VaRatingItem)
+const VaRatingItemProps = extractComponentProps(VaRatingItem, ['modelValue', 'itemNumber'])
 const VaRatingItemNumberButtonProps = extractComponentProps(VaRatingItemNumberButton, ['modelValue', 'itemNumber'])
 
 export default defineComponent({
   name: 'VaRating',
   props: {
+    ...VaRatingItemNumberButtonProps,
     ...useRatingProps,
     ...useVaRatingColorsProps,
     ...useFormFieldProps,
     ...VaRatingItemProps,
-    ...VaRatingItemNumberButtonProps,
     ...useComponentPresetProp,
+    modelValue: { type: Number, default: 0 },
     numbers: { type: Boolean, default: false },
     halves: { type: Boolean, default: false },
     max: { type: Number, default: 5 },

diff --git a/packages/ui/src/utils/component-options/extract-component-options.ts b/packages/ui/src/utils/component-options/extract-component-options.ts
@@ -16,7 +16,7 @@ import { getComponentProps } from './resolve-component-props'
  * }
  * ```
  */
-export function extractComponentProps<T extends DefineComponentOptions> (component: T, ignoreProps?: string[]): ExtractComponentProps<T> {
+export function extractComponentProps<T extends DefineComponentOptions, IgnoreProps extends string = ''> (component: T, ignoreProps?: IgnoreProps[]): Omit<ExtractComponentProps<T>, IgnoreProps> {
   const props: any = getComponentProps(component as any)
 
   // TODO: Not sure if it is a good idea to handle ignore props here
@@ -25,7 +25,7 @@ export function extractComponentProps<T extends DefineComponentOptions> (compone
     return Object
       .keys(props)
       .reduce<any>((acc, propName) => {
-        if (ignoreProps.includes(propName)) { return acc }
+        if (ignoreProps.includes(propName as unknown as IgnoreProps)) { return acc }
 
         if (props[propName] === undefined) { return acc }
 

diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
@@ -43,6 +43,9 @@
     "src/**/*.spec.disabled.ts",
     "src/components/wip-*/**.*",
     "src/services/api-docs",
-    "src/**/*.demo.vue"
+    "src/**/*.demo.vue",
+    "src/**/*.stories.ts",
+    "src/**/*.new.stories.ts",
+    ".storybook",
   ]
 }