Fix to allow combining allowedTypes, unwrapDisallowed in types

Closes GH-495.
Closes GH-496.

Reviewed-by: Christian Murphy <[email protected]>
Reviewed-by: Titus Wormer <[email protected]>

Author: js-williams

index.d.ts

@@ -45,6 +45,7 @@ declare namespace ReactMarkdown {
     readonly renderers?: {[nodeType: string]: ElementType}
     readonly astPlugins?: PluggableList
     readonly plugins?: PluggableList
+    readonly unwrapDisallowed?: boolean
   }
 
   interface SourceProp {
@@ -62,7 +63,6 @@ declare namespace ReactMarkdown {
 
   interface DisallowedTypesProp {
     readonly disallowedTypes: NodeType[]
-    readonly unwrapDisallowed?: boolean
   }
 
   interface AllowDangerousHtmlProp {

react-markdown-types-test.tsx

@@ -23,14 +23,13 @@ test = (
   </ReactMarkdown>
 )
 test = (
-  // $ExpectError
-  <ReactMarkdown allowedTypes={['heading']} disallowedTypes={['heading']}>
+  <ReactMarkdown allowedTypes={['heading']} unwrapDisallowed>
     # header
   </ReactMarkdown>
 )
 test = (
   // $ExpectError
-  <ReactMarkdown allowedTypes={['heading']} unwrapDisallowed>
+  <ReactMarkdown allowedTypes={['heading']} disallowedTypes={['heading']}>
     # header
   </ReactMarkdown>
 )