-
Notifications
You must be signed in to change notification settings - Fork 970
Use muon's tab_strip_model for driving index and active #10640
Conversation
Codecov Report
@@ Coverage Diff @@
## master #10640 +/- ##
==========================================
- Coverage 54.41% 54.07% -0.35%
==========================================
Files 246 247 +1
Lines 21368 21522 +154
Branches 3320 3332 +12
==========================================
+ Hits 11628 11638 +10
- Misses 9740 9884 +144
|
@@ -319,7 +318,7 @@ const frameOptsFromFrame = (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 (state, frameOpts, newKey, partitionNumber, openInForeground, insertionIndex) { | |||
function addFrame (state, frameOpts, newKey, partitionNumber, openInForeground, insertionIndex, active) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
active
doesn't appear to be used?
5805ca0
to
836d69e
Compare
c008832
to
45da478
Compare
@@ -158,6 +119,7 @@ const tabsReducer = (state, action, immutableAction) => { | |||
break | |||
case appConstants.APP_TAB_UPDATED: | |||
state = tabState.maybeCreateTab(state, action) | |||
// tabs.debugTabs(state) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
comment left in here 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that's on purpose because I toggle it often
app/browser/reducers/tabsReducer.js
Outdated
const windowIdOfTabBeingRemoved = tabState.getWindowId(state, tabId) | ||
state = tabs.updateTabsStateForWindow(state, windowIdOfTabBeingRemoved) | ||
} | ||
console.log('calling removeTabByTabId ofr tabId:', tabId) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
console.log that we can remove
break | ||
} | ||
case appConstants.APP_TAB_MOVED: | ||
state = tabs.updateTabsStateForAttachedTab(state, action.get('tabId')) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
appConstants.APP_TAB_MOVED
can be grouped with appConstants.APP_TAB_ATTACHED
(since they have the same code)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
they are 2 diff things though so I don't think they should be.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haven't had a chance to try it (since we'd need a new Muon)- but code changes look good 😄 👍
45da478
to
22a1c33
Compare
Use muon's tab_strip_model for driving index and active
From a review comment on #10640
From a review comment on #10640
From a review comment on #10640
From a review comment on #10640
Sister PR that is rebased on 0.18.x milestone.
This fix first landed in 0.18.x hotfix.
It is only tracked in 0.19.x because it's rebased differently and we want to not lose track of the fixes for uplifting once 4.4 muon builds are ready.
Fix #9083
Fix #9385
Fix #9671
Fix #9722
Fix #10038
Fix #10384
Fix #10436
Fix #10532
Fix #10561
and probably several others.
Submitter Checklist:
git rebase -i
to squash commits (if needed).Test Plan:
Reviewer Checklist:
Tests