Merge pull request #6462 from Wildhoney/master

Re-added support for attaching events to document fragments
facebook · Apr 14, 2016 · 0b1fd18 · 0b1fd18
2 parents 932334d + 167c27e
commit 0b1fd18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js
@@ -60,6 +60,9 @@ var RESERVED_PROPS = {
   suppressContentEditableWarning: null,
 };
 
+// Node type for document fragments (Node.DOCUMENT_FRAGMENT_NODE).
+var DOC_FRAGMENT_TYPE = 11;
+
 
 function getDeclarationErrorAddendum(internalInstance) {
   if (internalInstance) {
@@ -213,7 +216,8 @@ function enqueuePutListener(inst, registrationName, listener, transaction) {
     );
   }
   var containerInfo = inst._nativeContainerInfo;
-  var doc = containerInfo._ownerDocument;
+  var isDocumentFragment = containerInfo._node && containerInfo._node.nodeType === DOC_FRAGMENT_TYPE;
+  var doc = isDocumentFragment ? containerInfo._node : containerInfo._ownerDocument;
   if (!doc) {
     // Server rendering.
     return;

diff --git a/src/renderers/dom/shared/ReactDOMContainerInfo.js b/src/renderers/dom/shared/ReactDOMContainerInfo.js
@@ -22,6 +22,7 @@ function ReactDOMContainerInfo(topLevelWrapper, node) {
     _ownerDocument: node ?
       node.nodeType === DOC_NODE_TYPE ? node : node.ownerDocument :
       null,
+    _node: node,
     _tag: node ? node.nodeName.toLowerCase() : null,
     _namespaceURI: node ? node.namespaceURI : null,
   };