Fix no-wrapper optimization in conditional expression's test

jridgewell · Nov 27, 2016 · d9462c5 · d9462c5
1 parent e40995d
commit d9462c5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/helpers/is-child-element.js b/src/helpers/is-child-element.js
@@ -53,6 +53,10 @@ function ancestorPath(path, useFastRoot) {
         continue;
       }
     } else if (path.isConditionalExpression()) {
+      if (last.key === 'test') {
+        break;
+      }
+
       continue;
     } else if (path.isLogicalExpression()) {
       if (path.get("right") === last || path.node.operator === "||") {

diff --git a/test/fixtures/expression-children/if-then/conditional-expression/actual.js b/test/fixtures/expression-children/if-then/conditional-expression/actual.js
@@ -11,5 +11,6 @@ function render() {
     </div> :
     <other />
   }
+  {<div /> ? 1 : 2}
   </div>;
 }
diff --git a/test/fixtures/expression-children/if-then/conditional-expression/expected.js b/test/fixtures/expression-children/if-then/conditional-expression/expected.js
@@ -1,3 +1,11 @@
+var _jsxWrapper = function _jsxWrapper(func, args) {
+  var wrapper = args ? function wrapper() {
+    return func.apply(this, args);
+  } : func;
+  wrapper.__jsxDOMWrapper = true;
+  return wrapper;
+};
+
 var _hasOwn = Object.prototype.hasOwnProperty;
 
 var _forOwn = function _forOwn(object, iterator) {
@@ -20,6 +28,10 @@ var _renderArbitrary = function _renderArbitrary(child) {
   }
 };
 
+var _wrapper = function _wrapper() {
+  return elementVoid("div");
+};
+
 function getDiv() {
   elementOpen("div");
   text("Bottom");
@@ -31,5 +43,7 @@ function render() {
 
   _renderArbitrary(true ? (elementOpen("div"), (elementOpen("div"), text("Top"), elementClose("div")), _renderArbitrary(getDiv()), elementClose("div")) : elementVoid("other"));
 
+  _renderArbitrary(_jsxWrapper(_wrapper) ? 1 : 2);
+
   return elementClose("div");
 }