Merge pull request #285 from rdkcentral/dev

Dev

Author: wouterlucas

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v4.8.0
+
+*7 dec 2021*
+
+
+- Fixed deepmerge breaking provided canvas
+- Fixed getting querystring parameters with boot component
+- Added dynamic canvas size support
+- Added support to accept all characters in hash
+- Added `Router.root()` support
+- Added `Router.reload()` support
+
 ## v4.7.0
 
 *20 oct 2021*

docs/changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v4.8.0
+
+*7 dec 2021*
+
+
+- Fixed deepmerge breaking provided canvas
+- Fixed getting querystring parameters with boot component
+- Added dynamic canvas size support
+- Added support to accept all characters in hash
+- Added `Router.root()` support
+- Added `Router.reload()` support
 ## v4.7.0
 
 *20 oct 2021*

docs/package.json

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "4.7.0",
+  "version": "4.8.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,
             })
           }

src/Application/index.js

@@ -419,6 +419,16 @@ const resume = () => {
   }
 }
 
+/**
+ * Force reload active hash
+ */
+const reload = () => {
+  if (!isNavigating()) {
+    const hash = getActiveHash()
+    navigate(hash, { reload: true }, false)
+  }
+}
+
 /**
  * Query if the Router is still processing a Request
  * @returns {boolean}
@@ -484,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,
@@ -508,10 +537,12 @@ export default {
   getHistoryState,
   replaceHistoryState,
   getQueryStringParams,
+  reload,
   symbols,
   App: RoutedApp,
   // keep backwards compatible
   focusPage: restoreFocus,
+  root: root,
   /**
    * Deprecated api methods
    */

src/Router/index.js

@@ -113,7 +113,7 @@ export const incorrectParams = (cb, route) => {
 
 export const getQueryStringParams = (hash = getActiveHash()) => {
   const resumeHash = getResumeHash()
-  if (hash === '$' || resumeHash) {
+  if ((hash === '$' || !hash) && resumeHash) {
     if (isString(resumeHash)) {
       hash = resumeHash
     }

src/Router/utils/helpers.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

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
   }