Merge pull request #6377 from brave/order-tabs-correctly

Order tabs correctly when they have openers

Author: bridiver

app/browser/tabs.js

@@ -51,11 +51,14 @@ const api = {
         location = 'about:blank'
       }
 
+      const openerTabId = !source.isDestroyed() ? source.getId() : -1
+
       // TODO(bridiver) - handle pinned property?? - probably through tabValue
       const frameOpts = {
         location,
         partition: newTab.session.partition,
         guestInstanceId: newTab.guestInstanceId,
+        openerTabId,
         disposition
       }
 

docs/state.md

@@ -358,6 +358,7 @@ WindowStore
       internalFindStatePresent: boolean // true if a find-first (ie findNext: false) call has been made
     }
     unloaded: boolean, // true if the tab is unloaded
+    openerTabId: number, // web contents tabId that opened this tab
 
     navbar: {
       focused: boolean, // whether the navbar is focused

docs/windowActions.md

@@ -221,18 +221,6 @@ Dispatches a message to the store to create a new frame
 
 
 
-### cloneFrame(frameProps, guestInstanceId) 
-
-Dispatches a message to the store to clone an existing frame
-
-**Parameters**
-
-**frameProps**: `Object`, The properties of the frame to clone
-
-**guestInstanceId**: `number`, The guestInstanceId of the cloned webcontents
-
-
-
 ### closeFrame(frames, frameProps) 
 
 Dispatches a message to close a frame

js/actions/windowActions.js

@@ -292,21 +292,6 @@ const windowActions = {
     })
   },
 
-  /**
-   * Dispatches a message to the store to clone an existing frame
-   *
-   * @param {Object} frameProps - The properties of the frame to clone
-   * @param {number} guestInstanceId - The guestInstanceId of the cloned webcontents
-   */
-  cloneFrame: function (frameProps, guestInstanceId, openInForeground) {
-    dispatch({
-      actionType: windowConstants.WINDOW_CLONE_FRAME,
-      frameOpts: frameProps.toJS ? frameProps.toJS() : frameProps,
-      guestInstanceId,
-      openInForeground
-    })
-  },
-
   /**
    * Dispatches a message to close a frame
    *

js/constants/windowConstants.js

@@ -10,7 +10,6 @@ const windowConstants = {
   WINDOW_SET_NAVBAR_INPUT: _,
   WINDOW_NEW_FRAME: _,
   WINDOW_VIEW_KEY: _,
-  WINDOW_CLONE_FRAME: _,
   WINDOW_CLOSE_FRAME: _,
   WINDOW_SET_ACTIVE_FRAME: _,
   WINDOW_SET_FOCUSED_FRAME: _,

js/state/frameStateUtil.js

@@ -43,6 +43,16 @@ function getFrameByIndex (windowState, i) {
   return windowState.getIn(['frames', i])
 }
 
+// This will eventually go away fully when we replace frameKey by tabId
+function getFrameKeyByTabId (windowState, tabId) {
+  let parentFrameKey
+  const openerFrame = getFrameByTabId(windowState, tabId)
+  if (openerFrame) {
+    parentFrameKey = openerFrame.get('key')
+  }
+  return parentFrameKey
+}
+
 function getFrameKeysByDisplayIndex (frames) {
   let framesByDisplayIndex = [[], []]
   frames.forEach((frame) => {
@@ -232,38 +242,6 @@ function getPartition (frameOpts) {
   return partition
 }
 
-function cloneFrame (frameOpts, guestInstanceId, key) {
-  const cloneableAttributes = [
-    'audioMuted',
-    'canGoBack',
-    'canGoForward',
-    'icon',
-    'title',
-    'isPrivate',
-    'partitionNumber',
-    'themeColor',
-    'computedThemeColor'
-  ]
-  let clone = {}
-  cloneableAttributes.forEach((attr) => {
-    clone[attr] = frameOpts[attr]
-  })
-
-  clone.guestInstanceId = guestInstanceId
-  // copy the history
-  clone.history = frameOpts.history.slice(0)
-  // location is loaded by the webcontents
-  clone.delayedLoadUrl = frameOpts.location
-  clone.location = 'about:blank'
-  clone.src = 'about:blank'
-  clone.parentFrameKey = frameOpts.key
-  if (frameOpts.aboutDetails !== undefined) {
-    clone.aboutDetails = frameOpts.aboutDetails
-    clone.aboutDetails.frameKey = key
-  }
-  return clone
-}
-
 /**
  * Returns an object in the same format that was passed to it (ImmutableJS/POD)
  * for the subset of frame data that is used for tabs.
@@ -306,7 +284,8 @@ const tabFromFrame = (frame) => {
  * Adds a frame specified by frameOpts and newKey and sets the activeFrameKey
  * @return Immutable top level application state ready to merge back in
  */
-function addFrame (frames, tabs, frameOpts, newKey, partitionNumber, activeFrameKey, insertionIndex) {
+function addFrame (windowState, tabs, frameOpts, newKey, partitionNumber, activeFrameKey, insertionIndex) {
+  const frames = windowState.get('frames')
   const url = frameOpts.location || config.defaultUrl
 
   // delayedLoadUrl is used as a placeholder when the new frame is created
@@ -329,6 +308,13 @@ function addFrame (frames, tabs, frameOpts, newKey, partitionNumber, activeFrame
     }
   }
 
+  // TODO: longer term get rid of parentFrameKey completely instead of
+  // calculating it here.
+  let parentFrameKey = frameOpts.parentFrameKey
+  if (frameOpts.openerTabId) {
+    parentFrameKey = getFrameKeyByTabId(windowState, frameOpts.openerTabId)
+  }
+
   const frame = Immutable.fromJS(Object.assign({
     zoomLevel: config.zoom.defaultValue,
     audioMuted: false, // frame is muted
@@ -371,6 +357,7 @@ function addFrame (frames, tabs, frameOpts, newKey, partitionNumber, activeFrame
       certDetails: null
     },
     unloaded: frameOpts.unloaded,
+    parentFrameKey,
     history: []
   }, frameOpts))
 
@@ -537,11 +524,11 @@ module.exports = {
   getFramePropsIndex,
   getFrameKeysByDisplayIndex,
   getPartition,
-  cloneFrame,
   addFrame,
   undoCloseFrame,
   removeFrame,
   removeOtherFrames,
   tabFromFrame,
+  getFrameKeyByTabId,
   getFrameTabPageIndex
 }