Fix Flowtyping

JedWatson · May 24, 2018 · 61f3cba · 61f3cba
1 parent 6202304
commit 61f3cba
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/docs/pages/upgradeGuide/props.js b/docs/pages/upgradeGuide/props.js
@@ -252,7 +252,7 @@ class PropChanges extends Component<
   { selectedOptions: Array<string>, filterValue: string }
 > {
   state = {
-    selectedOptions: allOptions.map(opt => opt.value),
+    selectedOptions: (allOptions.map(opt => opt.value): Array<string>),
     filterValue: filterOptions[0].value,
   };
 

diff --git a/rollup.config.js b/rollup.config.js
@@ -16,6 +16,7 @@ const globals = {
   'react-input-autosize': 'AutosizeInput',
   react: 'React',
 };
+// $FlowFixMe This should be inferred by Flow and manual casting does not work inside of this config.
 const external = Object.keys(globals);
 const babelOptions = () => {
   let result = {

diff --git a/src/Select.js b/src/Select.js
@@ -23,6 +23,7 @@ import {
 
 import {
   defaultComponents,
+  type PlaceholderOrValue,
   type SelectComponents,
   type SelectComponentsConfig,
 } from './components/index';
@@ -1141,7 +1142,7 @@ export default class Select extends Component<Props, State> {
       />
     );
   }
-  renderPlaceholderOrValue() {
+  renderPlaceholderOrValue(): ?PlaceholderOrValue {
     const {
       MultiValue,
       MultiValueContainer,

diff --git a/src/components/index.js b/src/components/index.js
@@ -1,5 +1,8 @@
 // @flow
-import type { ComponentType } from 'react';
+import {
+  type ComponentType,
+  type Element,
+} from 'react';
 import {
   type IndicatorContainerProps,
   type ContainerProps,
@@ -42,6 +45,11 @@ import Option, { type OptionProps } from './Option';
 import Placeholder, { type PlaceholderProps } from './Placeholder';
 import SingleValue, { type SingleValueProps } from './SingleValue';
 
+export type PlaceholderOrValue =
+  | Element<ComponentType<PlaceholderProps>>
+  | Element<ComponentType<SingleValueProps>>
+  | Array<Element<ComponentType<MultiValueProps>>>
+
 type IndicatorComponentType = ComponentType<IndicatorProps>;
 
 export type SelectComponents = {