[enzyme-adapter-react-16] [fix] isMemo and isLazy are no longer d…

…irectly useful for us as of `react-is` `v16.12`
enzymejs · Nov 30, 2019 · dba05db · dba05db
1 parent f327891
commit dba05db
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -23,8 +23,6 @@ import {
   isContextProvider,
   isElement,
   isForwardRef,
-  isLazy,
-  isMemo,
   isPortal,
   isSuspense,
   isValidElementType,
@@ -58,6 +56,7 @@ import {
   getNodeFromRootFinder,
   wrapWithWrappingComponent,
   getWrappingComponentMountRenderer,
+  compareNodeTypeOf,
 } from 'enzyme-adapter-utils';
 import findCurrentFiberUsingSlowPath from './findCurrentFiberUsingSlowPath';
 import detectFiberTags from './detectFiberTags';
@@ -109,6 +108,14 @@ function nodeTypeFromType(type) {
   return utilNodeTypeFromType(type);
 }
 
+function isMemo(type) {
+  return compareNodeTypeOf(type, Memo);
+}
+
+function isLazy(type) {
+  return compareNodeTypeOf(type, Lazy);
+}
+
 function unmemoType(type) {
   return isMemo(type) ? type.type : type;
 }

diff --git a/packages/enzyme-test-suite/test/Adapter-spec.jsx b/packages/enzyme-test-suite/test/Adapter-spec.jsx
@@ -7,7 +7,6 @@ import inspect from 'object-inspect';
 import {
   Portal,
   Memo,
-  isMemo,
 } from 'react-is';
 import PropTypes from 'prop-types';
 import wrap from 'mocha-wrap';
@@ -29,7 +28,12 @@ import {
   Suspense,
 } from './_helpers/react-compat';
 import { is } from './_helpers/version';
-import { itIf, describeWithDOM, describeIf } from './_helpers';
+import {
+  itIf,
+  describeWithDOM,
+  describeIf,
+  isMemo,
+} from './_helpers';
 
 const { adapter } = get();
 

diff --git a/packages/enzyme-test-suite/test/_helpers/index.jsx b/packages/enzyme-test-suite/test/_helpers/index.jsx
@@ -1,6 +1,9 @@
 /* globals jsdom */
 
 import React from 'react';
+import { Memo } from 'react-is';
+import { compareNodeTypeOf } from 'enzyme-adapter-utils';
+
 
 /**
  * Simple wrapper around mocha describe which allows a boolean to be passed in first which
@@ -158,3 +161,7 @@ export function delay(ms) {
     setTimeout(resolve, ms);
   });
 }
+
+export function isMemo(type) {
+  return compareNodeTypeOf(type, Memo);
+}