Merge pull request #202 from yefu24324/master

fix: update safe type `Feature[]` to `Array<typeof Feature>`

Author: rick-hup

packages/motion/src/components/lazy-motion/context.ts

@@ -3,7 +3,7 @@ import { createContext } from '@/utils'
 import type { Ref } from 'vue'
 
 export type LazyMotionContext = {
-  features: Ref<Feature[]>
+  features: Ref<Array<typeof Feature>>
   strict: boolean
 }
 export const [useLazyMotionContext, lazyMotionContextProvider] = createContext<LazyMotionContext>('LazyMotionContext')

packages/motion/src/components/motion/utils.ts

@@ -12,7 +12,7 @@ type MotionCompProps = {
 }
 export interface MotionCreateOptions {
   forwardMotionProps?: boolean
-  features?: Feature[]
+  features?: Array<typeof Feature>
 }
 export function checkMotionIsHidden(instance: ComponentPublicInstance) {
   const isHidden = getMotionElement(instance.$el)?.style.display === 'none'
@@ -104,7 +104,7 @@ export function createMotionComponent(
     props: {
       ...MotionComponentProps,
       features: {
-        type: Object as PropType<Feature[] | Promise<Feature[]>>,
+        type: Object as PropType<Array<typeof Feature> | Promise<Array<typeof Feature>>>,
         default: () => (options.features || []),
       },
       as: { type: [String, Object], default: component || 'div' },
@@ -163,7 +163,7 @@ type MotionNameSpace = {
 } & MotionCompProps
 
 export function createMotionComponentWithFeatures(
-  features: Feature[] = [],
+  features: Array<typeof Feature> = [],
 ) {
   return new Proxy({} as unknown as MotionNameSpace, {
     get(target, prop) {

packages/motion/src/features/dom-animation.ts

@@ -9,10 +9,10 @@ import { FocusGesture } from '@/features/gestures/focus'
 // import { PanGesture } from '@/features/gestures/pan'
 import type { Feature } from '@/features/feature'
 
-export const domAnimation = [
+export const domAnimation: Array<typeof Feature> = [
   AnimationFeature,
   PressGesture,
   HoverGesture,
   InViewGesture,
   FocusGesture,
-] as unknown as Feature[]
+]

packages/motion/src/features/dom-max.ts

@@ -9,7 +9,7 @@ import { LayoutFeature } from '@/features/layout/layout'
 import { PanGesture } from '@/features/gestures/pan'
 import type { Feature } from '@/features/feature'
 
-export const domMax = [
+export const domMax: Array<typeof Feature> = [
   AnimationFeature,
   PressGesture,
   HoverGesture,
@@ -19,4 +19,4 @@ export const domMax = [
   PanGesture,
   DragGesture,
   LayoutFeature,
-] as unknown as Feature[]
+]

packages/motion/src/features/feature-manager.ts

@@ -7,9 +7,8 @@ export class FeatureManager {
   constructor(state: MotionState) {
     const { features = [], lazyMotionContext } = state.options
     const allFeatures = features.concat(lazyMotionContext.features.value)
-    this.features = allFeatures.map((Feature: any) => new Feature(state))
+    this.features = allFeatures.map(Feature => new Feature(state))
     // watch for lazy motion features
-    // @eslint-disable-next-line
     const featureInstances = this.features
     /**
      * Watch for lazy motion features

packages/motion/src/features/feature.ts

@@ -1,6 +1,6 @@
 import type { MotionState } from '@/state/motion-state'
 
-export abstract class Feature {
+export class Feature {
   state: MotionState
 
   constructor(state: MotionState) {

packages/motion/src/state/motion-state.ts

@@ -30,7 +30,7 @@ export class MotionState {
   public parent?: MotionState
   public options: Options & {
     animatePresenceContext?: PresenceContext
-    features?: Feature[]
+    features?: Array<typeof Feature>
     lazyMotionContext?: LazyMotionContext
   }