add portal support

enzymejs · Aug 16, 2018 · c74acb4 · c74acb4
1 parent 984a4fb
commit c74acb4
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 13 deletions.
diff --git a/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js b/packages/enzyme-adapter-react-16.1/src/ReactSixteenOneAdapter.js
@@ -83,9 +83,16 @@ function toTree(vnode) {
  switch (node.tag) {
  case HostRoot: // 3
  return childrenToTree(node.child);
- case HostPortal: { // 4
- return childrenToTree(node.child);
- }
+ case HostPortal: // 4
+ return {
+ nodeType: 'portal',
+ type: Portal,
+ props: {},
+ key: ensureKeyOrUndefined(node.key),
+ ref: node.ref,
+ instance: null,
+ rendered: childrenToTree(node.child),
+ };
  case ClassComponent:
  return {
  nodeType: 'class',

diff --git a/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js b/packages/enzyme-adapter-react-16.2/src/ReactSixteenTwoAdapter.js
@@ -84,9 +84,16 @@ function toTree(vnode) {
  switch (node.tag) {
  case HostRoot: // 3
  return childrenToTree(node.child);
- case HostPortal: { // 4
- return childrenToTree(node.child);
- }
+ case HostPortal: // 4
+ return {
+ nodeType: 'portal',
+ type: Portal,
+ props: {},
+ key: ensureKeyOrUndefined(node.key),
+ ref: node.ref,
+ instance: null,
+ rendered: childrenToTree(node.child),
+ };
  case ClassComponent:
  return {
  nodeType: 'class',

diff --git a/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js b/packages/enzyme-adapter-react-16.3/src/ReactSixteenThreeAdapter.js
@@ -89,9 +89,16 @@ function toTree(vnode) {
  switch (node.tag) {
  case HostRoot: // 3
  return childrenToTree(node.child);
- case HostPortal: { // 4
- return childrenToTree(node.child);
- }
+ case HostPortal: // 4
+ return {
+ nodeType: 'portal',
+ type: Portal,
+ props: {},
+ key: ensureKeyOrUndefined(node.key),
+ ref: node.ref,
+ instance: null,
+ rendered: childrenToTree(node.child),
+ };
  case ClassComponent:
  return {
  nodeType: 'class',

diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -89,9 +89,16 @@ function toTree(vnode) {
  switch (node.tag) {
  case HostRoot: // 3
  return childrenToTree(node.child);
- case HostPortal: { // 4
- return childrenToTree(node.child);
- }
+ case HostPortal: // 4
+ return {
+ nodeType: 'portal',
+ type: Portal,
+ props: {},
+ key: ensureKeyOrUndefined(node.key),
+ ref: node.ref,
+ instance: null,
+ rendered: childrenToTree(node.child),
+ };
  case ClassComponent:
  return {
  nodeType: 'class',

diff --git a/packages/enzyme-adapter-utils/package.json b/packages/enzyme-adapter-utils/package.json
@@ -36,7 +36,8 @@
  "dependencies": {
  "function.prototype.name": "^1.1.0",
  "object.assign": "^4.1.0",
- "prop-types": "^15.6.2"
+ "prop-types": "^15.6.2",
+ "react-is": "^16.4.2"
  },
  "peerDependencies": {
  "react": "0.13.x || 0.14.x || ^15.0.0-0 || ^16.0.0-0"

diff --git a/packages/enzyme-adapter-utils/src/Utils.js b/packages/enzyme-adapter-utils/src/Utils.js
@@ -1,6 +1,9 @@
 import functionName from 'function.prototype.name';
 import createMountWrapper from './createMountWrapper';
 import createRenderWrapper from './createRenderWrapper';
+import {
+ Portal,
+} from 'react-is';
 
 export { createMountWrapper, createRenderWrapper };
 
@@ -94,6 +97,10 @@ export function displayNameOfNode(node) {
 
  if (!type) return null;
 
+ if (type === Portal) {
+ return 'Portal';
+ }
+
  return type.displayName || (typeof type === 'function' ? functionName(type) : type.name || type);
 }
 
@@ -104,6 +111,9 @@ export function nodeTypeFromType(type) {
  if (type && type.prototype && type.prototype.isReactComponent) {
  return 'class';
  }
+ if (type && type === Portal) {
+ return 'portal';
+ }
  return 'function';
 }