Merge pull request #9481 from NejcZdovc/redux/object-assign

Remove object assign in merge props

Author: bridiver

app/renderer/components/common/messageBox.js

@@ -117,7 +117,7 @@ class MessageBox extends React.Component {
     props.cancelId = messageBoxDetail.get('cancelId')
     props.isActive = frameStateUtil.isFrameKeyActive(currentWindow, tab.getIn(['frame', 'key']))
 
-    return Object.assign({}, ownProps, props)
+    return props
   }
 
   render () {

app/renderer/components/frame/frame.js

@@ -926,6 +926,7 @@ class Frame extends React.Component {
     props.showMessageBox = tabMessageBoxState.hasMessageBoxDetail(state, tabId)
 
     // used in other functions
+    props.frameKey = ownProps.frameKey
     props.urlBarFocused = frame && frame.getIn(['navbar', 'urlbar', 'focused'])
     props.isAutFillContextMenu = contextMenu && contextMenu.get('type') === 'autofill'
     props.isSecure = frame.getIn(['security', 'isSecure'])
@@ -954,7 +955,7 @@ class Frame extends React.Component {
     props.tabUrl = tab && tab.get('url')
     props.partitionNumber = frame.get('partitionNumber')
 
-    return Object.assign({}, ownProps, props)
+    return props
   }
 
   render () {

app/renderer/components/navigation/browserAction.js

@@ -66,6 +66,7 @@ class BrowserAction extends React.Component {
 
     const props = {}
     // used in renderer
+    props.extensionId = ownProps.extensionId
     props.title = browserActions.get('title')
     props.text = browserActions.get('text')
     props.color = browserActions.get('color')
@@ -75,7 +76,7 @@ class BrowserAction extends React.Component {
     props.popupWindowSrc = currentWindow.getIn(['popupWindowDetail', 'src'])
     props.activeTabId = activeTabId
 
-    return Object.assign({}, ownProps, props)
+    return props
   }
 
   render () {

app/renderer/components/navigation/menuBar.js

@@ -133,7 +133,7 @@ class MenuBar extends React.Component {
     props.contextMenuDetail = !!contextMenuDetail
     props.lastFocusedSelector = currentWindow.getIn(['ui', 'menubar', 'lastFocusedSelector'])
 
-    return Object.assign({}, ownProps, props)
+    return props
   }
 
   render () {

app/renderer/components/navigation/menuBarItem.js

@@ -52,6 +52,7 @@ class MenuBarItem extends React.Component {
 
     const props = {}
     // used in renderer
+    props.index = ownProps.index
     props.selected = ownProps.index === selectedIndex
     props.label = template.get('label')
 
@@ -60,7 +61,7 @@ class MenuBarItem extends React.Component {
     props.lastFocusedSelector = currentWindow.getIn(['ui', 'menubar', 'lastFocusedSelector'])
     props.selectedIndex = selectedIndex
 
-    return Object.assign({}, ownProps, props)
+    return props
   }
 
   render () {

app/renderer/components/navigation/navigator.js

@@ -191,7 +191,7 @@ class Navigator extends React.Component {
     props.isNavigable = activeFrame && isNavigatableAboutPage(getBaseUrl(activeFrame.get('location')))
     props.activeTabId = activeTabId
 
-    return Object.assign({}, ownProps, props)
+    return props
   }
 
   render () {