Making DraftBlockType less restrictive

Summary:
DraftBlockType needs to be less strict in order to allow user defined block types however we also want to retain a way to identify our core draft blocks.

fixes: facebookarchive/draft-js#1453
Closes facebookarchive/draft-js#1480

Differential Revision: D6215628

fbshipit-source-id: e4647bf2bafe9adb7788740ec64c1445e307e632

src/model/constants/DraftBlockType.js

@@ -16,7 +16,7 @@
 /**
  * The list of default valid block types.
  */
-export type DraftBlockType =
+export type CoreDraftBlockType =
   | 'unstyled'
   | 'paragraph'
   | 'header-one'
@@ -30,3 +30,10 @@ export type DraftBlockType =
   | 'blockquote'
   | 'code-block'
   | 'atomic';
+
+/**
+ * User defined types can be of any valid string.
+ */
+export type CustomBlockType = string;
+
+export type DraftBlockType = CoreDraftBlockType | CustomBlockType;

src/model/immutable/ContentBlock.js

@@ -26,7 +26,7 @@ const {List, Map, OrderedSet, Record, Repeat} = Immutable;
 const EMPTY_SET = OrderedSet();
 
 type ContentBlockConfig = {
-  key?: string,
+  key?: DraftBlockType,
   type?: string,
   text?: string,
   characterList?: List<CharacterMetadata>,

src/model/immutable/DefaultDraftBlockRenderMap.js

@@ -13,18 +13,24 @@
 
 'use strict';
 
-import type {DraftBlockRenderMap} from 'DraftBlockRenderMap';
+import type {DraftBlockRenderConfig} from 'DraftBlockRenderConfig';
+import type {CoreDraftBlockType} from 'DraftBlockType';
 
 const {Map} = require('immutable');
 const React = require('React');
 
 const cx = require('cx');
 
+type DefaultCoreDraftBlockRenderMap = Map<
+  CoreDraftBlockType,
+  DraftBlockRenderConfig,
+>;
+
 const UL_WRAP = <ul className={cx('public/DraftStyleDefault/ul')} />;
 const OL_WRAP = <ol className={cx('public/DraftStyleDefault/ol')} />;
 const PRE_WRAP = <pre className={cx('public/DraftStyleDefault/pre')} />;
 
-const DefaultDraftBlockRenderMap: DraftBlockRenderMap = Map({
+const DefaultDraftBlockRenderMap: DefaultCoreDraftBlockRenderMap = Map({
   'header-one': {
     element: 'h1',
   },

src/model/immutable/DraftBlockRenderMap.js

@@ -14,7 +14,9 @@
 'use strict';
 
 import type {DraftBlockRenderConfig} from 'DraftBlockRenderConfig';
-import type {DraftBlockType} from 'DraftBlockType';
 import type {Map} from 'immutable';
 
-export type DraftBlockRenderMap = Map<DraftBlockType, DraftBlockRenderConfig>;
+// We should be able to be more specific on the key type
+// once we upgrade to immutable v4
+// https://github.com/facebook/immutable-js/issues/1371
+export type DraftBlockRenderMap = Map<any, DraftBlockRenderConfig>;