Merge remote-tracking branch 'upstream/master' into iframes

packages/react-dom/src/client/ReactDOMSelection.js

@@ -13,7 +13,7 @@ import {TEXT_NODE} from '../shared/HTMLNodeType';
  * @param {DOMElement} outerNode
  * @return {?object}
  */
-function getModernOffsets(outerNode) {
+export function getOffsets(outerNode) {
   var win = window;
   if (outerNode.ownerDocument && outerNode.ownerDocument.defaultView) {
     win = outerNode.ownerDocument.defaultView;
@@ -156,7 +156,7 @@ export function getModernOffsetsFromPoints(
  * @param {DOMElement|DOMTextNode} node
  * @param {object} offsets
  */
-function setModernOffsets(node, offsets) {
+export function setOffsets(node, offsets) {
   var doc = node.ownerDocument || document;
 
   if (!doc.defaultView.getSelection) {

packages/react-dom/src/client/ReactInputSelection.js

@@ -67,10 +67,10 @@ function getElementsWithSelections(acc, win) {
     element = range.parentElement();
   }
 
-  if (ReactInputSelection.hasSelectionCapabilities(element)) {
+  if (hasSelectionCapabilities(element)) {
     acc = acc.concat({
       element: element,
-      selectionRange: ReactInputSelection.getSelection(element),
+      selectionRange: getSelection(element),
     });
   }
 
@@ -111,100 +111,104 @@ function focusNodePreservingScroll(element) {
  * Input selection module for React.
  */
 
-  getSelectionInformation: function() {
-    return {
-      activeElement: getActiveElementDeep(),
-      elementSelections: getElementsWithSelections(),
-    };
-  } else {
-    // Content editable or old IE textarea.
-    selection = ReactDOMSelection.getOffsets(input);
-  }
+export function hasSelectionCapabilities(elem) {
+  var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase();
+  return (
+    nodeName &&
+    ((nodeName === 'input' && elem.type === 'text') ||
+      nodeName === 'textarea' ||
+      elem.contentEditable === 'true')
+  );
+}
 
-  /**
-   * @restoreSelection: If any selection information was potentially lost,
-   * restore it. This is useful when performing operations that could remove dom
-   * nodes and place them back in, resulting in focus being lost.
-   */
-  restoreSelection: function(priorSelectionInformation) {
-    var priorActiveElement = priorSelectionInformation.activeElement;
-    var elementSelections = priorSelectionInformation.elementSelections;
-    var curActiveElement = getActiveElementDeep();
-    var isActiveElementOnlySelection =
-      elementSelections.length === 1 &&
-      elementSelections[0] === priorActiveElement;
-    if (
-      !isInDocument(priorActiveElement) ||
-      priorActiveElement === priorActiveElement.ownerDocument.body ||
-      (isActiveElementOnlySelection && curActiveElement === priorActiveElement)
-    ) {
-      return;
-    }
-    elementSelections.forEach(function(selection) {
-      var element = selection.element;
-      if (
-        isInDocument(element) &&
-        getActiveElement(element.ownerDocument) !== element
-      ) {
-        ReactInputSelection.setSelection(element, selection.selectionRange);
-        if (element !== priorActiveElement) {
-          focusNodePreservingScroll(element);
-          curActiveElement = element;
-        }
-      }
-    });
+export function getSelectionInformation() {
+  return {
+    activeElement: getActiveElementDeep(),
+    elementSelections: getElementsWithSelections(),
+  };
+}
 
+/**
+ * @restoreSelection: If any selection information was potentially lost,
+ * restore it. This is useful when performing operations that could remove dom
+ * nodes and place them back in, resulting in focus being lost.
+ */
+export function restoreSelection(priorSelectionInformation) {
+  var priorActiveElement = priorSelectionInformation.activeElement;
+  var elementSelections = priorSelectionInformation.elementSelections;
+  var curActiveElement = getActiveElementDeep();
+  var isActiveElementOnlySelection =
+    elementSelections.length === 1 &&
+    elementSelections[0] === priorActiveElement;
+  if (
+    !isInDocument(priorActiveElement) ||
+    priorActiveElement === priorActiveElement.ownerDocument.body ||
+    (isActiveElementOnlySelection && curActiveElement === priorActiveElement)
+  ) {
+    return;
+  }
+  elementSelections.forEach(function(selection) {
+    var element = selection.element;
     if (
-      curActiveElement !== priorActiveElement &&
-      isInDocument(priorActiveElement)
+      isInDocument(element) &&
+      getActiveElement(element.ownerDocument) !== element
     ) {
-      focusNodePreservingScroll(priorActiveElement);
-    }
-  },
-
-  /**
-   * @getSelection: Gets the selection bounds of a focused textarea, input or
-   * contentEditable node.
-   * -@input: Look up selection bounds of this input
-   * -@return {start: selectionStart, end: selectionEnd}
-   */
-  getSelection: function(input) {
-    var selection;
-
-    if ('selectionStart' in input) {
-      // Modern browser with input or textarea.
-      selection = {
-        start: input.selectionStart,
-        end: input.selectionEnd,
-      };
-    } else {
-      // Content editable or old IE textarea.
-      selection = ReactDOMSelection.getOffsets(input);
+      setSelection(element, selection.selectionRange);
+      if (element !== priorActiveElement) {
+        focusNodePreservingScroll(element);
+        curActiveElement = element;
+      }
     }
+  });
 
-    return selection || {start: 0, end: 0};
-  },
-
-  /**
-   * @setSelection: Sets the selection bounds of a textarea or input and focuses
-   * the input.
-   * -@input     Set selection bounds of this input or textarea
-   * -@offsets   Object of same form that is returned from get*
-   */
-  setSelection: function(input, offsets) {
-    var start = offsets.start;
-    var end = offsets.end;
-    if (end === undefined) {
-      end = start;
-    }
+  if (
+    curActiveElement !== priorActiveElement &&
+    isInDocument(priorActiveElement)
+  ) {
+    focusNodePreservingScroll(priorActiveElement);
+  }
+}
 
-    if ('selectionStart' in input) {
-      input.selectionStart = start;
-      input.selectionEnd = Math.min(end, input.value.length);
-    } else {
-      ReactDOMSelection.setOffsets(input, offsets);
-    }
-  },
-};
+/**
+ * @getSelection: Gets the selection bounds of a focused textarea, input or
+ * contentEditable node.
+ * -@input: Look up selection bounds of this input
+ * -@return {start: selectionStart, end: selectionEnd}
+ */
+export function getSelection(input) {
+  var selection;
+
+  if ('selectionStart' in input) {
+    // Modern browser with input or textarea.
+    selection = {
+      start: input.selectionStart,
+      end: input.selectionEnd,
+    };
+  } else {
+    // Content editable or old IE textarea.
+    selection = ReactDOMSelection.getOffsets(input);
+  }
+
+  return selection || {start: 0, end: 0};
+}
+
+/**
+ * @setSelection: Sets the selection bounds of a textarea or input and focuses
+ * the input.
+ * -@input     Set selection bounds of this input or textarea
+ * -@offsets   Object of same form that is returned from get*
+ */
+export function setSelection(input, offsets) {
+  var start = offsets.start;
+  var end = offsets.end;
+  if (end === undefined) {
+    end = start;
+  }
 
-module.exports = ReactInputSelection;
+  if ('selectionStart' in input) {
+    input.selectionStart = start;
+    input.selectionEnd = Math.min(end, input.value.length);
+  } else {
+    ReactDOMSelection.setOffsets(input, offsets);
+  }
+}