Avoid invoking defaultView getter unnecessarily

facebook · Jan 23, 2018 · 51be426 · 51be426
1 parent b08a270
commit 51be426
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/packages/react-dom/src/client/ReactDOMSelection.js b/packages/react-dom/src/client/ReactDOMSelection.js
@@ -14,10 +14,8 @@ import {TEXT_NODE} from '../shared/HTMLNodeType';
  * @return {?object}
  */
 export function getOffsets(outerNode) {
-  let win = window;
-  if (outerNode.ownerDocument && outerNode.ownerDocument.defaultView) {
-    win = outerNode.ownerDocument.defaultView;
-  }
+  const win =
+    (outerNode.ownerDocument && outerNode.ownerDocument.defaultView) || window;
   const selection = win.getSelection && win.getSelection();
 
   if (!selection || selection.rangeCount === 0) {
@@ -155,12 +153,12 @@ export function getModernOffsetsFromPoints(
  */
 export function setOffsets(node, offsets) {
   const doc = node.ownerDocument || document;
-
-  if (!doc.defaultView.getSelection) {
+  const win = doc ? doc.defaultView : window;
+  if (!win.getSelection) {
     return;
   }
 
-  const selection = doc.defaultView.getSelection();
+  const selection = win.getSelection();
   const length = node[getTextContentAccessor()].length;
   let start = Math.min(offsets.start, length);
   let end = offsets.end === undefined ? start : Math.min(offsets.end, length);

diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js
@@ -65,10 +65,8 @@ function getSelection(node) {
       end: node.selectionEnd,
     };
   } else {
-    let win = window;
-    if (node.ownerDocument && node.ownerDocument.defaultView) {
-      win = node.ownerDocument.defaultView;
-    }
+    const win =
+      (node.ownerDocument && node.ownerDocument.defaultView) || window;
     if (win.getSelection) {
       const selection = win.getSelection();
       return {