Merge branch 'ux-fiddles' into shield-study

.eslintrc.js

@@ -9,6 +9,7 @@ module.exports = {
     "webextensions": true
   },
   "globals": {
+    "Utils": true,
     "CustomizableUI": true,
     "CustomizableWidgets": true,
     "SessionStore": true,

webextension/background.js

@@ -162,7 +162,7 @@ const assignManager = {
       } else {
         remove = true;
       }
-      await this._setOrRemoveAssignment(info.pageUrl, userContextId, remove);
+      await this._setOrRemoveAssignment(tab.id, info.pageUrl, userContextId, remove);
       this.calculateContextMenu(tab);
     }
   },
@@ -195,7 +195,7 @@ const assignManager = {
     return true;
   },
 
-  async _setOrRemoveAssignment(pageUrl, userContextId, remove) {
+  async _setOrRemoveAssignment(tabId, pageUrl, userContextId, remove) {
     let actionName;
     if (!remove) {
       await this.storageArea.set(pageUrl, {
@@ -208,11 +208,8 @@ const assignManager = {
       await this.storageArea.remove(pageUrl);
       actionName = "removed";
     }
-    browser.notifications.create({
+    browser.tabs.sendMessage(tabId, {
-      type: "basic",
+      text: `Successfully ${actionName} site to always open in this container`
-      title: "Containers",
-      message: `Successfully ${actionName} site to always open in this container`,
-      iconUrl: browser.extension.getURL("/img/onboarding-1.png")
     });
     backgroundLogic.sendTelemetryPayload({
       event: `${actionName}-container-assignment`,
@@ -444,7 +441,10 @@ const messageHandler = {
         response = assignManager._getByContainer(m.message.userContextId);
         break;
       case "setOrRemoveAssignment":
-        response = assignManager._setOrRemoveAssignment(m.url, m.userContextId, m.value);
+        response = browser.tabs.get(m.tabId).then((tab) => {
+          const userContextId = assignManager.getUserContextIdFromCookieStore(tab);
+          return assignManager._setOrRemoveAssignment(tab.id, tab.url, userContextId, m.value);
+        });
         break;
       case "exemptContainerAssignment":
         response = assignManager._exemptTab(m);

webextension/confirm-page.html

@@ -27,6 +27,7 @@
     </form>
   </main>
 
+  <script src="js/utils.js"></script>
   <script src="js/confirm-page.js"></script>
 </body>
 </html>

webextension/css/content.css

@@ -0,0 +1,22 @@
+.container-notification {
+  background: #33f70c;
+  color: #003f07;
+  display: block;
+  inline-size: 100vw;
+  offset-block-start: 0;
+  offset-inline-start: 0;
+  padding-block-end: 8px;
+  padding-block-start: 8px;
+  padding-inline-end: 8px;
+  padding-inline-start: 8px;
+  position: fixed;
+  transform: translateY(-100%);
+  transition: transform 0.3s cubic-bezier(0.07, 0.95, 0, 1) 0.3s;
+  z-index: 999999999999;
+}
+
+.container-notification img {
+  block-size: 16px;
+  inline-size: 16px;
+  margin-inline-end: 3px;
+}

webextension/css/popup.css

@@ -1,16 +1,55 @@
 /* General Rules and Resets */
-body {
+* {
-  inline-size: 300px;
+  font-size: inherit;
-  max-inline-size: 300px;
+  margin-block-end: 0;
+  margin-block-start: 0;
+  margin-inline-end: 0;
+  margin-inline-start: 0;
+  padding-block-end: 0;
+  padding-block-start: 0;
+  padding-inline-end: 0;
+  padding-inline-start: 0;
 }
 
 html {
   box-sizing: border-box;
+  font-size: 12px;
+}
+
+body {
+  font-family: Roboto, Noto, "San Francisco", Ubuntu, "Segoe UI", "Fira Sans", message-box, Arial, sans-serif;
+  inline-size: 300px;
+  max-inline-size: 300px;
 }
 
 :root {
-  --font-size-heading: 16px;
   --primary-action-color: #248aeb;
+  --title-text-color: #000;
+  --text-normal-color: #4a4a4a;
+  --text-heading-color: #000;
+
+  /* calculated from 12px */
+  --font-size-heading: 1.33rem; /* 16px */
+  --block-line-space-size: 0.5rem; /* 6px */
+  --inline-item-space-size: 0.5rem; /* 6px */
+  --block-line-separation-size: 0.33rem; /* 10px */
+  --inline-icon-space-size: 0.833rem; /* 10px */
+
+  /* Use for url and icon size */
+  --block-url-label-size: 2rem; /* 24px */
+  --inline-start-size: 1.66rem; /* 20px */
+  --inline-button-size: 5.833rem; /* 70px */
+  --icon-size: 1.166rem; /* 14px */
+
+  --small-text-size: 0.833rem; /* 10px */
+  --small-radius: 3px;
+  --icon-button-size: calc(calc(var(--block-line-separation-size) * 2) + 1.66rem); /* 20px */
+}
+
+@media (min-resolution: 1dppx) {
+  html {
+    font-size: 14px;
+  }
 }
 
 *,
@@ -42,6 +81,7 @@ table {
 }
 
 .scrollable {
+  border-block-start: 1px solid #f1f1f1;
   inline-size: 100%;
   max-block-size: 400px;
   overflow: auto;
@@ -153,6 +193,10 @@ table {
 }
 
 /* Buttons */
+.button {
+  color: black;
+}
+
 .button.primary {
   background-color: #0996f8;
   color: white;
@@ -223,7 +267,7 @@ table {
 .column-panel-content .button,
 .panel-footer .button {
   align-items: center;
-  block-size: 54px;
+  block-size: 100%;
   display: flex;
   flex: 1;
   justify-content: center;
@@ -272,7 +316,7 @@ table {
 }
 
 .onboarding p {
-  color: #4a4a4a;
+  color: var(--text-normal-color);
   font-size: 14px;
   margin-block-end: 16px;
   max-inline-size: 84%;
@@ -301,9 +345,10 @@ table {
 manage things like container crud */
 .pop-button {
   align-items: center;
-  block-size: 48px;
+  block-size: var(--icon-button-size);
+  cursor: pointer;
   display: flex;
-  flex: 0 0 48px;
+  flex: 0 0 var(--icon-button-size);
   justify-content: center;
 }
 
@@ -328,6 +373,10 @@ manage things like container crud */
 .pop-button-image {
   block-size: 20px;
   flex: 0 0 20px;
+  margin-block-end: auto;
+  margin-block-start: auto;
+  margin-inline-end: auto;
+  margin-inline-start: auto;
 }
 
 .pop-button-image-small {
@@ -339,18 +388,21 @@ manage things like container crud */
 .panel-header {
   align-items: center;
   block-size: 48px;
-  border-block-end: 1px solid #ebebeb;
   display: flex;
   justify-content: space-between;
 }
 
+.panel-header .usercontext-icon {
+  inline-size: var(--icon-button-size);
+}
+
 .column-panel-content .panel-header {
   flex: 0 0 48px;
   inline-size: 100%;
 }
 
 .panel-header-text {
-  color: #4a4a4a;
+  color: var(--text-normal-color);
   flex: 1;
   font-size: var(--font-size-heading);
   font-weight: normal;
@@ -378,8 +430,31 @@ manage things like container crud */
   text-transform: uppercase;
 }
 
+.container-panel-controls {
+  display: flex;
+  justify-content: flex-end;
+  margin-block-end: var(--block-line-space-size);
+  margin-block-start: var(--block-line-space-size);
+  margin-inline-end: var(--inline-item-space-size);
+  margin-inline-start: var(--inline-item-space-size);
+}
+
 #container-panel #sort-containers-link {
-  margin-inline-end: 16px;
+  align-items: center;
+  block-size: var(--block-url-label-size);
+  border: 1px solid #d8d8d8;
+  border-radius: var(--small-radius);
+  color: var(--title-text-color);
+  display: flex;
+  font-size: var(--small-text-size);
+  inline-size: var(--inline-button-size);
+  justify-content: center;
+  text-decoration: none;
+}
+
+#container-panel #sort-containers-link:hover,
+#container-panel #sort-containers-link:focus {
+  background: #f2f2f2;
 }
 
 span ~ .panel-header-text {
@@ -390,41 +465,75 @@ span ~ .panel-header-text {
 }
 
 #current-tab {
+  align-items: center;
+  color: var(--text-normal-color);
+  display: grid;
+  font-size: var(--small-text-size);
+  grid-column-gap: var(--inline-item-space-size);
+  grid-row-gap: var(--block-line-space-size);
+  grid-template-columns: var(--icon-size) var(--icon-size) 1fr;
+  margin-block-end: var(--block-line-space-size);
+  margin-block-start: var(--block-line-separation-size);
+  margin-inline-end: var(--inline-start-size);
+  margin-inline-start: var(--inline-start-size);
   max-inline-size: 100%;
-  min-block-size: 91px;
+}
-  padding-block-end: 13px;
+
-  padding-block-start: 13px;
+#current-tab img {
-  padding-inline-end: 16px;
+  max-block-size: var(--icon-size);
-  padding-inline-start: 16px;
 }
 
 #current-tab > h3 {
-  color: #4a4a4a;
+  color: var(--text-heading-color);
-  font-size: var(--font-size-heading);
   font-weight: normal;
-  margin-block-end: 3px;
+  grid-column: span 3;
+  margin-block-end: 0;
   margin-block-start: 0;
+  margin-inline-end: 0;
+  margin-inline-start: 0;
 }
 
-#current-page > img {
+#current-page {
-  block-size: 16px;
+  display: contents;
-  inline-size: 16px;
+}
+
+#current-tab .page-title {
+  font-size: var(--font-size-heading);
+  grid-column: 2 / 4;
 }
 
 #current-tab > label {
-  align-items: center;
+  display: contents;
-  display: flex;
+  font-size: var(--small-text-size);
-  margin-inline-start: 17px;
-  white-space: nowrap;
 }
 
 #current-tab > label > input {
-  display: inline;
+  -moz-appearance: none;
+  block-size: var(--icon-size);
+  border: 1px solid #d8d8d8;
+  border-radius: var(--small-radius);
+  display: block;
+  grid-column-start: 2;
+  inline-size: var(--icon-size);
+  margin-block-end: 0;
+  margin-block-start: 0;
+  margin-inline-end: 0;
+  margin-inline-start: 0;
+}
+
+#current-tab > label > input[disabled] {
+  background-color: #efefef;
+}
+
+#current-tab > label > input:checked {
+  background-image: url("chrome://global/skin/in-content/check.svg#check-native");
+  background-position: -1px -1px;
+  background-size: var(--icon-size);
 }
 
 #current-container {
+  color: var(--identity-tab-color);
   flex: 1;
-  text-transform: lowercase;
 }
 
 #current-tab > label > .usercontext-icon {
@@ -441,7 +550,6 @@ span ~ .panel-header-text {
 .container-panel-row {
   align-items: center;
   background-color: #fefefe !important;
-  block-size: 48px;
   border-block-end: 1px solid #f1f1f1;
   box-sizing: border-box;
   display: flex;
@@ -472,8 +580,9 @@ span ~ .panel-header-text {
 }
 
 .userContext-icon-wrapper {
-  block-size: 48px;
+  block-size: var(--icon-button-size);
-  flex: 0 0 48px;
+  flex: 0 0 var(--icon-button-size);
+  margin-inline-start: var(--inline-icon-space-size);
 }
 
 /* .userContext-icon is used natively, Bug 1333811 was raised to fix */
@@ -482,24 +591,28 @@ span ~ .panel-header-text {
   background-position: center center;
   background-repeat: no-repeat;
   background-size: 20px 20px;
-  block-size: 48px;
+  block-size: 100%;
   fill: var(--identity-icon-color);
   filter: url('/img/filters.svg#fill');
-  flex: 0 0 48px;
 }
 
 .container-panel-row:hover .clickable .usercontext-icon,
 .container-panel-row:focus .clickable .usercontext-icon {
   background-image: url('/img/container-newtab.svg');
-  fill: 'gray';
+  fill: #979797;
   filter: url('/img/filters.svg#fill');
 }
 
+.container-panel-row .clickable:hover .usercontext-icon,
+.container-panel-row .clickable:focus .usercontext-icon {
+  fill: #0094fb;
+}
+
 /* Panel Footer */
 .panel-footer {
   align-items: center;
   background: #efefef;
-  block-size: 54px;
+  block-size: var(--icon-button-size);
   border-block-end: 1px solid #d8d8d8;
   color: #000;
   display: flex;
@@ -508,14 +621,9 @@ span ~ .panel-header-text {
   justify-content: space-between;
 }
 
-.panel-footer .pop-button {
-  block-size: 54px;
-  flex: 0 0 54px;
-}
-
 .edit-containers-text {
   align-items: center;
-  block-size: 54px;
+  block-size: 100%;
   border-inline-end: solid 1px #d8d8d8;
   display: flex;
   flex: 1;
@@ -524,7 +632,7 @@ span ~ .panel-header-text {
 
 .edit-containers-text a {
   align-items: center;
-  block-size: 54px;
+  block-size: 100%;
   color: #0a0a0a;
   display: flex;
   flex: 1;
@@ -532,8 +640,8 @@ span ~ .panel-header-text {
 }
 
 /* Container info list */
-#container-info-name {
+.container-info-tab-title {
-  margin-inline-end: 0.5rem;
+  flex: 1;
 }
 
 #container-info-hideorshow {
@@ -581,7 +689,6 @@ span ~ .panel-header-text {
 }
 
 .container-info-list {
-  border-block-start: 1px solid #ebebeb;
   display: flex;
   flex-direction: column;
   margin-block-start: 4px;

webextension/js/confirm-page.js

@@ -5,7 +5,7 @@ async function load() {
   const currentCookieStoreId = searchParams.get("currentCookieStoreId");
   const redirectUrlElement = document.getElementById("redirect-url");
   redirectUrlElement.textContent = redirectUrl;
-  createFavicon(redirectUrl, redirectUrlElement);
+  appendFavicon(redirectUrl, redirectUrlElement);
 
   const container = await browser.contextualIdentities.get(cookieStoreId);
   [...document.querySelectorAll(".container-name")].forEach((containerNameElement) => {
@@ -32,12 +32,11 @@ async function load() {
   });
 }
 
-function createFavicon(pageUrl, redirectUrlElement) {
+function appendFavicon(pageUrl, redirectUrlElement) {
   const origin = new URL(pageUrl).origin;
-  const imageElement = document.createElement("img");
+  const favIconElement = Utils.createFavIconElement(`${origin}/favicon.ico`);
-  imageElement.src = `${origin}/favicon.ico`;
 
-  redirectUrlElement.prepend(imageElement);
+  redirectUrlElement.prepend(favIconElement);
 }
 
 function confirmSubmit(redirectUrl, cookieStoreId) {

webextension/js/content-script.js

@@ -0,0 +1,53 @@
+async function delayAnimation(delay = 350) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, delay);
+  });
+}
+
+async function doAnimation(element, property, value) {
+  return new Promise((resolve) => {
+    const handler = () => {
+      resolve();
+      element.removeEventListener("transitionend", handler);
+    };
+    element.addEventListener("transitionend", handler);
+    window.requestAnimationFrame(() => {
+      element.style[property] = value;
+    });
+  });
+}
+/*
+async function awaitEvent(eventName) {
+  return new Promise((resolve) => {
+    const handler = () => {
+      resolve();
+      divElement.removeEventListener(eventName, handler);
+    };
+    divElement.addEventListener(eventName, handler);
+  });
+}
+*/
+
+async function addMessage(message) {
+  const divElement = document.createElement("div");
+  divElement.classList.add("container-notification");
+  // For the eager eyed, this is an experiment. It is however likely that a website will know it is "contained" anyway
+  divElement.innerText = message.text;
+
+  const imageElement = document.createElement("img");
+  imageElement.src = browser.extension.getURL("/img/container-site-d-24.png");
+  divElement.prepend(imageElement);
+
+  document.body.appendChild(divElement);
+
+  await delayAnimation(100);
+  await doAnimation(divElement, "transform", "translateY(0)");
+  await delayAnimation(2000);
+  await doAnimation(divElement, "transform", "translateY(-100%)");
+
+  divElement.remove();
+}
+
+browser.runtime.onMessage.addListener((message) => {
+  addMessage(message);
+});

webextension/js/popup.js

@@ -18,7 +18,6 @@ const P_CONTAINERS_EDIT  = "containersEdit";
 const P_CONTAINER_INFO   = "containerInfo";
 const P_CONTAINER_EDIT   = "containerEdit";
 const P_CONTAINER_DELETE = "containerDelete";
-const DEFAULT_FAVICON = "moz-icon://goat?size=16";
 
 /**
  * Escapes any occurances of &, ", <, > or / with XML entities.
@@ -462,29 +461,14 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       const siteSettings = await Logic.getAssignment(currentTab);
       this.setupAssignmentCheckbox(siteSettings);
       const currentPage = document.getElementById("current-page");
-      const favIconUrl = currentTab.favIconUrl || "";
+      currentPage.innerHTML = escaped`<span class="page-title truncate-text">${currentTab.title}</span>`;
-      currentPage.innerHTML = escaped`
+      const favIconElement = Utils.createFavIconElement(currentTab.favIconUrl || "");
-        <img class="offpage" src="${favIconUrl}" /> ${currentTab.title}
+      currentPage.prepend(favIconElement);
-      `;
-
-      const imageElement = currentPage.querySelector("img");
-      const loadListener = (e) => {
-        e.target.classList.remove("offpage");
-        e.target.removeEventListener("load", loadListener);
-        e.target.removeEventListener("error", errorListener);
-      };
-      const errorListener = (e) => {
-        e.target.src = DEFAULT_FAVICON;
-      };
-      imageElement.addEventListener("error", errorListener);
-      imageElement.addEventListener("load", loadListener);
 
       const currentContainer = document.getElementById("current-container");
       currentContainer.innerText = identity.name;
 
-      const currentContainerIcon = document.getElementById("current-container-icon");
+      currentContainer.setAttribute("data-identity-color", identity.color);
-      currentContainerIcon.setAttribute("data-identity-icon", identity.icon);
-      currentContainerIcon.setAttribute("data-identity-color", identity.color);
     }
   },
 
@@ -546,15 +530,21 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
       });
     });
 
-    const list = document.querySelector(".identities-list");
+    const list = document.querySelector(".identities-list tbody");
 
     list.innerHTML = "";
     list.appendChild(fragment);
     /* Not sure why extensions require a focus for the doorhanger,
        however it allows us to have a tabindex before the first selected item
      */
-    document.addEventListener("focus", () => {
+    const focusHandler = () => {
       list.querySelector("tr").focus();
+      document.removeEventListener("focus", focusHandler);
+    };
+    document.addEventListener("focus", focusHandler);
+    /* If the user mousedown's first then remove the focus handler */
+    document.addEventListener("mousedown", () => {
+      document.removeEventListener("focus", focusHandler);
     });
 
     return Promise.resolve();
@@ -661,8 +651,9 @@ Logic.registerPanel(P_CONTAINER_INFO, {
       fragment.appendChild(tr);
       tr.classList.add("container-info-tab-row");
       tr.innerHTML = escaped`
-        <td><img class="icon" src="${tab.favicon}" /></td>
+        <td></td>
         <td class="container-info-tab-title truncate-text">${tab.title}</td>`;
+      tr.querySelector("td").appendChild(Utils.createFavIconElement(tab.favicon));
 
       // On click, we activate this tab. But only if this tab is active.
       if (tab.active) {

webextension/js/utils.js

@@ -0,0 +1,23 @@
+const DEFAULT_FAVICON = "moz-icon://goat?size=16";
+
+// TODO use export here instead of globals
+window.Utils = {
+
+  createFavIconElement(url) {
+    const imageElement = document.createElement("img");
+    imageElement.classList.add("icon", "offpage");
+    imageElement.src = url;
+    const loadListener = (e) => {
+      e.target.classList.remove("offpage");
+      e.target.removeEventListener("load", loadListener);
+      e.target.removeEventListener("error", errorListener);
+    };
+    const errorListener = (e) => {
+      e.target.src = DEFAULT_FAVICON;
+    };
+    imageElement.addEventListener("error", errorListener);
+    imageElement.addEventListener("load", loadListener);
+    return imageElement;
+  }
+
+};

webextension/manifest.json

@@ -26,7 +26,6 @@
     "contextualIdentities",
     "history",
     "idle",
-    "notifications",
     "storage",
     "tabs",
     "webRequestBlocking",
@@ -54,5 +53,17 @@
 
   "background": {
     "scripts": ["background.js"]
-  }
+  },
+
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": ["js/content-script.js"],
+      "css": ["css/content.css"]
+    }
+  ],
+
+  "web_accessible_resources": [
+    "/img/container-site-d-24.png"
+  ]
 }

webextension/popup.html

@@ -41,21 +41,21 @@
   <div class="panel container-panel hide" id="container-panel">
     <div id="current-tab">
       <h3>Current Tab</h3>
-      <div id="current-page" class="truncate-text"></div>
+      <div id="current-page"></div>
       <label for="container-page-assigned">
         <input type="checkbox" id="container-page-assigned" />
-        Always open in
+        <span class="truncate-text">
-        <div id="current-container-icon" class="usercontext-icon"></div>
+          Always open in
-        <span id="current-container" class="truncate-text"></span>
+          <span id="current-container"></span>
+        </span>
       </label>
     </div>
-    <div class="panel-header">
+    <div class="container-panel-controls">
-      <h3 class="panel-header-text">Containers</h3>
       <a href="#" class="action-link" id="sort-containers-link">Sort Tabs</a>
     </div>
     <div class="scrollable panel-content" tabindex="-1">
-      <table>
+      <table class="identities-list">
-        <tbody class="identities-list"></tbody>
+        <tbody></tbody>
       </table>
     </div>
     <div class="panel-footer edit-identities">
@@ -156,7 +156,7 @@
     </div>
   </div>
 
-
+  <script src="js/utils.js"></script>
   <script src="js/popup.js"></script>
 </body>
 </html>