Merge branch 'v0.6.0'

Author: lrydzkowski

README.md

@@ -22,12 +22,16 @@ The list of actions possible to attach to mouse gestures:
 - Reopen Tab
 - Duplicate Tab
 - Open New Window
+- Search Highlighted Text
+- Close Tabs to the Right
 
 Other settings:
 
 - Line color
 - Line width
 
+It works only in Windows operating system.
+
 ## Dependencies
 
 It uses [Coloris v0.22.0](https://github.com/mdbassit/Coloris) to choose a line color in settings.

content-scripts/content-event-handler.js

@@ -1,16 +1,18 @@
 class ContentEventHandler {
   #gesturesHandler;
   #canvasHandler;
+  #selectedTextHandler;
 
   #mouseDownHandler;
   #mouseUpHandler;
   #contextMenuHandler;
 
   #blockDefaultContextMenu = false;
 
-  constructor(gesturesHandler, canvasHandler) {
+  constructor(gesturesHandler, canvasHandler, selectedTextHandler) {
     this.#gesturesHandler = gesturesHandler;
     this.#canvasHandler = canvasHandler;
+    this.#selectedTextHandler = selectedTextHandler;
     this.#mouseDownHandler = this.#createMouseDownHandler();
     this.#mouseUpHandler = this.#createMouseUpHandler();
     this.#contextMenuHandler = this.#createContextMenuHandler();
@@ -25,25 +27,26 @@ class ContentEventHandler {
 
   #createMouseDownHandler() {
     return (event) => {
-      this.#handleMouseDown(event, this.#gesturesHandler);
+      this.#handleMouseDown(event, this.#gesturesHandler, this.#selectedTextHandler);
     };
   }
 
-  #handleMouseDown(event, gesturesHandler) {
+  #handleMouseDown(event, gesturesHandler, selectedTextHandler) {
     if (event.button !== Consts.rightButton) {
       return;
     }
 
+    selectedTextHandler.saveSelectedText();
     gesturesHandler.initPosition(event);
   }
 
   #createMouseUpHandler() {
     return (event) => {
-      this.#handleMouseUp(event, this.#canvasHandler, this.#gesturesHandler);
+      this.#handleMouseUp(event, this.#canvasHandler, this.#gesturesHandler, this.#selectedTextHandler);
     };
   }
 
-  #handleMouseUp(event, canvasHandler, gesturesHandler) {
+  #handleMouseUp(event, canvasHandler, gesturesHandler, selectedTextHandler) {
     if (event.button !== Consts.rightButton) {
       return;
     }
@@ -64,6 +67,7 @@ class ContentEventHandler {
     chrome.runtime.sendMessage({
       gestures,
       type: Consts.messageTypes.gestures,
+      selectedText: selectedTextHandler.getSelectedText(),
     });
   }
 

content-scripts/selected-text-handler.js

@@ -0,0 +1,11 @@
+class SelectedTextHandler {
+  #selectedText = '';
+
+  saveSelectedText() {
+    this.#selectedText = window?.getSelection()?.toString()?.trim() ?? '';
+  }
+
+  getSelectedText() {
+    return this.#selectedText;
+  }
+}

content.js

@@ -5,5 +5,6 @@ const storage = new SettingsStorage();
 const canvasEventHandler = new CanvasEventHandler(canvas, storage);
 canvasEventHandler.registerEvent();
 const canvasHandler = new CanvasHandler(canvasEventHandler, canvas);
-const contentEventHandler = new ContentEventHandler(gesturesHandler, canvasHandler);
+const selectedTextHandler = new SelectedTextHandler();
+const contentEventHandler = new ContentEventHandler(gesturesHandler, canvasHandler, selectedTextHandler);
 contentEventHandler.registerEvents();

manifest.json

@@ -2,8 +2,8 @@
   "manifest_version": 3,
   "name": "Simple Mouse Gestures",
   "description": "Extension that provides the ability to define mouse gestures that will run specific actions in your Google Chrome browser",
-  "version": "0.5.0",
-  "version_name": "0.5.0 beta",
+  "version": "0.6.0",
+  "version_name": "0.6.0 beta",
   "icons": {
     "16": "images/icon-16.png",
     "32": "images/icon-32.png",
@@ -19,6 +19,7 @@
         "content-scripts/canvas-builder.js",
         "content-scripts/canvas-event-handler.js",
         "content-scripts/canvas-handler.js",
+        "content-scripts/selected-text-handler.js",
         "content-scripts/settings-storage.js",
         "content-scripts/content-event-handler.js",
         "content.js"

popup/popup.css

@@ -1,13 +1,5 @@
 * {
-  font-family:
-    Open Sans,
-    -apple-system,
-    BlinkMacSystemFont,
-    Segoe UI,
-    Roboto,
-    Helvetica Neue,
-    Arial,
-    sans-serif;
+  font-family: Open Sans, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, sans-serif;
   font-size: 13px;
 }
 button {
@@ -72,6 +64,9 @@ select {
   display: none;
   min-height: 300px;
 }
+.tab #operation-select {
+  width: 220px;
+}
 .tab.active {
   display: block;
   padding-top: 10px;

service-worker-scripts/context.js

@@ -0,0 +1,9 @@
+export class Context {
+  gestures = [];
+  selectedText = '';
+
+  constructor(gestures, selectedText) {
+    this.gestures = gestures;
+    this.selectedText = selectedText;
+  }
+}

service-worker-scripts/operation-resolver.js

@@ -12,6 +12,8 @@ import { ScrollToBottomOperation } from '/service-worker-scripts/operations/scro
 import { ReopenTabOperation } from '/service-worker-scripts/operations/reopen-tab-operation.js';
 import { DuplicateTabOperation } from '/service-worker-scripts/operations/duplicate-tab-operation.js';
 import { OpenNewWindowOperation } from '/service-worker-scripts/operations/open-new-window-operation.js';
+import { SearchHighlightedTextOperation } from '/service-worker-scripts/operations/search-highlighted-text-operation.js';
+import { CloseTabsToRightOperation } from '/service-worker-scripts/operations/close-tabs-to-right-operation.js';
 
 export class OperationResolver {
   #storage;
@@ -73,14 +75,26 @@ export class OperationResolver {
       operation: new OpenNewWindowOperation(),
       label: 'Open New Window',
     },
+    searchHighlightedTextInActiveTab: {
+      operation: new SearchHighlightedTextOperation(true),
+      label: 'Search Highlighted Text in Active Tab',
+    },
+    searchHighlightedTextInInactiveTab: {
+      operation: new SearchHighlightedTextOperation(false),
+      label: 'Search Highlighted Text in Inactive Tab',
+    },
+    closeTabsToRight: {
+      operation: new CloseTabsToRightOperation(),
+      label: 'Close Tabs to the Right',
+    }
   };
 
   constructor(storage) {
     this.#storage = storage;
   }
 
-  async resolveAsync(gestures) {
-    const serializedGestures = this.#serializeGestures(gestures);
+  async resolveAsync(context) {
+    const serializedGestures = this.#serializeGestures(context.gestures);
 
     const operationKey = this.#storage.getOperationKey(serializedGestures);
     if (operationKey === undefined) {
@@ -92,7 +106,7 @@ export class OperationResolver {
     }
 
     const element = OperationResolver.operations[operationKey];
-    await element.operation.doAsync();
+    await element.operation.doAsync(context);
   }
 
   #serializeGestures(gestures) {

service-worker-scripts/operations/close-tabs-to-right-operation.js

@@ -0,0 +1,15 @@
+export class CloseTabsToRightOperation {
+  async doAsync() {
+    const [currentTab] = await chrome.tabs.query({ active: true, currentWindow: true });
+    if (!currentTab?.id) {
+      return;
+    }
+
+    const allTabs = await chrome.tabs.query({ currentWindow: true });
+    const tabsToClose = allTabs.filter(tab => tab.index > currentTab.index).map(tab => tab.id);
+
+    if (tabsToClose.length > 0) {
+      chrome.tabs.remove(tabsToClose);
+    }
+  }
+}

service-worker-scripts/operations/search-highlighted-text-operation.js

@@ -0,0 +1,15 @@
+export class SearchHighlightedTextOperation {
+  #active = false;
+
+  constructor(active) {
+    this.#active = active ?? false;
+  }
+
+  async doAsync(context) {
+    const selectedText = context?.selectedText?.trim() ?? '';
+    if (selectedText?.length > 0) {
+      const query = encodeURIComponent(selectedText);
+      chrome.tabs.create({ url: `https://www.google.com/search?q=${query}`, active: this.#active });
+    }
+  }
+}