Merge pull request #73 from questbeat/refactoring

Refactoring
nek023 · May 6, 2023 · 2a0b43a · 2a0b43a
2 parents 8ead3d2 + 9b7fea3
commit 2a0b43a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 32 deletions.
diff --git a/src/popup/components/App.tsx b/src/popup/components/App.tsx
@@ -25,7 +25,7 @@ export const App: React.FC = () => {
 
   const handleExtensionMessage = useCallback<ExtensionMessageCallback>(
     (message, sender, sendResponse) => {
-      if (message.type === MessageType.SetQuery) {
+      if (message.type === MessageType.setQuery) {
         setQuery(message.payload.query);
         sendResponse(true);
       }

diff --git a/src/popup/components/KeyboardEventHandler.tsx b/src/popup/components/KeyboardEventHandler.tsx
@@ -1,12 +1,12 @@
 import React, { useCallback, useEffect } from "react";
 
 const Code = {
-  ArrowDown: "ArrowDown",
-  ArrowUp: "ArrowUp",
-  Enter: "Enter",
-  Escape: "Escape",
-  KeyN: "KeyN",
-  KeyP: "KeyP",
+  arrowDown: "ArrowDown",
+  arrowUp: "ArrowUp",
+  enter: "Enter",
+  escape: "Escape",
+  keyN: "KeyN",
+  keyP: "KeyP",
 };
 
 interface KeyboardEventHandlerProps {
@@ -29,37 +29,37 @@ export const KeyboardEventHandler: React.FC<KeyboardEventHandlerProps> = ({
       if (event.isComposing) return;
 
       switch (event.code) {
-        case Code.ArrowDown:
+        case Code.arrowDown:
           if (onDown == null) break;
           event.preventDefault();
           onDown();
           break;
 
-        case Code.ArrowUp:
+        case Code.arrowUp:
           if (onUp == null) break;
           event.preventDefault();
           onUp();
           break;
 
-        case Code.Enter:
+        case Code.enter:
           if (onEnter == null) break;
           event.preventDefault();
           onEnter();
           break;
 
-        case Code.Escape:
+        case Code.escape:
           if (onEscape == null) break;
           event.preventDefault();
           onEscape();
           break;
 
-        case Code.KeyN:
+        case Code.keyN:
           if (onDown == null || !event.ctrlKey) break;
           event.preventDefault();
           onDown();
           break;
 
-        case Code.KeyP:
+        case Code.keyP:
           if (onUp == null || !event.ctrlKey) break;
           event.preventDefault();
           onUp();

diff --git a/src/service_worker/index.ts b/src/service_worker/index.ts
@@ -7,13 +7,15 @@ import { HistoryLoader } from "./lib/HistoryLoader";
 import { TabLoader } from "./lib/TabLoader";
 
 const Command = {
-  ToggleTab: "toggle-anchor",
-  ToggleBookmark: "toggle-anchor-with-bookmark-mode",
-  ToggleHistory: "toggle-anchor-with-history-mode",
-} as const;
+  toggleTab: "toggle-anchor",
+  toggleBookmark: "toggle-anchor-with-bookmark-mode",
+  toggleHistory: "toggle-anchor-with-history-mode",
+};
 
-const WINDOW_WIDTH = 600;
-const WINDOW_HEIGHT = 496 + 22;
+const WindowSize = {
+  width: 600,
+  height: 526,
+};
 
 const displayManager = new DisplayManager();
 const itemManager = new ItemManager({
@@ -37,14 +39,14 @@ const openWindow = (query: string) => {
       if (display == null) return;
 
       const bounds = {
-        width: WINDOW_WIDTH,
-        height: WINDOW_HEIGHT,
+        width: WindowSize.width,
+        height: WindowSize.height,
         left:
           display.bounds.left +
-          Math.round((display.bounds.width - WINDOW_WIDTH) * 0.5),
+          Math.round((display.bounds.width - WindowSize.width) * 0.5),
         top:
           display.bounds.top +
-          Math.round((display.bounds.height - WINDOW_HEIGHT) * 0.5),
+          Math.round((display.bounds.height - WindowSize.height) * 0.5),
       };
 
       if (mainWindow?.id != null) {
@@ -94,15 +96,15 @@ chrome.windows.onFocusChanged.addListener((windowId) => {
 
 chrome.commands.onCommand.addListener((command) => {
   switch (command) {
-    case Command.ToggleTab:
+    case Command.toggleTab:
       openWindow("");
       break;
 
-    case Command.ToggleBookmark:
+    case Command.toggleBookmark:
       openWindow("b:");
       break;
 
-    case Command.ToggleHistory:
+    case Command.toggleHistory:
       openWindow("h:");
       break;
 
@@ -113,7 +115,7 @@ chrome.commands.onCommand.addListener((command) => {
 
 chrome.runtime.onMessage.addListener(
   (message: Message, sender, sendResponse) => {
-    if (message.type === MessageType.SearchItems) {
+    if (message.type === MessageType.searchItems) {
       const { filter, pattern } = parseQuery(message.payload.query);
       const items = itemManager.searchItems(
         filter !== "" ? filter : "t",

diff --git a/src/shared/ipc.ts b/src/shared/ipc.ts
@@ -1,15 +1,15 @@
 export const MessageType = {
-  SearchItems: "SEARCH_ITEMS",
-  SetQuery: "SET_QUERY",
-} as const;
+  searchItems: "SEARCH_ITEMS",
+  setQuery: "SET_QUERY",
+};
 
 export const searchItems = (query: string) => ({
-  type: MessageType.SearchItems,
+  type: MessageType.searchItems,
   payload: { query },
 });
 
 export const setQuery = (query: string) => ({
-  type: MessageType.SetQuery,
+  type: MessageType.setQuery,
   payload: { query },
 });