Merge pull request #179 from kirovboris/fix_get_container

Fixed getContainer - left only findReact cases
DevExpress · Dec 15, 2020 · 98ba90e · 98ba90e
2 parents f96fc2d + bf21083
commit 98ba90e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "testcafe-react-selectors",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "ReactJS selectors for TestCafe",
   "repository": "https://github.com/DevExpress/testcafe-react-selectors",
   "main": "lib/index",

diff --git a/src/index.js.mustache b/src/index.js.mustache
@@ -53,7 +53,7 @@ export const ReactSelector = Selector(selector => {
         window['$testCafeReactSelector']    = selectorReact16or17;
         window['$testCafeReact16or17Roots'] = rootEls;
 
-        foundDOMNodes = selectorReact16or17(selector);
+        foundDOMNodes = selectorReact16or17(selector, false);
     }
 
     visitedRootEls = [];
@@ -214,7 +214,7 @@ export const ReactSelector = Selector(selector => {
 
         const reactSelector = window['$testCafeReactSelector'];
 
-        return reactSelector(selector, componentInstances);
+        return reactSelector(selector, true, componentInstances);
     }
 }, { returnDOMNodes: true });
 

diff --git a/src/react-15/index.js b/src/react-15/index.js
@@ -1,7 +1,7 @@
 /*global window rootEls defineSelectorProperty visitedRootEls checkRootNodeVisited*/
 
 /*eslint-disable no-unused-vars*/
-function react15elector (selector, parents = rootEls) {
+function react15elector (selector, _, parents = rootEls) {
     const ELEMENT_NODE = 1;
     const COMMENT_NODE = 8;
 

diff --git a/src/react-16-17/index.js b/src/react-16-17/index.js
@@ -1,7 +1,7 @@
 /*global window document Node rootEls defineSelectorProperty visitedRootEls checkRootNodeVisited*/
 
 /*eslint-disable no-unused-vars*/
-function react16or17Selector (selector, parents = rootEls) {
+function react16or17Selector (selector, renderedRootIsUnknown, parents = rootEls) {
     window['%testCafeReactFoundComponents%'] = [];
 
     const { getRenderedComponentVersion }  = window['%testCafeReactSelectorUtils%']['16|17'];
@@ -42,7 +42,7 @@ function react16or17Selector (selector, parents = rootEls) {
     }
 
     function getContainer (component) {
-        let node = getRenderedComponentVersion(component, rootEls);
+        let node = renderedRootIsUnknown ? getRenderedComponentVersion(component, rootEls) : component;
 
         while (!(node.stateNode instanceof Node)) {
             if (node.child) node = node.child;