From 1c248ad18c9d0fe8602c4762f7969644d6bdc930 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Wed, 3 Jul 2019 23:58:43 -0300
Subject: [PATCH] Update tabs markup

---
 app/theme/client/imports/components/tabs.css | 17 +++++++++++++++--
 app/ui/client/components/tabs.html           | 13 ++++++++++---
 app/ui/client/components/tabs.js             | 16 +++++++++++-----
 app/ui/client/index.js                       |  1 -
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/app/theme/client/imports/components/tabs.css b/app/theme/client/imports/components/tabs.css
index cf7a87448cd2..187394482509 100644
--- a/app/theme/client/imports/components/tabs.css
+++ b/app/theme/client/imports/components/tabs.css
@@ -13,8 +13,9 @@
 }
 
 .tab {
+	display: flex;
+
 	margin: 0 1rem;
-	padding: 1rem 0;
 
 	cursor: pointer;
 
@@ -24,13 +25,25 @@
 
 	border-bottom: 2px solid transparent;
 
+	font-family: inherit;
 	font-size: 1rem;
-
 	font-weight: 500;
 	line-height: 1.25rem;
+	align-items: stretch;
+	flex-flow: row nowrap;
 
 	&.active {
 		color: var(--rc-color-button-primary);
 		border-bottom-color: var(--rc-color-button-primary);
 	}
+
+	&:focus {
+		text-decoration: underline;
+	}
+
+	& > span {
+		flex: 1;
+
+		padding: 1rem 0;
+	}
 }
diff --git a/app/ui/client/components/tabs.html b/app/ui/client/components/tabs.html
index 37ec16ef2270..5ed7ec7395d5 100644
--- a/app/ui/client/components/tabs.html
+++ b/app/ui/client/components/tabs.html
@@ -1,8 +1,15 @@
 <template name="tabs">
 	<div class="tabs">
-		<div class="tabs-wrapper">
-			{{#each tabs}}
-				<div class="tab {{#if isActive value}}active{{/if}}" data-value={{value}}>{{label}}</div>
+		<div class="tabs-wrapper" role="tablist">
+			{{#each tab in tabs}}
+				<button
+					class="tab {{#if isActive tab.value}}active{{/if}}"
+					data-value={{tab.value}}
+					{{ariaSelected tab.value}}
+					role="tab"
+				>
+					<span tabindex="-1">{{tab.label}}</span>
+				</button>
 			{{/each}}
 		</div>
 	</div>
diff --git a/app/ui/client/components/tabs.js b/app/ui/client/components/tabs.js
index ab49fa82d191..eb429fb4f76d 100644
--- a/app/ui/client/components/tabs.js
+++ b/app/ui/client/components/tabs.js
@@ -1,18 +1,21 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 
+import './tabs.html';
+
+
 Template.tabs.onCreated(function() {
 	this.activeTab = new ReactiveVar(this.data.tabs.tabs.find((tab) => tab.active).value);
 });
 
 Template.tabs.events({
-	'click .tab'(e) {
-		const { value } = e.currentTarget.dataset;
-		if (value === Template.instance().activeTab.get()) {
+	'click .tab'(event, instance) {
+		const { value } = event.currentTarget.dataset;
+		if (value === instance.activeTab.get()) {
 			return;
 		}
-		Template.instance().activeTab.set(value);
-		Template.instance().data.tabs.onChange(value);
+		instance.activeTab.set(value);
+		instance.data.tabs.onChange(value);
 	},
 });
 
@@ -23,4 +26,7 @@ Template.tabs.helpers({
 	isActive(value) {
 		return Template.instance().activeTab.get() === value;
 	},
+	ariaSelected(value) {
+		return Template.instance().activeTab.get() === value ? { 'aria-selected': 'true' } : {};
+	},
 });
diff --git a/app/ui/client/index.js b/app/ui/client/index.js
index aafc4dc9cbfd..7bea89443e82 100644
--- a/app/ui/client/index.js
+++ b/app/ui/client/index.js
@@ -48,7 +48,6 @@ import './components/icon.html';
 import './components/icon';
 import './components/table.html';
 import './components/table';
-import './components/tabs.html';
 import './components/tabs';
 import './components/popupList.html';
 import './components/popupList';