Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Highlight active button in sidebar #13111

Closed
wants to merge 12 commits into from
Closed

[FIX] Highlight active button in sidebar #13111

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
51e2122
fix(sidebarItem.js): fix click handlers for highlight
supra08 Jan 10, 2019
69faa44
fix(sidebar-item.css): add css class for highlight
supra08 Jan 10, 2019
6936ec2
fix(variables.css): add active button variable
supra08 Jan 10, 2019
7fff9c8
lint(sidebarItem.js): fix lint
supra08 Jan 10, 2019
08a4d6d
fix: fix css declaration errors
supra08 Jan 10, 2019
cb5e010
fix(sidebarItem.js, sidebar-item.css): make highlight's width equal t…
supra08 Jan 11, 2019
706c60f
lint: fix lint
supra08 Jan 11, 2019
1e94d29
fix: make preferences default when opening My Account section
supra08 Jan 12, 2019
b668f2b
fix: avoid using unnecessary constants in getting sidebar list
supra08 Jan 12, 2019
58e70ce
Merge branch 'develop' into active-link-highlight
tassoevan Jan 28, 2019
79c26f3
Remove references for perfect-scrollbar
tassoevan Jan 28, 2019
b5011c9
Merge branch 'develop' into active-link-highlight
tassoevan Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion packages/rocketchat-ui-sidenav/client/sidebarItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,17 @@ Template.sidebarItem.onCreated(function() {
});

Template.sidebarItem.events({
'click [data-id], click .sidebar-item__link'() {
'click [data-id], click .sidebar-item__link'(e) {
const element = e.currentTarget;
const sidebarElements = document.getElementsByClassName('sidebar-item');
for (let i = sidebarElements.length - 5; i < sidebarElements.length; i++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't rely on magic constants in expressions like sidebarElements.length - 5. What about using a more scoped query selector get the items?

const sidebarElements = document.querySelectorAll('.sidebar .flex-nav .sidebar-item');
for (const sidebarElement of Array.from(sidebarElements)) {
  ...
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, I'll make the changes and push asap.

const nonSelectedElement = sidebarElements[i].getElementsByTagName('a')[0];
if (nonSelectedElement.getAttribute('aria-label') === element.getAttribute('aria-label')) {
sidebarElements[i].classList.add('selected-bg-shade');
} else {
sidebarElements[i].classList.remove('selected-bg-shade');
}
}
return menu.close();
},
'mouseenter .sidebar-item__link'(e) {
Expand Down
4 changes: 4 additions & 0 deletions packages/rocketchat_theme/client/imports/components/sidebar/sidebar-item.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
}
}

.selected-bg-shade {
background-color: var(--sidebar-background-light-active) !important;
}

.sidebar--hide-avatar .sidebar-item__picture {
display: none;
}
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat_theme/client/imports/general/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
--sidebar-background-hover: var(--rc-color-primary-dark);
--sidebar-background-light: var(--rc-color-primary-lightest);
--sidebar-background-light-hover: var(--rc-color-primary-light);
--sidebar-background-light-active: var(--rc-color-primary-light);
--sidebar-default-padding: 24px;
--sidebar-small-default-padding: 16px;
--sidebar-extra-small-default-padding: 12px;
Expand Down