Skip to content

[Hotfix] 글쓰기 페이지에서 콘텐트 스크립트 인젝 되지 않은 경우 새로고침 되지 않던 버그 수정 #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yonghyeun merged 3 commits into from
Jan 9, 2025
Merged

[Hotfix] 글쓰기 페이지에서 콘텐트 스크립트 인젝 되지 않은 경우 새로고침 되지 않던 버그 수정 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f0a45e
refactor[#106] : TapProvider 에서 유효하지 않은 탭일 경우 null로 상태 저장하도록 수정
yonghyeun Jan 9, 2025
e585d54
refactor[#106] : isVelogWritePage 메소드로 변경
yonghyeun Jan 9, 2025
bb35ef3
feat[#106] : 자동 변환 토글에서 writePage 면서 contentScript inject 안되었을 경우 자동…
yonghyeun Jan 9, 2025
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
4 changes: 0 additions & 4 deletions extension/src/background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ chrome.runtime.onMessage.addListener(
case "NotifyError":
notifyError(message.data as string, sendResponse);
break;
case "ReloadPage":
chrome.tabs.reload(tab.id);
sendResponse({ status: "ok" });
break;
case "NotifyConvertProcessSuccess":
const { data } = message as RequestMessage<number[]>;

Expand Down
17 changes: 4 additions & 13 deletions extension/src/features/reference/ui/AutoConvertingToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,23 @@
import { useChromeStorage, useTab } from "@/shared/store";
import styles from "./styles.module.css";
import { useEffect, useState } from "react";
import { useEffect } from "react";
import { isVelogWritePage } from "@/shared/lib";

export const AutoConvertingToggle = () => {
const {
chromeStorage: { autoConverting, isContentScriptEnabled },
setChromeStorage,
} = useChromeStorage();
const tab = useTab();
const [isAutoConvertingDisabled, setIsAutoConvertingDisabled] =
useState<boolean>(false);

useEffect(() => {
if (!tab) {
return;
}

if (tab.url.includes("https://velog.io/write") && !isContentScriptEnabled) {
setIsAutoConvertingDisabled(true);
setChromeStorage((prev) => ({
...prev,
autoConverting: false,
}));
return;
if (isVelogWritePage(tab) && !isContentScriptEnabled) {
chrome.tabs.reload(tab.id);
}

setIsAutoConvertingDisabled(false);
}, [tab, isContentScriptEnabled]);

return (
Expand All @@ -46,7 +38,6 @@ export const AutoConvertingToggle = () => {
autoConverting: !prev.autoConverting,
}));
}}
disabled={isAutoConvertingDisabled}
/>
<span className={styles.toggleSlider} />
</div>
Expand Down
10 changes: 5 additions & 5 deletions extension/src/features/reference/ui/ConvertToReferenceButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Button } from "@/shared/ui/button";
import { useChromeStorage, useTab } from "@/shared/store";
import { sendMessageToBackground } from "@/shared/lib";
import { isVelogWritePage, sendMessageToBackground } from "@/shared/lib";

export const ConvertToReferenceButton = () => {
const { chromeStorage } = useChromeStorage();
const {
chromeStorage: { isContentScriptEnabled },
} = useChromeStorage();
const tab = useTab();

const isVelogWritePage = tab?.url.includes("https://velog.io/write");

const handleClick = async () => {
if (!tab) {
return;
Expand Down Expand Up @@ -39,7 +39,7 @@ export const ConvertToReferenceButton = () => {
<Button
onClick={handleClick}
className="flex-grow"
disabled={!(isVelogWritePage && chromeStorage.isContentScriptEnabled)}
disabled={!(isVelogWritePage(tab) && isContentScriptEnabled)}
>
텍스트 변환
</Button>
Expand Down
7 changes: 7 additions & 0 deletions extension/src/shared/lib/tab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
export const isTab = (tab: chrome.tabs.Tab | undefined): tab is Tab =>
!!tab && !!tab.id && !!tab.url && !!tab.title;

export const isVelogWritePage = (tab: Tab | null) => {
if (!tab) {
return false;
}
return tab.url.includes("https://velog.io/write");
};
43 changes: 5 additions & 38 deletions extension/src/shared/store/tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { createContext, useContext, useEffect, useState } from "react";
import { sendMessageToBackground } from "../lib";
import { isTab } from "../lib";

type Tab = chrome.tabs.Tab & {
id: number;
url: string;
title: string;
};

const TabContext = createContext<Tab | null>(null);
Expand All @@ -17,53 +18,19 @@ export const TabProvider = ({ children }: TabProviderProps) => {

useEffect(() => {
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
try {
if (!tab || !tab.id || !tab.url) {
throw new Error("현재 탭의 정보를 가져올 수 없습니다.");
}
setTab(tab as Tab);
} catch (error) {
sendMessageToBackground<void, string>({
message: "NotifyError",
data: (error as Error).message,
});

setTab(null);
}
setTab(isTab(tab) ? tab : null);
});

const handleHistoryUpdate = (_tabId: number, changeInfo: any, tab: any) => {
if (changeInfo.status === "complete") {
try {
if (!tab || !tab.id || !tab.url) {
throw new Error("현재 탭의 정보를 가져올 수 없습니다.");
}
setTab(tab as Tab);
} catch (error) {
sendMessageToBackground<void, string>({
message: "NotifyError",
data: (error as Error).message,
});
setTab(null);
}
setTab(isTab(tab) ? tab : null);
}
};

const handleWindowUpdate = async ({ tabId }: chrome.tabs.TabActiveInfo) => {
const tab = await chrome.tabs.get(tabId);
if (tab.status === "complete") {
try {
if (!tab || !tab.id || !tab.url) {
throw new Error("현재 탭의 정보를 가져올 수 없습니다.");
}
setTab(tab as Tab);
} catch (error) {
sendMessageToBackground<void, string>({
message: "NotifyError",
data: (error as Error).message,
});
setTab(null);
}
setTab(isTab(tab) ? tab : null);
}
};

Expand Down