[MM-20796] Un-reverted the Ctrl+Tab fix and also made sure the tabs go in the right order #1173
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…o in the right order
devinbinnie
added
2: Dev Review
lindy65
approved these changes
Jan 29, 2020
lindy65
added
QA Review Done
and removed
3: QA Review
amyblais
added
the
CherryPick/Approved
Willyfrog
requested changes
Jan 29, 2020
src/browser/components/MainPage.jsx
Outdated
| const nextIndex = this.props.teams.map((team, index) => { | ||
| return { | ||
| index, | ||
| order: (team.order - currentOrder) - 1, |
There was a problem hiding this comment.
logic here can be made more readable if we swap the parens
Suggested change
| order: (team.order - currentOrder) - 1, | |
| order: team.order - (currentOrder + 1), |
which looks more like "next tab"
src/browser/components/MainPage.jsx
Outdated
Comment on lines
169
to
176
| const currentOrder = this.props.teams[this.state.key].order; | ||
| const nextIndex = this.props.teams.map((team, index) => { | ||
| return { | ||
| index, | ||
| order: (team.order - currentOrder) + 1, | ||
| }; | ||
| }).find((team) => team.order === 0 || Math.abs(team.order) === this.props.teams.length); | ||
| this.handleSelect(nextIndex.index); |
There was a problem hiding this comment.
same comments as above, but going back ;)
| @@ -335,7 +335,7 @@ export default class MattermostView extends React.Component { | |||
| if (this.props.withTab) { | |||
| classNames.push('mattermostView-with-tab'); | |||
| } | |||
| if (!this.props.active || this.state.errorInfo) { | |||
| if (!this.props.active) { | |||
There was a problem hiding this comment.
not sure of why this change is here :/ seems unrelated to the PR, can you help me understand?
Willyfrog
requested changes
Jan 29, 2020
| @@ -335,7 +335,7 @@ export default class MattermostView extends React.Component { | |||
| if (this.props.withTab) { | |||
| classNames.push('mattermostView-with-tab'); | |||
| } | |||
| if (!this.props.active || this.state.errorInfo) { | |||
| if (!this.props.active) { | |||
Co-Authored-By: Guillermo Vayá <guivaya@gmail.com>
|
gah! hit the button too soon, there is an alternate implementation: ipcRenderer.on('select-next-tab', () => {
const currentOrder = this.props.teams[this.state.key].order;
const nextOrder = ((currentOrder + 1) % this.props.teams.length);
const nextIndex = this.props.teams.findIndex((team) => team.order === nextOrder);
this.handleSelect(nextIndex);
});
ipcRenderer.on('select-previous-tab', () => {
const currentOrder = this.props.teams[this.state.key].order;
// js modulo operator returns a negative number if result is negative, so we have to ensure it's positive
const nextOrder = ((this.props.teams.length + (currentOrder - 1)) % this.props.teams.length);
const nextIndex = this.props.teams.findIndex((team) => team.order === nextOrder);
this.handleSelect(nextIndex);
}); |
deanwhillier
approved these changes
Jan 29, 2020
Willyfrog
approved these changes
Jan 29, 2020
Willyfrog
added
4: Reviews Complete
|
@devinbinnie |
devinbinnie
added a commit
to devinbinnie/desktop
that referenced
this pull request
Jan 29, 2020
…o in the right order (mattermost#1173) * [MM-20796] Un-reverted the Ctrl+Tab fix and also made sure the tabs go in the right order * Style fixes * Update src/browser/components/MainPage.jsx Co-Authored-By: Guillermo Vayá <guivaya@gmail.com> * Different logic Co-authored-by: Guillermo Vayá <guivaya@gmail.com>
Merged
devinbinnie
added
CherryPick/Done
devinbinnie
added a commit
that referenced
this pull request
Jan 29, 2020
…o in the right order (#1173) (#1175) * [MM-20796] Un-reverted the Ctrl+Tab fix and also made sure the tabs go in the right order * Style fixes * Update src/browser/components/MainPage.jsx Co-Authored-By: Guillermo Vayá <guivaya@gmail.com> * Different logic Co-authored-by: Guillermo Vayá <guivaya@gmail.com> Co-authored-by: Guillermo Vayá <guivaya@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before submitting, please confirm you've
npm run lint:jsfor proper code formattingPlease provide the following information:
Summary
The fix in this PR: #1127
Was overwritten by this PR: #1056
This PR puts the fix back.
Also found a bug where tabbing through when you've re-ordered the tabs would tab through in the wrong order, also fixed.
Issue link
https://mattermost.atlassian.net/browse/MM-20796