Switch from DraftFeatureFlags to gkx()

aforismesen · facebook-github-bot · commit c029f330e1d8 · 2018-01-25T17:20:31.000-08:00
Reviewed By: flarnie

Differential Revision: D6811498

fbshipit-source-id: f2a9128ea161c9a68d2d7e55ad23d1d5a3823069
diff --git a/src/component/base/DraftEditor.react.js b/src/component/base/DraftEditor.react.js
@@ -26,7 +26,7 @@ const DraftEditorContents = require('DraftEditorContents.react');
 const DraftEditorDragHandler = require('DraftEditorDragHandler');
 const DraftEditorEditHandler = require('DraftEditorEditHandler');
 const DraftEditorPlaceholder = require('DraftEditorPlaceholder.react');
-const DraftFeatureFlags = require('DraftFeatureFlags');
+const DraftODS = require('DraftODS');
 const EditorState = require('EditorState');
 const React = require('React');
 const ReactDOM = require('ReactDOM');
@@ -39,6 +39,7 @@ const emptyFunction = require('emptyFunction');
 const generateRandomKey = require('generateRandomKey');
 const getDefaultKeyBinding = require('getDefaultKeyBinding');
 const getScrollPosition = require('getScrollPosition');
+const gkx = require('gkx');
 const invariant = require('invariant');
 const nullthrows = require('nullthrows');
 
@@ -62,6 +63,8 @@ type State = {
   contentsKey: number,
 };
 
+let didInitODS = false;
+
 /**
  * `DraftEditor` is the root editor component. It composes a `contentEditable`
  * div, and provides a wide variety of useful function props for managing the
@@ -176,7 +179,7 @@ class DraftEditor extends React.Component<DraftEditorProps, State> {
     return e => {
       if (!this.props.readOnly) {
         const method = this._handler && this._handler[eventName];
-        if (flushSyncSupported && DraftFeatureFlags.draft_js_flush_sync) {
+        if (flushSyncSupported && gkx('draft_js_flush_sync')) {
           method && ReactDOM.flushSync(() => method(this, e));
         } else {
           method && method(this, e);
@@ -323,6 +326,10 @@ class DraftEditor extends React.Component<DraftEditorProps, State> {
   }
 
   componentDidMount(): void {
+    if (!didInitODS && gkx('draft_ods_enabled')) {
+      didInitODS = true;
+      DraftODS.init();
+    }
     this.setMode('edit');
 
     /**
diff --git a/src/component/handlers/composition/DraftEditorCompositionHandler.js b/src/component/handlers/composition/DraftEditorCompositionHandler.js
@@ -15,12 +15,12 @@
 
 import type DraftEditor from 'DraftEditor.react';
 
-const DraftFeatureFlags = require('DraftFeatureFlags');
 const DraftModifier = require('DraftModifier');
 const EditorState = require('EditorState');
 const Keys = require('Keys');
 
 const getEntityKeyForSelection = require('getEntityKeyForSelection');
+const gkx = require('gkx');
 const isEventHandled = require('isEventHandled');
 const isSelectionAtLeafStart = require('isSelectionAtLeafStart');
 
@@ -163,7 +163,7 @@ var DraftEditorCompositionHandler = {
 
     if (composedChars) {
       if (
-        DraftFeatureFlags.draft_handlebeforeinput_composed_text &&
+        gkx('draft_handlebeforeinput_composed_text') &&
         editor.props.handleBeforeInput &&
         isEventHandled(
           editor.props.handleBeforeInput(composedChars, editorState),
diff --git a/src/component/handlers/edit/editOnInput.js b/src/component/handlers/edit/editOnInput.js
@@ -15,13 +15,13 @@
 
 import type DraftEditor from 'DraftEditor.react';
 
-const DraftFeatureFlags = require('DraftFeatureFlags');
 var DraftModifier = require('DraftModifier');
 var DraftOffsetKey = require('DraftOffsetKey');
 var EditorState = require('EditorState');
 var UserAgent = require('UserAgent');
 
 var findAncestorOffsetKey = require('findAncestorOffsetKey');
+const gkx = require('gkx');
 var nullthrows = require('nullthrows');
 
 var isGecko = UserAgent.isEngine('Gecko');
@@ -54,7 +54,7 @@ function editOnInput(editor: DraftEditor): void {
     anchorNode.nodeType !== Node.TEXT_NODE &&
     anchorNode.nodeType !== Node.ELEMENT_NODE;
 
-  if (DraftFeatureFlags.draft_killswitch_allow_nontextnodes) {
+  if (gkx('draft_killswitch_allow_nontextnodes')) {
     if (isNotTextNode) {
       return;
     }
diff --git a/src/component/utils/DraftFeatureFlags-core.js b/src/component/utils/DraftFeatureFlags-core.js
diff --git a/src/model/encoding/__tests__/convertFromHTMLToContentBlocks-test.js b/src/model/encoding/__tests__/convertFromHTMLToContentBlocks-test.js
@@ -59,10 +59,8 @@ const normalizeBlock = block => {
 };
 
 const toggleExperimentalTreeDataSupport = enabled => {
-  jest.doMock('DraftFeatureFlags', () => {
-    return {
-      draft_tree_data_support: enabled,
-    };
+  jest.doMock('gkx', () => name => {
+    return name === 'draft_tree_data_support' ? enabled : false;
   });
 };
 
diff --git a/src/model/encoding/__tests__/convertFromRawToDraftState-test.js b/src/model/encoding/__tests__/convertFromRawToDraftState-test.js
@@ -17,10 +17,8 @@ jest.disableAutomock();
 const convertFromRawToDraftState = require('convertFromRawToDraftState');
 
 const toggleExperimentalTreeDataSupport = enabled => {
-  jest.doMock('DraftFeatureFlags', () => {
-    return {
-      draft_tree_data_support: enabled,
-    };
+  jest.doMock('gkx', () => name => {
+    return name === 'draft_tree_data_support' ? enabled : false;
   });
 };
 
diff --git a/src/model/encoding/convertFromHTMLToContentBlocks.js b/src/model/encoding/convertFromHTMLToContentBlocks.js
@@ -25,18 +25,18 @@ const ContentBlock = require('ContentBlock');
 const ContentBlockNode = require('ContentBlockNode');
 const DefaultDraftBlockRenderMap = require('DefaultDraftBlockRenderMap');
 const DraftEntity = require('DraftEntity');
-const DraftFeatureFlags = require('DraftFeatureFlags');
 const Immutable = require('immutable');
 const {Set} = require('immutable');
 const URI = require('URI');
 
 const cx = require('cx');
 const generateRandomKey = require('generateRandomKey');
 const getSafeBodyFromHTML = require('getSafeBodyFromHTML');
+const gkx = require('gkx');
 const invariant = require('invariant');
 const sanitizeDraftText = require('sanitizeDraftText');
 
-const experimentalTreeDataSupport = DraftFeatureFlags.draft_tree_data_support;
+const experimentalTreeDataSupport = gkx('draft_tree_data_support');
 
 type Block = {
   type: DraftBlockType,
diff --git a/src/model/encoding/convertFromRawToDraftState.js b/src/model/encoding/convertFromRawToDraftState.js
@@ -23,7 +23,6 @@ const ContentBlock = require('ContentBlock');
 const ContentBlockNode = require('ContentBlockNode');
 const ContentState = require('ContentState');
 const DraftEntity = require('DraftEntity');
-const DraftFeatureFlags = require('DraftFeatureFlags');
 const DraftTreeAdapter = require('DraftTreeAdapter');
 const Immutable = require('immutable');
 const SelectionState = require('SelectionState');
@@ -32,9 +31,10 @@ const createCharacterList = require('createCharacterList');
 const decodeEntityRanges = require('decodeEntityRanges');
 const decodeInlineStyleRanges = require('decodeInlineStyleRanges');
 const generateRandomKey = require('generateRandomKey');
+const gkx = require('gkx');
 const invariant = require('invariant');
 
-const experimentalTreeDataSupport = DraftFeatureFlags.draft_tree_data_support;
+const experimentalTreeDataSupport = gkx('draft_tree_data_support');
 
 const {List, Map, OrderedMap} = Immutable;
 
diff --git a/src/model/immutable/ContentState.js b/src/model/immutable/ContentState.js
@@ -24,16 +24,16 @@ const CharacterMetadata = require('CharacterMetadata');
 const ContentBlock = require('ContentBlock');
 const ContentBlockNode = require('ContentBlockNode');
 const DraftEntity = require('DraftEntity');
-const DraftFeatureFlags = require('DraftFeatureFlags');
 const Immutable = require('immutable');
 const SelectionState = require('SelectionState');
 
 const generateRandomKey = require('generateRandomKey');
+const gkx = require('gkx');
 const sanitizeDraftText = require('sanitizeDraftText');
 
 const {List, Record, Repeat} = Immutable;
 
-const experimentalTreeDataSupport = DraftFeatureFlags.draft_tree_data_support;
+const experimentalTreeDataSupport = gkx('draft_tree_data_support');
 
 const defaultRecord: {
   entityMap: ?any,
diff --git a/src/model/modifier/AtomicBlockUtils.js b/src/model/modifier/AtomicBlockUtils.js
@@ -20,16 +20,16 @@ const BlockMapBuilder = require('BlockMapBuilder');
 const CharacterMetadata = require('CharacterMetadata');
 const ContentBlock = require('ContentBlock');
 const ContentBlockNode = require('ContentBlockNode');
-const DraftFeatureFlags = require('DraftFeatureFlags');
 const DraftModifier = require('DraftModifier');
 const EditorState = require('EditorState');
 const Immutable = require('immutable');
 const SelectionState = require('SelectionState');
 
 const generateRandomKey = require('generateRandomKey');
+const gkx = require('gkx');
 const moveBlockInContentState = require('moveBlockInContentState');
 
-const experimentalTreeDataSupport = DraftFeatureFlags.draft_tree_data_support;
+const experimentalTreeDataSupport = gkx('draft_tree_data_support');
 const ContentBlockRecord = experimentalTreeDataSupport
   ? ContentBlockNode
   : ContentBlock;
diff --git a/src/model/modifier/DraftModifier.js b/src/model/modifier/DraftModifier.js
@@ -23,12 +23,12 @@ import type {Map} from 'immutable';
 
 var CharacterMetadata = require('CharacterMetadata');
 var ContentStateInlineStyle = require('ContentStateInlineStyle');
-const DraftFeatureFlags = require('DraftFeatureFlags');
 var Immutable = require('immutable');
 
 var applyEntityToContentState = require('applyEntityToContentState');
 var getCharacterRemovalRange = require('getCharacterRemovalRange');
 var getContentStateFragment = require('getContentStateFragment');
+var gkx = require('gkx');
 var insertFragmentIntoContentState = require('insertFragmentIntoContentState');
 var insertTextIntoContentState = require('insertTextIntoContentState');
 var invariant = require('invariant');
@@ -171,7 +171,7 @@ var DraftModifier = {
       }
     }
     let adjustedRemovalRange = rangeToRemove;
-    if (DraftFeatureFlags.draft_segmented_entities_behavior) {
+    if (gkx('draft_segmented_entities_behavior')) {
       // Adjust the selection to properly delete segemented and immutable
       // entities
       adjustedRemovalRange = getCharacterRemovalRange(
diff --git a/src/model/modifier/__tests__/AtomicBlockUtils-test.js b/src/model/modifier/__tests__/AtomicBlockUtils-test.js
@@ -32,10 +32,8 @@ const ENTITY_KEY = Entity.create('TOKEN', 'MUTABLE');
 const CHARACTER = ' ';
 
 const toggleExperimentalTreeDataSupport = enabled => {
-  jest.doMock('DraftFeatureFlags', () => {
-    return {
-      draft_tree_data_support: enabled,
-    };
+  jest.doMock('gkx', () => name => {
+    return name === 'draft_tree_data_support' ? enabled : false;
   });
 };
 
diff --git a/src/model/paste/DraftPasteProcessor.js b/src/model/paste/DraftPasteProcessor.js
@@ -21,17 +21,17 @@ import type {EntityMap} from 'EntityMap';
 const CharacterMetadata = require('CharacterMetadata');
 const ContentBlock = require('ContentBlock');
 const ContentBlockNode = require('ContentBlockNode');
-const DraftFeatureFlags = require('DraftFeatureFlags');
 const Immutable = require('immutable');
 
 const convertFromHTMLtoContentBlocks = require('convertFromHTMLToContentBlocks');
 const generateRandomKey = require('generateRandomKey');
 const getSafeBodyFromHTML = require('getSafeBodyFromHTML');
+const gkx = require('gkx');
 const sanitizeDraftText = require('sanitizeDraftText');
 
 const {List, Repeat} = Immutable;
 
-const experimentalTreeDataSupport = DraftFeatureFlags.draft_tree_data_support;
+const experimentalTreeDataSupport = gkx('draft_tree_data_support');
 const ContentBlockRecord = experimentalTreeDataSupport
   ? ContentBlockNode
   : ContentBlock;
diff --git a/src/model/paste/__tests__/DraftPasteProcessor-test.js b/src/model/paste/__tests__/DraftPasteProcessor-test.js
@@ -54,10 +54,8 @@ const CUSTOM_BLOCK_MAP = Map({
 const EMPTY_CHAR_METADATA = OrderedSet();
 
 const toggleExperimentalTreeDataSupport = enabled => {
-  jest.doMock('DraftFeatureFlags', () => {
-    return {
-      draft_tree_data_support: enabled,
-    };
+  jest.doMock('gkx', () => name => {
+    return name === 'draft_tree_data_support' ? enabled : false;
   });
 };
 
diff --git a/src/stubs/DraftODS.js b/src/stubs/DraftODS.js
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule DraftODS
+ */
+
+'use strict';
+
+module.exports = {
+  init: function() {},
+};
diff --git a/src/stubs/gkx.js b/src/stubs/gkx.js
@@ -6,13 +6,13 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @providesModule DraftFeatureFlags
+ * @providesModule gkx
  * @format
  * @flow
  */
 
 'use strict';
 
-var DraftFeatureFlags = require('DraftFeatureFlags-core');
-
-module.exports = DraftFeatureFlags;
+module.exports = function(name) {
+  return false;
+};
