React 带属性 + Redux connect() 的高阶组件正确 Typing 方式

import React from 'react';
import { connect } from 'react-redux';

import { increaseCount } from './actions';

const withPropsAndConnect = (Component) => {
  const injectedProps = {
    /* Injected props */
  };

  class WrappedComponent extends React.Component {
    componentDidUpdate() {
      /* ....... */
    }

    render() {
      const childProps = {
        ...injectedProps,
        ...this.props
      };
      return <Component {...childProps} />
    }
  }

  const mapStateToProps = (state) => {
    return {
      count: state.rootReducer.count,
      // redux mapStateToProps
    };
  };

  const mapDispatchToProps = {
    increase: () => increaseCount()
  };

  return connect(mapStateToProps, mapDispatchToProps)(WrappedComponent);
}

import React from 'react';
import { connect } from 'react-redux';
import { Diff } from 'utility-types';

import { increaseCount } from './actions';
import { AppState } from './store/types';         // redux store 状态树类型

export const withPropsAndConnect = <BaseProps extends object>(Component: React.ComponentType<BaseProps>) => {
  const mapStateToProps = (state: AppState) => ({
    count: state.rootReducer.count,
  });
  const mapDispatchToProps = {
    increase: () => increaseCount()
  };

  const injectedProps: InjectProps = {
    // ...
  };

  type IStateProps = ReturnType<typeof mapStateToProps>;
  type IDispatchProps = typeof mapDispatchToProps;

  type ComponentProps = IStateProps & IDispatchProps & WrappedComponentProps;
  type ComponentState = WrapperBaseStates;

  class WrappedComponent extends React.Component<ComponentProps, ComponentState> {
    constructor(props: ComponentProps) {
      super(props);
  
      this.state = { /* ... */ };
  
    componentDidUpdate(prevProps: ComponentProps) {
      /* ... */
    }
  
    render() {
      const childProps = {
        ...injectedProps,
        ...this.props
      };
      return (
        <Component
          {...(injectedProps as BaseProps)}
        />
      );
    }
  }

  type HOCProps = Diff<BaseProps, object>;

  return connect<IStateProps, IDispatchProps, HOCProps, AppState>
      (mapStateToProps, mapDispatchToProps)(WrappedComponent);
}