✨ Add support for show and hide

scripts/lib/license.ts

@@ -11,7 +11,7 @@ const MPL_HEADER = [
 
 const FIXES = [
   {
-    regex: new RegExp('.*\\.(css|((j|t)s))'),
+    regex: new RegExp('.*\\.(css|(m?(j|t)s))'),
     commentOpen: '/* ',
     comment: ' * ',
     commentClose: ' */\n',
@@ -22,6 +22,10 @@ const FIXES = [
     comment: '   - ',
     commentClose: ' -->\n',
   },
+  {
+    regex: new RegExp('.*\\.(py|ftl)'),
+    comment: '# ',
+  },
 ]
 
 export function isValidLicense(file: string): boolean {

scripts/license-check.ts

@@ -4,7 +4,7 @@
 import { readFileSync } from 'node:fs'
 import { argv } from 'node:process'
 
-import { SCRIPTS_PATH, SRC_PATH } from './lib/constants.js'
+import { SCRIPTS_PATH, SRC_PATH, STATIC_PATH } from './lib/constants.js'
 import { walkDirectory } from './lib/fs.js'
 import { autoFix, isValidLicense } from './lib/license.js'
 import { failure } from './lib/logging.js'
@@ -17,6 +17,7 @@ const shouldFix = argv.includes('--fix')
 const filesToCheck = [
   ...(await walkDirectory(SCRIPTS_PATH)),
   ...(await walkDirectory(SRC_PATH)),
+  ...(await walkDirectory(STATIC_PATH)),
 ]
 
 const invalidFiles = filesToCheck

src/content/browser/components/omnibox/Omnibox.svelte

@@ -90,7 +90,7 @@
       />
 
       {#each $pageActions as [_extId, pageAction]}
-        {#if pageAction.shouldShow($uri.asciiSpec)}
+        {#if pageAction.shouldShow($uri.asciiSpec, tab.getTabId())}
           <PageAction {pageAction} />
         {/if}
       {/each}

src/modules/EPageActions.ts

@@ -69,21 +69,40 @@ export class PageAction implements PageActionOptions {
   hideMatches: MatchPatternSet
   icons?: Record<number, string>
 
+  showTabIds = new Set<number>()
+  hideTabIds = new Set<number>()
+
   constructor(data: PageActionOptions<string[]>) {
     this.tooltip = data.tooltip
     this.popupUrl = data.popupUrl
     this.showMatches = new MatchPatternSet(data.showMatches || [])
     this.hideMatches = new MatchPatternSet(data.hideMatches || [])
   }
 
-  shouldShow(url: string) {
-    return this.showMatches.matches(url) && !this.hideMatches.matches(url, true)
+  shouldShow(url: string, tabId: number) {
+    const urlMatch =
+      this.showMatches.matches(url) &&
+      !this.hideMatches.matches(url, true) &&
+      !this.hideTabIds.has(tabId)
+    const idMatch = this.showTabIds.has(tabId)
+
+    return urlMatch || idMatch
   }
 
   setIcons(icons: Record<number, string>) {
     this.icons = icons
     this.events.emit('updateIcon', icons)
   }
+
+  addShow(id: number) {
+    this.showTabIds.add(id)
+    this.hideTabIds.delete(id)
+  }
+
+  addHide(id: number) {
+    this.hideTabIds.add(id)
+    this.showTabIds.delete(id)
+  }
 }
 
 export const EPageActions = {

static/extensions/parent/ext-browser.js

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 // @ts-check
 /* eslint-disable no-undef */
 /// <reference path="../types/index.d.ts" />

static/extensions/parent/ext-pageAction.js

@@ -1,22 +1,29 @@
-/* eslint-disable no-undef */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 // @ts-check
 /// <reference path="../types/index.d.ts" />
 
+/* eslint-disable no-undef */
+// Imports are pulled from ext-browser
+
 this.pageAction = class extends ExtensionAPIPersistent {
-  async onManifestEntry(entryName) {
+  /** @type {import('resource://app/modules/EPageActions.sys.mjs').PageAction | null} */
+  pageAction = null
+
+  async onManifestEntry() {
     const { extension } = this
     const options = extension.manifest.page_action
 
-    console.log(entryName, options, extension)
-
-    const pageAction = new lazy.EPageActions.PageAction({
+    this.pageAction = new lazy.EPageActions.PageAction({
       tooltip: options.default_title,
       popupUrl: options.default_popup,
       showMatches: options.show_matches,
       hideMatches: options.hide_matches,
     })
-
-    pageAction.setIcons(
+    this.pageAction.events.on('click', (v) => this.emit('click', v))
+    this.pageAction.setIcons(
       lazy.ExtensionParent.IconDetails.normalize(
         {
           path: options.default_icon || extension.manifest.icons,
@@ -27,12 +34,7 @@ this.pageAction = class extends ExtensionAPIPersistent {
       ),
     )
 
-    pageAction.events.on('click', (v) => {
-      console.log('Click Value', v)
-      this.emit('click', v)
-    })
-
-    lazy.EPageActions.registerPageAction(extension.id, pageAction)
+    lazy.EPageActions.registerPageAction(extension.id, this.pageAction)
   }
 
   onShutdown() {
@@ -88,6 +90,9 @@ this.pageAction = class extends ExtensionAPIPersistent {
   getAPI(context) {
     return {
       pageAction: {
+        show: (id) => this.pageAction?.addShow(id),
+        hide: (id) => this.pageAction?.addHide(id),
+
         onClicked: new EventManager({
           context,
           module: 'pageAction',

static/extensions/sharedTypes.d.ts

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /**
  * The following features are not going to be supported, primarily because I see
  * no good reason for including support

static/extensions/types/ConduitChild.d.ts

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /* eslint-disable @typescript-eslint/ban-types */
 
 /* eslint-disable @typescript-eslint/no-explicit-any */

static/extensions/types/index.d.ts

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /// <reference path="../../../src/link.d.ts" />
 
 /// <reference path="./ConduitChild.d.ts" />

static/extensions/types/utils.d.ts

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /* eslint-disable @typescript-eslint/ban-types */
 /// <reference types="gecko-types" />
 import { ConduitAddress } from 'resource://gre/modules/ConduitsParent.sys.mjs'

static/localization/en-US/branding/brand.ftl

@@ -0,0 +1,3 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.

static/localization/en-US/browser/components/mozSupportLink.ftl

@@ -0,0 +1,3 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.

static/modules/mitt.sys.mjs

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /*
  * MIT License
  *

static/modules/sessionstore/SessionStore.sys.mjs

@@ -0,0 +1,3 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */