Merge pull request brave#9310 from NejcZdovc/redux/dispatchProps

Removes dispatchProps from redux
NejcZdovc · Jun 7, 2017 · dec236f · dec236f
2 parents 05dd2c3 + 62d6587
commit dec236f
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 27 deletions.
diff --git a/app/renderer/components/bookmarks/addEditBookmarkHanger.js b/app/renderer/components/bookmarks/addEditBookmarkHanger.js
@@ -158,7 +158,7 @@ class AddEditBookmarkHanger extends React.Component {
     appActions.createTabRequested({url: 'about:bookmarks'})
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const bookmarkDetail = currentWindow.get('bookmarkDetail')
     const currentDetail = bookmarkDetail.get('currentDetail')

diff --git a/app/renderer/components/common/messageBox.js b/app/renderer/components/common/messageBox.js
@@ -98,7 +98,7 @@ class MessageBox extends React.Component {
     return newButtons
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const tabId = ownProps.tabId
     const tab = tabState.getByTabId(state, tabId)

diff --git a/app/renderer/components/download/downloadItem.js b/app/renderer/components/download/downloadItem.js
@@ -96,7 +96,7 @@ class DownloadItem extends React.Component {
     return this.props.downloadState === downloadStates.PAUSED
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const download = state.getIn(['downloads', ownProps.downloadId]) || Immutable.Map()
     const origin = getOrigin(download.get('url'))
 

diff --git a/app/renderer/components/download/downloadsBar.js b/app/renderer/components/download/downloadsBar.js
@@ -42,7 +42,7 @@ class DownloadsBar extends React.Component {
     windowActions.setDownloadsToolbarVisible(false)
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const props = {}
     // used in renderer
     props.downloads = downloadUtil.getDownloadItems(state)

diff --git a/app/renderer/components/frame/frame.js b/app/renderer/components/frame/frame.js
@@ -907,7 +907,7 @@ class Frame extends React.Component {
     }
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const frame = frameStateUtil.getFrameByKey(currentWindow, ownProps.frameKey) || Immutable.Map()
     const location = frame.get('location')

diff --git a/app/renderer/components/navigation/browserAction.js b/app/renderer/components/navigation/browserAction.js
@@ -51,7 +51,7 @@ class BrowserAction extends React.Component {
     ipc.send('chrome-browser-action-clicked', this.props.extensionId, this.props.activeTabId, this.props.title, props)
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const activeFrame = frameStateUtil.getActiveFrame(currentWindow) || Immutable.Map()
     const activeTabId = activeFrame.get('tabId') || tabState.TAB_ID_NONE

diff --git a/app/renderer/components/navigation/menuBar.js b/app/renderer/components/navigation/menuBar.js
@@ -119,7 +119,7 @@ class MenuBar extends React.Component {
     }
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const contextMenuDetail = currentWindow.get('contextMenuDetail')
 

diff --git a/app/renderer/components/navigation/menuBarItem.js b/app/renderer/components/navigation/menuBarItem.js
@@ -45,7 +45,7 @@ class MenuBarItem extends React.Component {
     }
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const selectedIndex = currentWindow.getIn(['ui', 'menubar', 'selectedIndex'])
     const template = state.getIn(['menu', 'template', ownProps.index])

diff --git a/app/renderer/components/navigation/navigationBar.js b/app/renderer/components/navigation/navigationBar.js
@@ -119,7 +119,7 @@ class NavigationBar extends React.Component {
     ipc.on(messages.SHORTCUT_ACTIVE_FRAME_REMOVE_BOOKMARK, () => this.onToggleBookmark())
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const activeFrame = frameStateUtil.getActiveFrame(currentWindow) || Immutable.Map()
     const activeFrameKey = activeFrame.get('key')

diff --git a/app/renderer/components/navigation/navigator.js b/app/renderer/components/navigation/navigator.js
@@ -149,7 +149,7 @@ class Navigator extends React.Component {
     ipc.off(messages.SHORTCUT_ACTIVE_FRAME_FORWARD, this.onForward)
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const activeFrame = frameStateUtil.getActiveFrame(currentWindow) || Immutable.Map()
     const activeTabId = activeFrame.get('tabId') || tabState.TAB_ID_NONE

diff --git a/app/renderer/components/navigation/urlBar.js b/app/renderer/components/navigation/urlBar.js
@@ -455,7 +455,7 @@ class UrlBar extends React.Component {
     contextMenus.onUrlBarContextMenu(e)
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const activeFrame = frameStateUtil.getActiveFrame(currentWindow) || Immutable.Map()
     const activeTabId = activeFrame.get('tabId') || tabState.TAB_ID_NONE

diff --git a/app/renderer/components/navigation/urlBarSuggestions.js b/app/renderer/components/navigation/urlBarSuggestions.js
@@ -69,7 +69,7 @@ class UrlBarSuggestions extends React.Component {
     return items
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const activeFrame = frameStateUtil.getActiveFrame(currentWindow) || Immutable.Map()
     const urlBar = activeFrame.getIn(['navbar', 'urlbar'], Immutable.Map())

diff --git a/app/renderer/components/reduxComponent.js b/app/renderer/components/reduxComponent.js
@@ -5,14 +5,14 @@ const windowStore = require('../../../js/stores/windowStore')
 const debounce = require('../../../js/lib/debounce')
 const {isList, isSameHashCode} = require('../../common/state/immutableUtil')
 
-const mergePropsImpl = (stateProps, dispatchProps, ownProps) => {
-  return Object.assign({}, stateProps, dispatchProps, ownProps)
+const mergePropsImpl = (stateProps, ownProps) => {
+  return Object.assign({}, stateProps, ownProps)
 }
 
 const buildPropsImpl = (props, componentType) => {
   const fn = componentType.prototype.mergeProps || mergePropsImpl
   const state = appStore.state.set('currentWindow', windowStore.state)
-  return fn(state, {}, props)
+  return fn(state, props)
 }
 
 class ReduxComponent extends ImmutableComponent {
@@ -58,8 +58,8 @@ class ReduxComponent extends ImmutableComponent {
     return shouldUpdate
   }
 
-  mergeProps (stateProps, dispatchProps, ownProps) {
-    return mergePropsImpl(stateProps, dispatchProps, ownProps)
+  mergeProps (stateProps, ownProps) {
+    return mergePropsImpl(stateProps, ownProps)
   }
 
   buildProps (props = this.props) {

diff --git a/app/renderer/components/tabs/content/audioTabIcon.js b/app/renderer/components/tabs/content/audioTabIcon.js
@@ -41,7 +41,7 @@ class AudioTabIcon extends React.Component {
     windowActions.setAudioMuted(this.props.frameKey, this.props.tabId, !this.props.audioMuted)
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const frame = frameStateUtil.getFrameByKey(currentWindow, ownProps.frameKey)
 

diff --git a/app/renderer/components/tabs/content/closeTabIcon.js b/app/renderer/components/tabs/content/closeTabIcon.js
@@ -48,7 +48,7 @@ class CloseTabIcon extends React.Component {
     }
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const isPinnedTab = frameStateUtil.isPinned(currentWindow, ownProps.frameKey)
     const frame = frameStateUtil.getFrameByKey(currentWindow, ownProps.frameKey)

diff --git a/app/renderer/components/tabs/content/favIcon.js b/app/renderer/components/tabs/content/favIcon.js
@@ -29,7 +29,7 @@ class Favicon extends React.Component {
       : null
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const frame = frameStateUtil.getFrameByKey(currentWindow, ownProps.frameKey) || Immutable.Map()
     const isTabLoading = tabContentState.isTabLoading(currentWindow, ownProps.frameKey)

diff --git a/app/renderer/components/tabs/content/newSessionIcon.js b/app/renderer/components/tabs/content/newSessionIcon.js
@@ -23,7 +23,7 @@ const tabStyles = require('../../styles/tab')
 const newSessionSvg = require('../../../../extensions/brave/img/tabs/new_session.svg')
 
 class NewSessionIcon extends React.Component {
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const frame = frameStateUtil.getFrameByKey(currentWindow, ownProps.frameKey)
     const partition = frame.get('partitionNumber')

diff --git a/app/renderer/components/tabs/content/privateIcon.js b/app/renderer/components/tabs/content/privateIcon.js
@@ -18,7 +18,7 @@ const tabStyles = require('../../styles/tab')
 const privateSvg = require('../../../../extensions/brave/img/tabs/private.svg')
 
 class PrivateIcon extends React.Component {
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
 
     const props = {}

diff --git a/app/renderer/components/tabs/content/tabTitle.js b/app/renderer/components/tabs/content/tabTitle.js
@@ -18,7 +18,7 @@ const {isWindows, isDarwin} = require('../../../../common/lib/platformUtil')
 const globalStyles = require('../../styles/global')
 
 class TabTitle extends React.Component {
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const tabIconColor = tabContentState.getTabIconColor(currentWindow, ownProps.frameKey)
 

diff --git a/app/renderer/components/tabs/pinnedTabs.js b/app/renderer/components/tabs/pinnedTabs.js
@@ -73,7 +73,7 @@ class PinnedTabs extends React.Component {
     e.preventDefault()
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const pinnedFrames = frameStateUtil.getPinnedFrames(currentWindow)
 

diff --git a/app/renderer/components/tabs/tab.js b/app/renderer/components/tabs/tab.js
@@ -227,7 +227,7 @@ class Tab extends React.Component {
     return rect && rect.width
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const frame = frameStateUtil.getFrameByKey(currentWindow, ownProps.frameKey)
     const notifications = state.get('notifications')

diff --git a/app/renderer/components/tabs/tabs.js b/app/renderer/components/tabs/tabs.js
@@ -126,7 +126,7 @@ class Tabs extends React.Component {
     contextMenus.onNewTabContextMenu(target)
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const pageIndex = tabContentState.getPageIndex(currentWindow)
     const tabsPerTabPage = Number(getSetting(settings.TABS_PER_PAGE))

diff --git a/app/renderer/components/tabs/tabsToolbar.js b/app/renderer/components/tabs/tabsToolbar.js
@@ -39,7 +39,7 @@ class TabsToolbar extends React.Component {
     contextMenus.onHamburgerMenu(this.props.activeFrameLocation, e)
   }
 
-  mergeProps (state, dispatchProps, ownProps) {
+  mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const activeFrame = frameStateUtil.getActiveFrame(currentWindow)
     const pinnedTabs = frameStateUtil.getPinnedFrames(currentWindow)