[fix] jsx helper calls order (#10307)

imitate properly react createElement calls order
babel · Aug 8, 2019 · a112be2 · a112be2
1 parent 9ec26a7
commit a112be2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/packages/babel-helpers/src/helpers.js b/packages/babel-helpers/src/helpers.js
@@ -47,15 +47,6 @@ helpers.jsx = helper("7.0.0-beta.0")`
         children: void 0,
       };
     }
-    if (props && defaultProps) {
-      for (var propName in defaultProps) {
-        if (props[propName] === void 0) {
-          props[propName] = defaultProps[propName];
-        }
-      }
-    } else if (!props) {
-      props = defaultProps || {};
-    }
 
     if (childrenLength === 1) {
       props.children = children;
@@ -67,6 +58,16 @@ helpers.jsx = helper("7.0.0-beta.0")`
       props.children = childArray;
     }
 
+    if (props && defaultProps) {
+      for (var propName in defaultProps) {
+        if (props[propName] === void 0) {
+          props[propName] = defaultProps[propName];
+        }
+      }
+    } else if (!props) {
+      props = defaultProps || {};
+    }
+
     return {
       $$typeof: REACT_ELEMENT_TYPE,
       type: type,
@@ -410,7 +411,7 @@ helpers.objectSpread2 = helper("7.5.0")`
   import defineProperty from "defineProperty";
 
   // This function is different to "Reflect.ownKeys". The enumerableOnly
-  // filters on symbol properties only. Returned string properties are always 
+  // filters on symbol properties only. Returned string properties are always
   // enumerable. It is good to use in objectSpread.
 
   function ownKeys(object, enumerableOnly) {

diff --git a/...ansform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js b/...ansform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js
@@ -1,6 +1,6 @@
 var REACT_ELEMENT_TYPE;
 
-function _jsx(type, props, key, children) { if (!REACT_ELEMENT_TYPE) { REACT_ELEMENT_TYPE = typeof Symbol === "function" && Symbol["for"] && Symbol["for"]("react.element") || 0xeac7; } var defaultProps = type && type.defaultProps; var childrenLength = arguments.length - 3; if (!props && childrenLength !== 0) { props = { children: void 0 }; } if (props && defaultProps) { for (var propName in defaultProps) { if (props[propName] === void 0) { props[propName] = defaultProps[propName]; } } } else if (!props) { props = defaultProps || {}; } if (childrenLength === 1) { props.children = children; } else if (childrenLength > 1) { var childArray = new Array(childrenLength); for (var i = 0; i < childrenLength; i++) { childArray[i] = arguments[i + 3]; } props.children = childArray; } return { $$typeof: REACT_ELEMENT_TYPE, type: type, key: key === undefined ? null : '' + key, ref: null, props: props, _owner: null }; }
+function _jsx(type, props, key, children) { if (!REACT_ELEMENT_TYPE) { REACT_ELEMENT_TYPE = typeof Symbol === "function" && Symbol["for"] && Symbol["for"]("react.element") || 0xeac7; } var defaultProps = type && type.defaultProps; var childrenLength = arguments.length - 3; if (!props && childrenLength !== 0) { props = { children: void 0 }; } if (childrenLength === 1) { props.children = children; } else if (childrenLength > 1) { var childArray = new Array(childrenLength); for (var i = 0; i < childrenLength; i++) { childArray[i] = arguments[i + 3]; } props.children = childArray; } if (props && defaultProps) { for (var propName in defaultProps) { if (props[propName] === void 0) { props[propName] = defaultProps[propName]; } } } else if (!props) { props = defaultProps || {}; } return { $$typeof: REACT_ELEMENT_TYPE, type: type, key: key === undefined ? null : '' + key, ref: null, props: props, _owner: null }; }
 
 var _ref =
 /*#__PURE__*/