Merge pull request #387 from rdkcentral/release/5.3.2

Release - v5.3.2

Author: michielvandergeest

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v5.3.2
+
+*28 apr 2023*
+
+- Fixed issue where some stage options are not properly preserved during deep merge (i.e canvas and webgl context) ([#388](https://github.com/rdkcentral/Lightning-SDK/pull/388))
+- Fixed router backtrack issue ([#385](https://github.com/rdkcentral/Lightning-SDK/issues/385)
+
 ## v5.3.1
 *23 feb 2023*
 

docs/changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v5.3.2
+
+*28 apr 2023*
+
+- Fixed issue where some stage options are not properly preserved during deep merge (i.e canvas and webgl context) ([#388](https://github.com/rdkcentral/Lightning-SDK/pull/388))
+- Fixed router backtrack issue ([#385](https://github.com/rdkcentral/Lightning-SDK/issues/385)
+
 ## v5.3.1
 *23 feb 2023*
 

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "license": "Apache-2.0",
   "types": "index.d.ts",
   "scripts": {
@@ -29,6 +29,7 @@
     "@metrological/sdk": "^1.0.0",
     "@michieljs/execute-as-promise": "^1.0.0",
     "deepmerge": "^4.2.2",
+    "is-plain-object": "^5.0.0",
     "localcookies": "^2.0.0",
     "shelljs": "^0.8.5",
     "url-polyfill": "^1.1.10",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "license": "Apache-2.0",
   "types": "index.d.ts",
   "scripts": {
@@ -29,6 +29,7 @@
     "@metrological/sdk": "^1.0.0",
     "@michieljs/execute-as-promise": "^1.0.0",
     "deepmerge": "^4.2.2",
+    "is-plain-object": "^5.0.0",
     "localcookies": "^2.0.0",
     "shelljs": "^0.8.5",
     "url-polyfill": "^1.1.10",

package.json

@@ -19,6 +19,7 @@
 
 import Accessibility from '../Accessibility'
 import Deepmerge from 'deepmerge'
+import { isPlainObject } from 'is-plain-object'
 import Lightning from '../Lightning'
 import Locale from '../Locale'
 import Metrics from '../Metrics'
@@ -99,11 +100,10 @@ export default function(App, appData, platformSettings) {
 
   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
-      }
+      const config = Deepmerge(defaultOptions, options, {
+        isMergeableObject: isPlainObject
+      })
+
       super(config)
       this.config = config
     }

src/Application/index.js

@@ -357,14 +357,8 @@ export const step = (level = 0) => {
   // for now we only support negative numbers
   level = Math.abs(level)
 
-  // we can't step back past the amount
-  // of history entries
-  if (level > history.length) {
-    if (isFunction(app._handleAppClose)) {
-      return app._handleAppClose()
-    }
-    return app.application.closeApp()
-  } else if (history.length) {
+  //Check whether we have any history avaialble or not
+  if (history.length) {
     // for now we only support history back
     const route = history.splice(history.length - level, level)[0]
     // store changed history
@@ -395,6 +389,15 @@ export const step = (level = 0) => {
       }
     }
   }
+
+  // we can't step back past the amount
+  // of history entries
+  if (level > history.length) {
+    if (isFunction(app._handleAppClose)) {
+      return app._handleAppClose()
+    }
+    return app.application.closeApp()
+  }
   return false
 }