chore: remove no-unused-vars

zmccc · Sep 17, 2021 · b3bb134 · b3bb134
1 parent fef297f
commit b3bb134
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 41 deletions.
diff --git a/example/src/MP4Page.tsx b/example/src/MP4Page.tsx
@@ -1,10 +1,5 @@
-import React, {useState, useLayoutEffect, useContext, useEffect} from 'react'
-import Player, {
-  MessageContext,
-  useMessageContextRef,
-  ACTIONS,
-  EVENTS,
-} from 'griffith'
+import React, {useState, useEffect} from 'react'
+import Player, {useMessageContextRef, ACTIONS, EVENTS} from 'griffith'
 import {useLocation} from 'react-router-dom'
 import Logo from './Logo'
 import {logEvent} from './utils'

diff --git a/packages/griffith-hls/src/VideoComponent.tsx b/packages/griffith-hls/src/VideoComponent.tsx
@@ -95,13 +95,13 @@ export default class VideoComponent extends Component<VideoProps> {
   render() {
     const {
       onRef,
-      /* eslint-disable no-unused-vars */
+      /* eslint-disable @typescript-eslint/no-unused-vars */
       currentQuality,
       useAutoQuality,
       src,
       sources,
       paused,
-      /* eslint-enable no-unused-vars */
+      /* eslint-enable @typescript-eslint/no-unused-vars */
       ...props
     } = this.props
     return (

diff --git a/packages/griffith-mp4/src/VideoComponent.tsx b/packages/griffith-mp4/src/VideoComponent.tsx
@@ -120,7 +120,7 @@ export default class Player extends Component<VideoProps> {
 
   render() {
     const {
-      /* eslint-disable no-unused-vars */
+      /* eslint-disable @typescript-eslint/no-unused-vars */
       src,
       onRef,
       currentQuality,
@@ -130,7 +130,7 @@ export default class Player extends Component<VideoProps> {
       paused,
       onTimeUpdate,
       onProgress,
-      /* eslint-enable no-unused-vars */
+      /* eslint-enable @typescript-eslint/no-unused-vars */
       ...props
     } = this.props
     return (

diff --git a/packages/griffith/src/components/Controller.tsx b/packages/griffith/src/components/Controller.tsx
@@ -20,7 +20,7 @@ export type ToggleType = 'button' | 'keyCode' | 'video' | null
 type ControllerProps = {
   standalone?: boolean
   isPlaying?: boolean
-  duration?: number
+  duration: number
   currentTime: number
   volume: number
   buffered?: number
@@ -97,8 +97,7 @@ class Controller extends Component<ControllerProps, State> {
   }
 
   shouldComponentUpdate(nextProps: ControllerProps) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    return this.props.show || nextProps.show
+    return this.props.show! || nextProps.show!
   }
 
   componentWillUnmount() {

diff --git a/packages/griffith/src/components/NormalVideo.tsx b/packages/griffith/src/components/NormalVideo.tsx
@@ -1,14 +1,24 @@
 import React from 'react'
+import {PlaySource} from '../types'
 
-const NormalVideo = (props: any) => {
+type NativeVideoProps = React.HTMLProps<HTMLVideoElement>
+type VideoProps = NativeVideoProps & {
+  paused: boolean
+  currentQuality: string
+  useAutoQuality: boolean
+  sources: PlaySource[]
+  onRef: (el: HTMLVideoElement | null) => void
+}
+
+const NormalVideo: React.FC<VideoProps> = (props) => {
   const {
     onRef,
-    /* eslint-disable no-unused-vars */
+    /* eslint-disable @typescript-eslint/no-unused-vars */
     paused,
     currentQuality,
     useAutoQuality,
     sources,
-    /* eslint-disable no-unused-vars */
+    /* eslint-disable @typescript-eslint/no-unused-vars */
     ...restProps
   } = props
   return <video {...restProps} ref={onRef} />

diff --git a/packages/griffith/src/components/Player.tsx b/packages/griffith/src/components/Player.tsx
@@ -389,7 +389,7 @@ class InnerPlayer extends Component<InnerPlayerProps, State> {
       !isPlaybackStarted && !isNeverPlayed && stateCurrentTime !== 0 // 播放结束，显示「重新播放」状态
     this.setState({currentTime})
     // TODO 想办法去掉这个实例方法调用
-    this.videoRef.current!.seek(currentTime)
+    this.videoRef.current?.seek(currentTime)
     if (isPlayEnded) {
       this.handlePlay()
     }

diff --git a/packages/griffith/src/components/Slider.tsx b/packages/griffith/src/components/Slider.tsx
@@ -1,9 +1,5 @@
-import React, {Component, MouseEvent} from 'react'
-import {
-  css,
-  StyleDeclaration,
-  StyleDeclarationMap,
-} from 'aphrodite/no-important'
+import React, {Component} from 'react'
+import {css, StyleDeclarationMap} from 'aphrodite/no-important'
 import clamp from 'lodash/clamp'
 import {ProgressDot as ProgressDotType} from '../types'
 import ProgressDot, {ProgressDotsProps} from './ProgressDot'

diff --git a/packages/griffith/src/components/Video.tsx b/packages/griffith/src/components/Video.tsx
@@ -46,6 +46,7 @@ type VideoProps = {
   onError: (...args: any[]) => any
   onEvent: (name: EVENTS, data?: unknown) => void
   currentPlaybackRate: PlaybackRate
+  useAutoQuality?: boolean
 }
 
 class Video extends Component<VideoProps> {
@@ -383,18 +384,27 @@ class Video extends Component<VideoProps> {
   }
 }
 
-export default React.forwardRef<any, VideoProps>((props, ref) => (
-  <VideoSourceContext.Consumer>
-    {({currentSrc, sources, currentQuality, format, currentPlaybackRate}) => (
-      <Video
-        ref={ref}
-        {...props}
-        src={currentSrc}
-        format={format}
-        sources={sources}
-        currentQuality={currentQuality}
-        currentPlaybackRate={currentPlaybackRate}
-      />
-    )}
-  </VideoSourceContext.Consumer>
-))
+type InjectedProps =
+  | 'src'
+  | 'format'
+  | 'sources'
+  | 'currentQuality'
+  | 'currentPlaybackRate'
+
+export default React.forwardRef<any, Omit<VideoProps, InjectedProps>>(
+  (props, ref) => (
+    <VideoSourceContext.Consumer>
+      {({currentSrc, sources, currentQuality, format, currentPlaybackRate}) => (
+        <Video
+          ref={ref}
+          {...props}
+          src={currentSrc}
+          format={format}
+          sources={sources}
+          currentQuality={currentQuality}
+          currentPlaybackRate={currentPlaybackRate}
+        />
+      )}
+    </VideoSourceContext.Consumer>
+  )
+)
diff --git a/packages/griffith/src/contexts/MessageContext.tsx b/packages/griffith/src/contexts/MessageContext.tsx
@@ -1,7 +1,6 @@
-import React, {useEffect, useLayoutEffect, useRef} from 'react'
+import React, {useLayoutEffect, useRef} from 'react'
 import EventEmitter from 'eventemitter3'
 import {
-  ACTIONS,
   EVENTS,
   ActionParamsMap,
   EventParamsMap,