Merge branch 'dev' into feature/router

Author: erikhaandrikman

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v4.7.0
+
+*20 oct 2021*
+
+- Fixed issues with playing Video as a texture (#189)
+- Added (semi private) getter for consumer to VideoPlayer plugin
+- Added error handling (by firing an error to the consumer) when play() on the video tag returns an error (with a Promise wrapper fallback for older browsers)
+- Added fix that allows periods to be used in a Router hash
+
+## v4.6.1
+
+*30 aug 2021*
+
+- Fixed cleanup after closing an App
 ## v4.6.0
 
 *16 aug 2021*

docs/changelog.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v4.7.0
+
+*20 oct 2021*
+
+- Fixed issues with playing Video as a texture (#189)
+- Added (semi private) getter for consumer to VideoPlayer plugin
+- Added error handling (by firing an error to the consumer) when play() on the video tag returns an error (with a Promise wrapper fallback for older browsers)
+- Added fix that allows periods to be used in a Router hash
+
+## v4.6.1
+
+*30 aug 2021*
+
+- Fixed cleanup after closing an App
 ## v4.6.0
 
 *16 aug 2021*

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "4.5.0",
+  "version": "4.7.0",
   "license": "Apache-2.0",
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js",
@@ -23,6 +23,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.11.5",
     "@lightningjs/core": "*",
+    "@michieljs/execute-as-promise": "^1.0.0",
     "deepmerge": "^4.2.2",
     "localCookie": "github:WebPlatformForEmbedded/localCookie",
     "shelljs": "^0.8.4",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "license": "Apache-2.0",
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js",

package.json

@@ -30,7 +30,7 @@ import Utils from '../Utils'
 import Registry from '../Registry'
 import { initColors } from '../Colors'
 
-import { version as sdkVersion } from '../../package.json'
+import packageInfo from '../../package.json'
 
 export let AppInstance
 export let AppData
@@ -56,12 +56,6 @@ const defaultOptions = {
   },
 }
 
-if (window.innerHeight === 720) {
-  defaultOptions.stage['w'] = 1280
-  defaultOptions.stage['h'] = 720
-  defaultOptions.stage['precision'] = 0.6666666667
-}
-
 const customFontFaces = []
 
 const fontLoader = (fonts, store) =>
@@ -87,9 +81,18 @@ const fontLoader = (fonts, store) =>
   })
 
 export default function(App, appData, platformSettings) {
+  defaultOptions.stage['w'] = platformSettings.width ? platformSettings.width : 1920
+  defaultOptions.stage['h'] = platformSettings.height ? platformSettings.height : 1080
+  defaultOptions.stage['precision'] =
+    (platformSettings.width ? platformSettings.width : 1920) / 1920
+
   return class Application extends Lightning.Application {
     constructor(options) {
       const config = Deepmerge(defaultOptions, options)
+      // Deepmerge breaks HTMLCanvasElement, so restore the passed in canvas.
+      if(options.stage.canvas) {
+        config.stage.canvas = options.stage.canvas
+      }
       super(config)
       this.config = config
     }
@@ -126,14 +129,14 @@ export default function(App, appData, platformSettings) {
           this._refocus()
 
           Log.info('App version', this.config.version)
-          Log.info('SDK version', sdkVersion)
+          Log.info('SDK version', packageInfo.version)
 
           if (platformSettings.showVersion) {
             this.childList.a({
               ref: 'VersionLabel',
               type: VersionLabel,
               version: this.config.version,
-              sdkVersion: sdkVersion,
+              sdkVersion: packageInfo.version,
               zIndex: 1,
             })
           }
@@ -160,10 +163,7 @@ export default function(App, appData, platformSettings) {
     }
 
     closeApp() {
-      Log.info('Closing App')
-
-      Settings.clearSubscribers()
-      Registry.clear()
+      Log.info('Signaling App Close')
 
       if (platformSettings.onClose && typeof platformSettings.onClose === 'function') {
         platformSettings.onClose(...arguments)
@@ -174,6 +174,10 @@ export default function(App, appData, platformSettings) {
 
     close() {
       Log.info('Closing App')
+
+      Settings.clearSubscribers()
+      Registry.clear()
+
       this.childList.remove(this.tag('App'))
       this.cleanupFonts()
       // force texture garbage collect

src/Application/index.js

@@ -494,6 +494,25 @@ const registerListener = () => {
     }
   })
 }
+
+/**
+ * Navigate to root hash
+ */
+const root = () => {
+  const rootHash = getRootHash()
+  if (isString(rootHash)) {
+    navigate(rootHash)
+  } else if (isFunction(rootHash)) {
+    rootHash().then(res => {
+      if (isObject(res)) {
+        navigate(res.path, res.params)
+      } else {
+        navigate(res)
+      }
+    })
+  }
+}
+
 // export API
 export default {
   startRouter,
@@ -523,6 +542,7 @@ export default {
   App: RoutedApp,
   // keep backwards compatible
   focusPage: restoreFocus,
+  root: root,
   /**
    * Deprecated api methods
    */

src/Router/index.js

@@ -59,7 +59,7 @@ export const getRouteByHash = hash => {
   // @todo: clean up on handleHash
   hash = hash.replace(/^#/, '')
 
-  const getUrlParts = /(\/?:?[@!*\w%\s:-]+)/g
+  const getUrlParts = /(\/?:?[^/]+)/g
   // grab possible candidates from stored routes
   const candidates = getRoutesByFloor(getFloor(hash))
   // break hash down in chunks
@@ -150,7 +150,7 @@ export const getValuesFromHash = (hash = '', path) => {
   // we already did the matching part
   path = stripRegex(path, '')
 
-  const getUrlParts = /(\/?:?[\w%\s:-]+)/g
+  const getUrlParts = /(\/?:?[\w%\s:.-]+)/g
   const hashParts = hash.match(getUrlParts) || []
   const routeParts = path.match(getUrlParts) || []
   const getNamedGroup = /^\/:([\w-]+)\/?/

src/Router/utils/route.js

@@ -124,17 +124,23 @@ export const setupVideoTag = () => {
     return videoEls[0]
   } else {
     const videoEl = document.createElement('video')
+    const platformSettingsWidth = Settings.get('platform', 'width')
+      ? Settings.get('platform', 'width')
+      : 1920
+    const platformSettingsHeight = Settings.get('platform', 'height')
+      ? Settings.get('platform', 'height')
+      : 1080
     videoEl.setAttribute('id', 'video-player')
-    videoEl.setAttribute('width', withPrecision(1920))
-    videoEl.setAttribute('height', withPrecision(1080))
+    videoEl.setAttribute('width', withPrecision(platformSettingsWidth))
+    videoEl.setAttribute('height', withPrecision(platformSettingsHeight))
     videoEl.style.position = 'absolute'
     videoEl.style.zIndex = '1'
     videoEl.style.display = 'none'
     videoEl.style.visibility = 'hidden'
     videoEl.style.top = withPrecision(0)
     videoEl.style.left = withPrecision(0)
-    videoEl.style.width = withPrecision(1920)
-    videoEl.style.height = withPrecision(1080)
+    videoEl.style.width = withPrecision(platformSettingsWidth)
+    videoEl.style.height = withPrecision(platformSettingsHeight)
     document.body.appendChild(videoEl)
     return videoEl
   }