0.2.1

akxcv · Feb 14, 2018 · 30ab626 · 30ab626
1 parent b60471c
commit 30ab626
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## [0.2.1] - 2018-02-14
 ### Fixed
-- Only pass wrapped children if children exist to pass prop type validation. (#27)
+- Only pass wrapped children if children exist to pass prop type validation. (#27) - [@phillbaker][]
 
 ## [0.2.0] - 2017-11-10
 ### Updated
@@ -30,3 +30,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [0.1.0] - 2017-10-03
 Initial release.
+
+[@phillbaker]: https://github.com/phillbaker
diff --git a/dist/vuera.cjs.js b/dist/vuera.cjs.js
@@ -320,14 +320,15 @@ var makeReactContainer = function makeReactContainer(Component) {
       value: function render() {
         var _state = this.state,
             children = _state.children,
-            rest = objectWithoutProperties(_state, ['children']);
+            _invoker = _state[''],
+            rest = objectWithoutProperties(_state, ['children', '']);
 
         var wrappedChildren = this.wrapVueChildren(children);
 
         return React.createElement(
           Component,
           rest,
-          React.createElement(VueContainer, { component: wrappedChildren })
+          children && React.createElement(VueContainer, { component: wrappedChildren })
         );
       }
     }]);
@@ -346,8 +347,8 @@ var ReactWrapper = {
       var _this2 = this;
 
       var Component = makeReactContainer(component);
-      ReactDOM.render(React.createElement(Component, _extends({}, this.$props.passedProps, this.$attrs, this.$listeners, {
-        children: this.$slots.default,
+      var children = this.$slots.default !== undefined ? { children: this.$slots.default } : {};
+      ReactDOM.render(React.createElement(Component, _extends({}, this.$props.passedProps, this.$attrs, this.$listeners, children, {
         ref: function ref(_ref) {
           return _this2.reactComponentRef = _ref;
         }
@@ -365,7 +366,11 @@ var ReactWrapper = {
      * AFAIK, this is the only way to update children. It doesn't seem to be possible to watch
      * `$slots` or `$children`.
      */
-    this.reactComponentRef.setState({ children: this.$slots.default });
+    if (this.$slots.default !== undefined) {
+      this.reactComponentRef.setState({ children: this.$slots.default });
+    } else {
+      this.reactComponentRef.setState({ children: null });
+    }
   },
 
   inheritAttrs: false,

diff --git a/dist/vuera.es.js b/dist/vuera.es.js
@@ -314,14 +314,15 @@ var makeReactContainer = function makeReactContainer(Component) {
       value: function render() {
         var _state = this.state,
             children = _state.children,
-            rest = objectWithoutProperties(_state, ['children']);
+            _invoker = _state[''],
+            rest = objectWithoutProperties(_state, ['children', '']);
 
         var wrappedChildren = this.wrapVueChildren(children);
 
         return React.createElement(
           Component,
           rest,
-          React.createElement(VueContainer, { component: wrappedChildren })
+          children && React.createElement(VueContainer, { component: wrappedChildren })
         );
       }
     }]);
@@ -340,8 +341,8 @@ var ReactWrapper = {
       var _this2 = this;
 
       var Component = makeReactContainer(component);
-      ReactDOM.render(React.createElement(Component, _extends({}, this.$props.passedProps, this.$attrs, this.$listeners, {
-        children: this.$slots.default,
+      var children = this.$slots.default !== undefined ? { children: this.$slots.default } : {};
+      ReactDOM.render(React.createElement(Component, _extends({}, this.$props.passedProps, this.$attrs, this.$listeners, children, {
         ref: function ref(_ref) {
           return _this2.reactComponentRef = _ref;
         }
@@ -359,7 +360,11 @@ var ReactWrapper = {
      * AFAIK, this is the only way to update children. It doesn't seem to be possible to watch
      * `$slots` or `$children`.
      */
-    this.reactComponentRef.setState({ children: this.$slots.default });
+    if (this.$slots.default !== undefined) {
+      this.reactComponentRef.setState({ children: this.$slots.default });
+    } else {
+      this.reactComponentRef.setState({ children: null });
+    }
   },
 
   inheritAttrs: false,

diff --git a/dist/vuera.iife.js b/dist/vuera.iife.js
@@ -317,14 +317,15 @@ var makeReactContainer = function makeReactContainer(Component) {
       value: function render() {
         var _state = this.state,
             children = _state.children,
-            rest = objectWithoutProperties(_state, ['children']);
+            _invoker = _state[''],
+            rest = objectWithoutProperties(_state, ['children', '']);
 
         var wrappedChildren = this.wrapVueChildren(children);
 
         return React.createElement(
           Component,
           rest,
-          React.createElement(VueContainer, { component: wrappedChildren })
+          children && React.createElement(VueContainer, { component: wrappedChildren })
         );
       }
     }]);
@@ -343,8 +344,8 @@ var ReactWrapper = {
       var _this2 = this;
 
       var Component = makeReactContainer(component);
-      ReactDOM.render(React.createElement(Component, _extends({}, this.$props.passedProps, this.$attrs, this.$listeners, {
-        children: this.$slots.default,
+      var children = this.$slots.default !== undefined ? { children: this.$slots.default } : {};
+      ReactDOM.render(React.createElement(Component, _extends({}, this.$props.passedProps, this.$attrs, this.$listeners, children, {
         ref: function ref(_ref) {
           return _this2.reactComponentRef = _ref;
         }
@@ -362,7 +363,11 @@ var ReactWrapper = {
      * AFAIK, this is the only way to update children. It doesn't seem to be possible to watch
      * `$slots` or `$children`.
      */
-    this.reactComponentRef.setState({ children: this.$slots.default });
+    if (this.$slots.default !== undefined) {
+      this.reactComponentRef.setState({ children: this.$slots.default });
+    } else {
+      this.reactComponentRef.setState({ children: null });
+    }
   },
 
   inheritAttrs: false,

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vuera",
   "description": "Use React in Vue and Vue in React",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "repository": "akxcv/vuera",
   "author": "Alexander Komarov <[email protected]>",
   "license": "MIT",