Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/sidebar/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="style.css">
<style id="search-filter-style"></style>
</head>
<body>
<header>
<ul id="pinned-tabs">
</ul>
</header>
<div class="search-container">
<input type="text" placeholder="Search" class="search-input">
</div>
<main>
<ul id="containers">
</ul>
Expand Down Expand Up @@ -38,4 +42,4 @@
<ul id="context-menu"></ul>
<script src="sidebar.js" type="module"></script>
</body>
</html>
</html>
48 changes: 48 additions & 0 deletions src/sidebar/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const ContainerTabsSidebar = {
)

this._initContextualIdentities()
this._initSearch()
},

_initContextualIdentities() {
Expand Down Expand Up @@ -92,6 +93,53 @@ export const ContainerTabsSidebar = {
})
},

async _initSearch() {
const searchInput = document.querySelector('.search-input');
const searchFilterStyle = document.querySelector('style#search-filter-style')
let cidQueryPromise = Promise.resolve();
let tabQueryPromise = Promise.resolve();
searchInput.addEventListener('input', async () => {
const searchQuery = searchInput.value.toLowerCase().trim();
if (searchQuery.length === 0) {
searchFilterStyle.textContent = ''
return
}
cidQueryPromise = cidQueryPromise.then(() => browser.contextualIdentities.query({}))
tabQueryPromise = tabQueryPromise.then(() => browser.tabs.query({}))
const allIdentities = await cidQueryPromise
const allTabs = await tabQueryPromise
const matchingIdentities = allIdentities.filter(cid => {
return cid.name.toLowerCase().indexOf(searchQuery) >= 0
})
const matchingTabs = allTabs.filter(tab => {
return (tab.title.toLowerCase().indexOf(searchQuery) >= 0) ||
(tab.url.toLowerCase().indexOf(searchQuery) >= 0)
})
const cookieStoreIds = new Set()
const tabIds = new Set()
matchingIdentities.forEach(cid => {
cookieStoreIds.add(cid.cookieStoreId)
});
matchingTabs.forEach(tab => {
cookieStoreIds.add(tab.cookieStoreId)
tabIds.add(tab.id)
});
const containerSelector = [...cookieStoreIds]
.map(id => `#containers .container[data-container-id="${id}"]`)
.join(', ')
const tabSelector = [...tabIds]
.map(id => `#containers .container-tab[data-tab-id="${id}"]`)
.join(', ')
searchFilterStyle.textContent = `
#containers .container { display: none; }
#containers .container-tab { display: none; }
${containerSelector} { display: block; }
${tabSelector} { display: flex; }
`
})
searchInput.focus()
},

/**
* Removes a container from DOM, does not remove it from a browser
* @param {integer} cookieStoreId - contextual identity id
Expand Down
12 changes: 12 additions & 0 deletions src/sidebar/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ a, a:link, a:visited {
text-decoration: none;
}

.search-container {
padding: 5px;
}
.search-input {
display: block;
width: 100%;
padding: 0.5rem;
border: 1px solid var(--color-input-border);
background: var(--color-input-background);
color: var(--color-text);
}

#pinned-tabs {
display: flex;
flex-wrap: wrap;
Expand Down
5 changes: 4 additions & 1 deletion src/sidebar/theme/dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
--color-default-container: #fff;
--color-container-background: #111;
--color-container-border: #222;
--color-input-background: #111;
--color-input-border: #222;
--color-tab-background: #222;
--color-close: #ccc;
--color-icon: #eee;
Expand All @@ -28,4 +30,5 @@

.container-icon[src$=".png"] {
filter: invert();
}
}

2 changes: 2 additions & 0 deletions src/sidebar/theme/grey.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
--color-container-background: #2B2D30;
--color-default-container: #fff;
--color-container-border: #222;
--color-input-background: #424242;
--color-input-border: #222;
--color-close: #ccc;
--color-icon: #eee;
}
Expand Down
4 changes: 3 additions & 1 deletion src/sidebar/theme/light.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
--color-container-background: #ffffff;
--color-container-border: #e3e4e6;
--color-tab-background: #ececec;
--color-input-border: #e3e4e6;
--color-input-background: #fff;
--color-close: var(--color-icon);
--color-icon: rgba(24, 25, 26, 0.35);
}
Expand All @@ -28,4 +30,4 @@
.container-actions .container-action:hover,
.container-tab-close:hover, .container-tab-action:hover {
background: rgba(0,0,0, 0.1);
}
}