update other 16+ adapters

enzymejs · Aug 17, 2018 · 5d24796 · 5d24796
1 parent dc9fb23
commit 5d24796
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 6 deletions.
diff --git a/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js b/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js
@@ -16,8 +16,8 @@ import {
 import { EnzymeAdapter } from 'enzyme';
 import {
   displayNameOfNode,
-  elementToTree,
-  nodeTypeFromType,
+  elementToTree as utilElementToTree,
+  nodeTypeFromType as utilNodeTypeFromType,
   mapNativeEventNames,
   propFromEvent,
   assertDomAvailable,
@@ -72,6 +72,33 @@ function flatten(arr) {
   return result;
 }
 
+function nodeTypeFromType(type) {
+  if (type && type === Portal) {
+    return 'portal';
+  }
+
+  return utilNodeTypeFromType(type);
+}
+
+function elementToTree(el) {
+  if (!(el && el.$$typeof === Portal)) {
+    return utilElementToTree(el, elementToTree);
+  }
+
+  const { children, containerInfo } = el;
+  const props = { children, containerInfo };
+
+  return {
+    nodeType: 'portal',
+    type: Portal,
+    props,
+    key: ensureKeyOrUndefined(el.key),
+    ref: el.ref,
+    instance: null,
+    rendered: elementToTree(el.children),
+  };
+}
+
 function toTree(vnode) {
   if (vnode == null) {
     return null;

diff --git a/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js b/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js
@@ -17,8 +17,8 @@ import { EnzymeAdapter } from 'enzyme';
 import { typeOfNode } from 'enzyme/build/Utils';
 import {
   displayNameOfNode,
-  elementToTree,
-  nodeTypeFromType,
+  elementToTree as utilElementToTree,
+  nodeTypeFromType as utilNodeTypeFromType,
   mapNativeEventNames,
   propFromEvent,
   assertDomAvailable,
@@ -73,6 +73,33 @@ function flatten(arr) {
   return result;
 }
 
+function nodeTypeFromType(type) {
+  if (type && type === Portal) {
+    return 'portal';
+  }
+
+  return utilNodeTypeFromType(type);
+}
+
+function elementToTree(el) {
+  if (!(el && el.$$typeof === Portal)) {
+    return utilElementToTree(el, elementToTree);
+  }
+
+  const { children, containerInfo } = el;
+  const props = { children, containerInfo };
+
+  return {
+    nodeType: 'portal',
+    type: Portal,
+    props,
+    key: ensureKeyOrUndefined(el.key),
+    ref: el.ref,
+    instance: null,
+    rendered: elementToTree(el.children),
+  };
+}
+
 function toTree(vnode) {
   if (vnode == null) {
     return null;

diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -24,8 +24,8 @@ import { EnzymeAdapter } from 'enzyme';
 import { typeOfNode } from 'enzyme/build/Utils';
 import {
   displayNameOfNode,
-  elementToTree,
-  nodeTypeFromType,
+  elementToTree as utilElementToTree,
+  nodeTypeFromType as utilNodeTypeFromType,
   mapNativeEventNames,
   propFromEvent,
   assertDomAvailable,
@@ -78,6 +78,33 @@ function flatten(arr) {
   return result;
 }
 
+function nodeTypeFromType(type) {
+  if (type && type === Portal) {
+    return 'portal';
+  }
+
+  return utilNodeTypeFromType(type);
+}
+
+function elementToTree(el) {
+  if (!(el && el.$$typeof === Portal)) {
+    return utilElementToTree(el, elementToTree);
+  }
+
+  const { children, containerInfo } = el;
+  const props = { children, containerInfo };
+
+  return {
+    nodeType: 'portal',
+    type: Portal,
+    props,
+    key: ensureKeyOrUndefined(el.key),
+    ref: el.ref,
+    instance: null,
+    rendered: elementToTree(el.children),
+  };
+}
+
 function toTree(vnode) {
   if (vnode == null) {
     return null;