Fix to allow combining allowedTypes, unwrapDisallowed in types

Closes GH-495. Closes GH-496. Reviewed-by: Christian Murphy <christian.murphy.42@gmail.com> Reviewed-by: Titus Wormer <tituswormer@gmail.com>
remarkjs · Oct 22, 2020 · 4dadaba · 4dadaba
1 parent e033f56
commit 4dadaba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/index.d.ts b/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 {

diff --git a/react-markdown-types-test.tsx b/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>
 )