refactor: remove redundant pick function

vuetifyjs · Feb 19, 2025 · a438986 · a438986
1 parent 4df71de
commit a438986
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 25 deletions.
diff --git a/packages/vuetify/src/components/VInput/VInput.tsx b/packages/vuetify/src/components/VInput/VInput.tsx
@@ -16,7 +16,7 @@ import { makeValidationProps, useValidation } from '@/composables/validation'
 
 // Utilities
 import { computed } from 'vue'
-import { EventProp, genericComponent, getUid, only, propsFactory, useRender } from '@/util'
+import { EventProp, genericComponent, getUid, pick, propsFactory, useRender } from '@/util'
 
 // Types
 import type { ComputedRef, PropType, Ref } from 'vue'
@@ -64,7 +64,7 @@ export const makeVInputProps = propsFactory({
 
   ...makeComponentProps(),
   ...makeDensityProps(),
-  ...only(makeDimensionProps(), [
+  ...pick(makeDimensionProps(), [
     'maxWidth',
     'minWidth',
     'width',

diff --git a/packages/vuetify/src/components/VOtpInput/VOtpInput.tsx b/packages/vuetify/src/components/VOtpInput/VOtpInput.tsx
@@ -15,7 +15,7 @@ import { useProxiedModel } from '@/composables/proxiedModel'
 
 // Utilities
 import { computed, nextTick, ref, watch } from 'vue'
-import { filterInputAttrs, focusChild, genericComponent, only, propsFactory, useRender } from '@/util'
+import { filterInputAttrs, focusChild, genericComponent, pick, propsFactory, useRender } from '@/util'
 
 // Types
 import type { PropType } from 'vue'
@@ -50,7 +50,7 @@ export const makeVOtpInputProps = propsFactory({
 
   ...makeDimensionProps(),
   ...makeFocusProps(),
-  ...only(makeVFieldProps({
+  ...pick(makeVFieldProps({
     variant: 'outlined' as const,
   }), [
     'baseColor',

diff --git a/packages/vuetify/src/components/VStepper/VStepper.tsx b/packages/vuetify/src/components/VStepper/VStepper.tsx
@@ -19,7 +19,7 @@ import { IconValue } from '@/composables/icons'
 
 // Utilities
 import { computed, toRefs } from 'vue'
-import { genericComponent, getPropertyFromItem, only, propsFactory, useRender } from '@/util'
+import { genericComponent, getPropertyFromItem, pick, propsFactory, useRender } from '@/util'
 
 // Types
 import type { PropType } from 'vue'
@@ -79,7 +79,7 @@ export const makeVStepperProps = propsFactory({
     selectedClass: 'v-stepper-item--selected',
   }),
   ...makeVSheetProps(),
-  ...only(makeVStepperActionsProps(), ['prevText', 'nextText']),
+  ...pick(makeVStepperActionsProps(), ['prevText', 'nextText']),
 }, 'VStepper')
 
 export const VStepper = genericComponent<VStepperSlots>()({

diff --git a/packages/vuetify/src/components/VTimeline/VTimeline.tsx b/packages/vuetify/src/components/VTimeline/VTimeline.tsx
@@ -11,7 +11,7 @@ import { makeThemeProps, provideTheme } from '@/composables/theme'
 
 // Utilities
 import { computed, toRef } from 'vue'
-import { convertToUnit, genericComponent, only, propsFactory, useRender } from '@/util'
+import { convertToUnit, genericComponent, pick, propsFactory, useRender } from '@/util'
 
 // Types
 import type { Prop } from 'vue'
@@ -52,7 +52,7 @@ export const makeVTimelineProps = propsFactory({
     validator: (v: any) => ['start', 'end', 'both'].includes(v),
   } as Prop<TimelineTruncateLine>,
 
-  ...only(makeVTimelineItemProps({
+  ...pick(makeVTimelineItemProps({
     lineInset: 0,
   }), ['dotColor', 'fillDot', 'hideOpposite', 'iconColor', 'lineInset', 'size']),
   ...makeComponentProps(),

diff --git a/packages/vuetify/src/labs/VFileUpload/VFileUpload.tsx b/packages/vuetify/src/labs/VFileUpload/VFileUpload.tsx
@@ -19,7 +19,7 @@ import { useProxiedModel } from '@/composables/proxiedModel'
 
 // Utilities
 import { onMounted, onUnmounted, ref, shallowRef } from 'vue'
-import { filterInputAttrs, genericComponent, only, propsFactory, useRender, wrapInArray } from '@/util'
+import { filterInputAttrs, genericComponent, pick, propsFactory, useRender, wrapInArray } from '@/util'
 
 // Types
 import type { PropType, VNode } from 'vue'
@@ -79,7 +79,7 @@ export const makeVFileUploadProps = propsFactory({
 
   ...makeDelayProps(),
   ...makeDensityProps(),
-  ...only(makeVDividerProps({
+  ...pick(makeVDividerProps({
     length: 150,
   }), ['length', 'thickness', 'opacity']),
   ...makeVSheetProps(),

diff --git a/packages/vuetify/src/util/helpers.ts b/packages/vuetify/src/util/helpers.ts
@@ -216,10 +216,9 @@ export function pick<
 > (obj: T, paths: U[]): MaybePick<T, U> {
   const found: any = {}
 
-  const keys = new Set(Object.keys(obj))
-  for (const path of paths) {
-    if (keys.has(path)) {
-      found[path] = obj[path]
+  for (const key of paths) {
+    if (Object.hasOwn(obj, key)) {
+      found[key] = obj[key]
     }
   }
 
@@ -273,17 +272,6 @@ export function omit<
   return clone
 }
 
-export function only<
-  T extends object,
-  U extends Extract<keyof T, string>
-> (obj: T, include: U[]): Pick<T, U> {
-  const clone = {} as T
-
-  include.forEach(prop => clone[prop] = obj[prop])
-
-  return clone
-}
-
 const onRE = /^on[^a-z]/
 export const isOn = (key: string) => onRE.test(key)