Clear per-tab browserAction data when navigation happens

app/common/state/extensionState.js

@@ -5,6 +5,7 @@
 const tabState = require('./tabState')
 const {makeImmutable} = require('./immutableUtil')
 const Immutable = require('immutable')
+const WindowConstants = require('../../../js/constants/windowConstants')
 
 let transientFields = []
 
@@ -56,6 +57,20 @@ const extensionState = {
   browserActionUpdated: (state, action) => {
     action = makeImmutable(action)
     state = makeImmutable(state)
+    if (action.get('actionType') === WindowConstants.WINDOW_SET_NAVIGATED &&
+      action.get('tabId')) {
+      let tabId = action.get('tabId')
+      let extensions = extensionState.getEnabledExtensions(state)
+      extensions && extensions.forEach((extension) => {
+        let tabs = extension.getIn(['browserAction', 'tabs'])
+        if (tabs && tabs.get(tabId)) {
+          tabs = tabs.set(tabId, Immutable.Map())
+          extension = extension.setIn(['browserAction', 'tabs'], tabs)
+          state = state.setIn(['extensions', extension.get('id')], extension)
+        }
+      })
+      return state
+    }
     let extensionId = action.get('extensionId').toString()
     let extension = extensionState.getExtensionById(state, extensionId)
     if (extension && extension.get('browserAction')) {

docs/windowActions.md

@@ -48,7 +48,7 @@ Dispatches a message to the store to set the new URL.
 
 
 
-### setNavigated(location, key, isNavigatedInPage) 
+### setNavigated(location, key, isNavigatedInPage, tabId) 
 
 Dispatches a message to the store to let it know a page has been navigated.
 
@@ -60,6 +60,8 @@ Dispatches a message to the store to let it know a page has been navigated.
 
 **isNavigatedInPage**: `boolean`, true if it was a navigation within the same page.
 
+**tabId**: `number`, the tab id
+
 
 
 ### setSecurityState(frameProps, securityState) 

js/actions/windowActions.js

@@ -97,13 +97,15 @@ const windowActions = {
    * @param {string} location - The URL of the page that was navigated to.
    * @param {number} key - The frame key to modify.
    * @param {boolean} isNavigatedInPage - true if it was a navigation within the same page.
+   * @param {number} tabId - the tab id
    */
-  setNavigated: function (location, key, isNavigatedInPage) {
+  setNavigated: function (location, key, isNavigatedInPage, tabId) {
     dispatch({
       actionType: WindowConstants.WINDOW_SET_NAVIGATED,
       location,
       key,
-      isNavigatedInPage
+      isNavigatedInPage,
+      tabId
     })
   },
 

js/components/frame.js

@@ -994,7 +994,7 @@ class Frame extends ImmutableComponent {
         windowActions.loadUrl(this.frame, 'about:error')
         appActions.removeSite(siteUtil.getDetailFromFrame(this.frame))
       } else if (provisionLoadFailure) {
-        windowActions.setNavigated(this.webview.getURL(), this.props.frameKey, true)
+        windowActions.setNavigated(this.webview.getURL(), this.props.frameKey, true, this.frame.get('tabId'))
       }
     }
     this.webview.addEventListener('load-commit', (e) => {
@@ -1018,7 +1018,7 @@ class Frame extends ImmutableComponent {
       if (this.props.isActive && this.webview.canGoBack() && document.activeElement !== this.webview) {
         this.webview.focus()
       }
-      windowActions.setNavigated(e.url, this.props.frameKey, false)
+      windowActions.setNavigated(e.url, this.props.frameKey, false, this.frame.get('tabId'))
       // force temporary url display for tabnapping protection
       windowActions.setMouseInTitlebar(true)
 
@@ -1059,7 +1059,7 @@ class Frame extends ImmutableComponent {
     })
     this.webview.addEventListener('did-navigate-in-page', (e) => {
       if (e.isMainFrame) {
-        windowActions.setNavigated(e.url, this.props.frameKey, true)
+        windowActions.setNavigated(e.url, this.props.frameKey, true, this.frame.get('tabId'))
         loadEnd(true)
       }
     })

js/stores/appStore.js

@@ -788,6 +788,11 @@ const handleAppAction = (action) => {
     case WindowConstants.WINDOW_SET_FAVICON:
       appState = appState.set('sites', siteUtil.updateSiteFavicon(appState.get('sites'), action.frameProps.get('location'), action.favicon))
       break
+    case WindowConstants.WINDOW_SET_NAVIGATED:
+      if (!action.isNavigatedInPage) {
+        appState = extensionState.browserActionUpdated(appState, action)
+      }
+      break
     default:
   }