Merge pull request #284 from rdkcentral/feature/router

Feature/router

Author: erikhaandrikman

src/Router/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}
@@ -527,6 +537,7 @@ export default {
   getHistoryState,
   replaceHistoryState,
   getQueryStringParams,
+  reload,
   symbols,
   App: RoutedApp,
   // keep backwards compatible

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