Error in type definitions for react-intl library

After upgrading to the latest type definition for react-intl library (react-intl_v2.x.x.js) in our project we started getting errors when using components wrapped with injectIntl HOC. Example error message states:

Error: src/components/header/Header.jsx:42
                     v-------------
 42:                 <NavigationBar
 43:                     redirectToRoute={this.redirectToRoute}
 44:                     {...this.state}
 45:                 />
                     -^ props of React element `NavigationBar`. This type is incompatible with
163:   IntlInjectedComponentClass<$Diff<OriginalProps, InjectIntlProvidedProps>>;
                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ empty. See lib: flow-typed/npm/react-intl_v2.x.x.js:163

From what I’ve managed to investigate it looks like$Diff produces an empty type in following definition:

declare function injectIntl<OriginalProps: InjectIntlProvidedProps>
  (
    component: React$ComponentType<OriginalProps>,
    options?: InjectIntlOtions,
  ):
  IntlInjectedComponentClass<$Diff<OriginalProps, InjectIntlProvidedProps>>;
``` - it seems that the type of `OriginalProps` is incorrect - it's the same as the second parameter to `$Diff` and I think it should be changed to the type of original properties of component passed to this function.

[callumlocke]

That PR is merged. Not sure if this can be closed now, or if other aspects of this issue remain unfixed?

So I think this issue is partially fixed now, but the 2nd point in @TomiS’s comment is still a problem, i.e. that injectIntl can’t be used with stateless functional components without causing type errors (if I’ve understood correctly).

[apdaros]

Thanks, @TomiS! Since it is currently impacting our team, we thought about opening a PR with your suggestion.