stop adding null string key when there is a ref

enzymejs · Oct 12, 2017 · 8c21e40 · 8c21e40
1 parent 14dbaaf
commit 8c21e40
Show file tree

Hide file tree

Showing 10 changed files with 221 additions and 49 deletions.
diff --git a/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js b/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js
@@ -75,7 +75,7 @@ function instanceToTree(inst) {
       nodeType: 'host',
       type: el.type,
       props: el._store.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: inst._instance.getDOMNode(),
       rendered: values(children).map(instanceToTree),
@@ -86,7 +86,7 @@ function instanceToTree(inst) {
       nodeType: 'class',
       type: el.type,
       props: el._store.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: inst._instance || inst._hostNode || null,
       rendered: instanceToTree(inst._renderedComponent),
@@ -174,7 +174,7 @@ class ReactThirteenAdapter extends EnzymeAdapter {
           nodeType: 'class',
           type: cachedNode.type,
           props: cachedNode.props,
-          key: cachedNode.key,
+          key: cachedNode.key || undefined,
           ref: cachedNode.ref,
           instance: renderer._instance._instance,
           rendered: elementToTree(output),

diff --git a/packages/enzyme-adapter-react-13/src/ReactThirteenElementToTree.js b/packages/enzyme-adapter-react-13/src/ReactThirteenElementToTree.js
@@ -35,7 +35,7 @@ export default function elementToTree(el) {
     nodeType: nodeTypeFromType(type),
     type,
     props,
-    key,
+    key: key || undefined,
     ref,
     instance: null,
     rendered,

diff --git a/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js b/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js
@@ -47,7 +47,7 @@ function instanceToTree(inst) {
       nodeType: 'host',
       type: el.type,
       props: el.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: ReactDOM.findDOMNode(inst.getPublicInstance()) || null,
       rendered: values(children).map(instanceToTree),
@@ -58,7 +58,7 @@ function instanceToTree(inst) {
       nodeType: typeToNodeType(el.type),
       type: el.type,
       props: el.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: inst._instance || null,
       rendered: instanceToTree(inst._renderedComponent),
@@ -145,7 +145,7 @@ class ReactFifteenAdapter extends EnzymeAdapter {
           nodeType: typeToNodeType(cachedNode.type),
           type: cachedNode.type,
           props: cachedNode.props,
-          key: cachedNode.key,
+          key: cachedNode.key || undefined,
           ref: cachedNode.ref,
           instance: renderer._instance._instance,
           rendered: elementToTree(output),

diff --git a/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js b/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js
@@ -58,7 +58,7 @@ function instanceToTree(inst) {
       nodeType: nodeType(inst),
       type: el.type,
       props: el.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: inst._instance || inst._hostNode || null,
       rendered: childrenFromInst(inst, el).map(instanceToTree),
@@ -69,7 +69,7 @@ function instanceToTree(inst) {
       nodeType: nodeType(inst),
       type: el.type,
       props: el.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: inst._instance || inst._hostNode || null,
       rendered: childrenFromInst(inst, el).map(instanceToTree),
@@ -80,7 +80,7 @@ function instanceToTree(inst) {
       nodeType: nodeType(inst),
       type: el.type,
       props: el.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: inst._instance || inst._hostNode || null,
       rendered: instanceToTree(inst._renderedComponent),
@@ -90,7 +90,7 @@ function instanceToTree(inst) {
     nodeType: nodeType(inst),
     type: el.type,
     props: el.props,
-    key: el.key,
+    key: el.key || undefined,
     ref: el.ref,
     instance: inst._instance || null,
     rendered: childrenFromInst(inst, el).map(instanceToTree),
@@ -175,7 +175,7 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
           nodeType: compositeTypeToNodeType(renderer._instance._compositeType),
           type: cachedNode.type,
           props: cachedNode.props,
-          key: cachedNode.key,
+          key: cachedNode.key || undefined,
           ref: cachedNode.ref,
           instance: renderer._instance._instance,
           rendered: elementToTree(output),

diff --git a/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js b/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js
@@ -59,7 +59,7 @@ function instanceToTree(inst) {
       nodeType: nodeType(inst),
       type: el.type,
       props: el.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: inst._instance || inst._hostNode || null,
       rendered: values(inst._renderedChildren).map(instanceToTree),
@@ -70,7 +70,7 @@ function instanceToTree(inst) {
       nodeType: 'host',
       type: el.type,
       props: el.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: inst._instance || inst._hostNode || null,
       rendered: childrenFromInst(inst, el).map(instanceToTree),
@@ -81,7 +81,7 @@ function instanceToTree(inst) {
       nodeType: nodeType(inst),
       type: el.type,
       props: el.props,
-      key: el.key,
+      key: el.key || undefined,
       ref: el.ref,
       instance: inst._instance || inst._hostNode || null,
       rendered: instanceToTree(inst._renderedComponent),
@@ -91,7 +91,7 @@ function instanceToTree(inst) {
     nodeType: nodeType(inst),
     type: el.type,
     props: el.props,
-    key: el.key,
+    key: el.key || undefined,
     ref: el.ref,
     instance: inst._instance || null,
     rendered: childrenFromInst(inst, el).map(instanceToTree),
@@ -176,7 +176,7 @@ class ReactFifteenAdapter extends EnzymeAdapter {
           nodeType: compositeTypeToNodeType(renderer._instance._compositeType),
           type: cachedNode.type,
           props: cachedNode.props,
-          key: cachedNode.key,
+          key: cachedNode.key || undefined,
           ref: cachedNode.ref,
           instance: renderer._instance._instance,
           rendered: elementToTree(output),

diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -73,7 +73,7 @@ function toTree(vnode) {
         nodeType: 'class',
         type: node.type,
         props: { ...node.memoizedProps },
-        key: node.key,
+        key: node.key || undefined,
         ref: node.ref,
         instance: node.stateNode,
         rendered: childrenToTree(node.child),
@@ -85,7 +85,7 @@ function toTree(vnode) {
         nodeType: 'function',
         type: node.type,
         props: { ...node.memoizedProps },
-        key: node.key,
+        key: node.key || undefined,
         ref: node.ref,
         instance: null,
         rendered: childrenToTree(node.child),
@@ -99,7 +99,7 @@ function toTree(vnode) {
         nodeType: 'host',
         type: node.type,
         props: { ...node.memoizedProps },
-        key: node.key,
+        key: node.key || undefined,
         ref: node.ref,
         instance: node.stateNode,
         rendered: renderedNodes,
@@ -225,7 +225,7 @@ class ReactSixteenAdapter extends EnzymeAdapter {
           nodeType: nodeTypeFromType(cachedNode.type),
           type: cachedNode.type,
           props: cachedNode.props,
-          key: cachedNode.key,
+          key: cachedNode.key || undefined,
           ref: cachedNode.ref,
           instance: renderer._instance,
           rendered: elementToTree(output),

diff --git a/packages/enzyme-adapter-utils/src/Utils.js b/packages/enzyme-adapter-utils/src/Utils.js
@@ -133,7 +133,7 @@ export function elementToTree(el) {
     nodeType: nodeTypeFromType(type),
     type,
     props,
-    key,
+    key: key || undefined,
     ref,
     instance: null,
     rendered,