Merge pull request #26 from jeffreylanters/development

Component doesn't unmount properly #22

Author: Jeffrey Lanters

library/components/Unity.js

@@ -14,10 +14,6 @@ var _UnityLoaderService = require('../services/UnityLoaderService');
 
 var _UnityLoaderService2 = _interopRequireDefault(_UnityLoaderService);
 
-var _Unity = require('./Unity.styles');
-
-var _Unity2 = _interopRequireDefault(_Unity);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -65,11 +61,12 @@ var Unity = function (_Component) {
                 this.setState({ error: error });
             } else {
                 this._unityLoaderService.append(this.props.loader).then(function () {
-                    var unityInstance = UnityLoader.instantiate('unity', _this2.props.src, {
+                    var unityInstance = UnityLoader.instantiate('__ruw', _this2.props.src, {
                         onProgress: _this2._onProgress.bind(_this2),
                         Module: _this2.props.module
                     });
                     module.exports.UnityInstance = unityInstance;
+                    window._ui = unityInstance;
                 });
             }
         }
@@ -99,7 +96,7 @@ var Unity = function (_Component) {
                     null,
                     'React-Unity-Webgl error ',
                     this.state.error
-                ) : _react2.default.createElement('div', { style: _Unity2.default.unity, id: 'unity' })
+                ) : _react2.default.createElement('div', { style: { width: '100%', height: '100%' }, id: '__ruw' })
             );
         }
     }]);

library/services/UnityLoaderService.js

@@ -35,9 +35,11 @@ var UnityLoaderService = function () {
     }, {
         key: 'unmount',
         value: function unmount() {
-            if (this.unityLoaderScript !== null) {
-                this.documentHead.removeChild(this.unityLoaderScript);
-            }
+            /// unmounting is disabled due to bug
+            /// https://github.com/jeffreylanters/react-unity-webgl/issues/22
+            // if (this.unityLoaderScript !== null) {
+            //     this.documentHead.removeChild(this.unityLoaderScript)
+            // }
         }
     }]);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-unity-webgl",
-  "version": "6.4.3",
+  "version": "6.4.4",
   "description": "A Unity WebGL component for your React application",
   "main": "library/index.js",
   "types": "./types.d.ts",

source/components/Unity.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react'
 import UnityLoaderService from '../services/UnityLoaderService'
-import Styles from './Unity.styles'
 
 export default class Unity extends Component {
     constructor(props) {
@@ -29,7 +28,7 @@ export default class Unity extends Component {
         }
         else {
             this._unityLoaderService.append(this.props.loader).then(() => {
-                let unityInstance = UnityLoader.instantiate('unity', this.props.src, {
+                let unityInstance = UnityLoader.instantiate('__ruw', this.props.src, {
                     onProgress: this._onProgress.bind(this),
                     Module: this.props.module
                 })
@@ -51,11 +50,11 @@ export default class Unity extends Component {
     render() {
         return (
             <div className='unity' style={this._getContainerStyles()}>
-                {this.state.error !== null ? (
+                {this.state.error !== null ?
                     <b>React-Unity-Webgl error {this.state.error}</b>
-                ) : (
-                        <div style={Styles.unity} id='unity'></div>
-                    )}
+                    :
+                    <div style={{ width: '100%', height: '100%' }} id='__ruw'></div>
+                }
             </div>
         )
     }

source/components/Unity.styles.js

@@ -16,8 +16,10 @@ export default class UnityLoaderService {
         })
     }
     unmount() {
-        if (this.unityLoaderScript !== null) {
-            this.documentHead.removeChild(this.unityLoaderScript)
-        }
+        /// unmounting is disabled due to bug
+        /// https://github.com/jeffreylanters/react-unity-webgl/issues/22
+        // if (this.unityLoaderScript !== null) {
+        //     this.documentHead.removeChild(this.unityLoaderScript)
+        // }
     }
 }