Merge pull request #85 from elraccoone/feature/optional-unity-loader

Feature/optional unity loader
jeffreylanters · Jan 20, 2020 · 7174b9e · 7174b9e
2 parents b6790c3 + 82d0de5
commit 7174b9e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-unity-webgl",
-  "version": "7.1.9",
+  "version": "7.1.10",
   "description": "React Unity WebGL provides an easy solution for embedding Unity WebGL builds in your React application, with two-way communication between your React and Unity application with advanced API's.",
   "main": "./distribution/Exports.js",
   "scripts": {

diff --git a/source/components/Unity.ts b/source/components/Unity.ts
@@ -85,16 +85,14 @@ export default class Unity extends React.Component<IUnityProps, IUnityState> {
    * @private
    */
   private adjustCanvasToContainer(): void {
-    const _width = this.htmlElement!.offsetWidth;
-    const _height = this.htmlElement!.offsetHeight;
-    const _canvas = this.htmlElement!.getElementsByTagName("canvas")[0];
-    if (_canvas != null) {
-      if (_canvas.height !== _height) {
+    if (typeof this.htmlElement !== "undefined") {
+      const _width = this.htmlElement.offsetWidth;
+      const _height = this.htmlElement.offsetHeight;
+      const _canvas = this.htmlElement.getElementsByTagName("canvas")[0];
+      if (typeof _canvas !== "undefined" && _canvas.height !== _height)
         _canvas.height = _height;
-      }
-      if (_canvas.width !== _width) {
+      if (typeof _canvas !== "undefined" && _canvas.width !== _width)
         _canvas.width = _width;
-      }
     }
   }
 

diff --git a/source/declarations/UnityVersion.ts b/source/declarations/UnityVersion.ts
@@ -1,5 +1,12 @@
 export type UnityVersion =
   | "undefined"
+  | "2019.2.18"
+  | "2019.2.17"
+  | "2019.2.16"
+  | "2019.2.15"
+  | "2019.2.14"
+  | "2019.2.13"
+  | "2019.2.12"
   | "2019.2.11"
   | "2019.2.10"
   | "2019.2.9"