diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 2b3810efb..c37effa07 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -27,7 +27,7 @@ function App() {
useLayoutEffect(() => {
// Electron app register in app scope, but web app should register in window scope
- if (ELECTRON) return
+ if (window.electron) return
const handleOpenSettings = (e) => {
if (e.key === "," && (e.metaKey || e.ctrlKey)) {
window.router.showSettings()
@@ -41,10 +41,10 @@ function App() {
}
}, [])
- const windowsElectron = ELECTRON && getOS() === "Windows"
+ const windowsElectron = window.electron && getOS() === "Windows"
return (
<>
- {ELECTRON && !windowsElectron && (
+ {window.electron && !windowsElectron && (
= ({ className, children, ...rest }) => {
const opaqueSidebar = useUISettingKey("opaqueSidebar")
const canVibrancy =
- ELECTRON &&
- window.electron?.process.platform === "darwin" &&
+ window.electron &&
+ window.electron.process.platform === "darwin" &&
!opaqueSidebar
return (
diff --git a/src/renderer/src/components/ui/image/preview-image.tsx b/src/renderer/src/components/ui/image/preview-image.tsx
index 742db90e5..acee7e6c7 100644
--- a/src/renderer/src/components/ui/image/preview-image.tsx
+++ b/src/renderer/src/components/ui/image/preview-image.tsx
@@ -34,7 +34,7 @@ const Wrapper: Component<{
className="absolute bottom-4 right-4 flex gap-3"
onClick={stopPropagation}
>
- {ELECTRON && (
+ {!!window.electron && (
{
@@ -64,7 +64,7 @@ export const PreviewImageContent: FC<{
const handleContextMenu = useCallback(
(image: string, e: React.MouseEvent) => {
- if (!ELECTRON) return
+ if (!window.electron) return
showNativeMenu(
[
diff --git a/src/renderer/src/components/user-button.tsx b/src/renderer/src/components/user-button.tsx
index 41275380a..b166f353e 100644
--- a/src/renderer/src/components/user-button.tsx
+++ b/src/renderer/src/components/user-button.tsx
@@ -47,7 +47,9 @@ export const LoginButton: FC = (props) => {
title: "Login",
id: "login",
content: () => (
-
+
),
clickOutsideToDismiss: true,
})
@@ -124,7 +126,7 @@ export const ProfileButton: FC = memo((props) => {
Preferences
- {!ELECTRON && (
+ {!window.electron && (
<>
{
diff --git a/src/renderer/src/hooks/common/useDark.ts b/src/renderer/src/hooks/common/useDark.ts
index a81833e16..aabc97930 100644
--- a/src/renderer/src/hooks/common/useDark.ts
+++ b/src/renderer/src/hooks/common/useDark.ts
@@ -8,7 +8,7 @@ import { useMediaQuery } from "usehooks-ts"
const useDarkQuery = () => useMediaQuery("(prefers-color-scheme: dark)")
type ColorMode = "light" | "dark" | "system"
-const darkAtom = !ELECTRON ?
+const darkAtom = !window.electron ?
atomWithStorage(
getStorageNS("color-mode"),
"system" as ColorMode,
@@ -26,7 +26,7 @@ function useDarkWebApp() {
const mode = useAtomValue(darkAtom)
return mode === "dark" || (mode === "system" && systemIsDark)
}
-export const useDark = ELECTRON ? useDarkElectron : useDarkWebApp
+export const useDark = window.electron ? useDarkElectron : useDarkWebApp
const useSyncDarkElectron = () => {
const appIsDark = useDarkQuery()
@@ -50,7 +50,7 @@ const useSyncDarkWebApp = () => {
}, [colorMode, systemIsDark])
}
-export const useSyncDark = ELECTRON ?
+export const useSyncDark = window.electron ?
useSyncDarkElectron :
useSyncDarkWebApp
diff --git a/src/renderer/src/hooks/common/useTitle.ts b/src/renderer/src/hooks/common/useTitle.ts
index 035c9dc68..9ba6ca605 100644
--- a/src/renderer/src/hooks/common/useTitle.ts
+++ b/src/renderer/src/hooks/common/useTitle.ts
@@ -1,6 +1,6 @@
import { useEffect, useRef } from "react"
-const titleTemplate = ELECTRON ? `%s` : `%s | ${APP_NAME}`
+const titleTemplate = window.electron ? `%s` : `%s | ${APP_NAME}`
export const useTitle = (title?: Nullable) => {
const currentTitleRef = useRef(document.title)
diff --git a/src/renderer/src/lib/auth.ts b/src/renderer/src/lib/auth.ts
index ef815ea16..c4af64ff0 100644
--- a/src/renderer/src/lib/auth.ts
+++ b/src/renderer/src/lib/auth.ts
@@ -4,7 +4,7 @@ import { WEB_URL } from "@shared/constants"
export const LOGIN_CALLBACK_URL = `${WEB_URL}/redirect?app=follow`
export type LoginRuntime = "browser" | "app"
export const loginHandler = (provider: string, runtime: LoginRuntime = "app") => {
- if (ELECTRON) {
+ if (window.electron) {
window.open(
`${WEB_URL}/login?provider=${provider}`,
)
diff --git a/src/renderer/src/lib/client.ts b/src/renderer/src/lib/client.ts
index 84956f85a..d3a8ec723 100644
--- a/src/renderer/src/lib/client.ts
+++ b/src/renderer/src/lib/client.ts
@@ -1,8 +1,8 @@
import { createClient } from "@egoist/tipc/renderer"
import type { Router } from "@main/tipc"
-export const tipcClient = ELECTRON ?
- window.electron && createClient({
+export const tipcClient = window.electron ?
+ createClient({
ipcInvoke: window.electron.ipcRenderer.invoke,
}) :
null
diff --git a/src/renderer/src/lib/native-menu.ts b/src/renderer/src/lib/native-menu.ts
index 4598c82bb..5a1dc5eb8 100644
--- a/src/renderer/src/lib/native-menu.ts
+++ b/src/renderer/src/lib/native-menu.ts
@@ -20,7 +20,7 @@ export const showNativeMenu = async (
el.dataset.contextMenuOpen = "true"
}
- if (!ELECTRON) {
+ if (!window.electron) {
document.dispatchEvent(
new CustomEvent(CONTEXT_MENU_SHOW_EVENT_KEY, {
detail: {
diff --git a/src/renderer/src/main.tsx b/src/renderer/src/main.tsx
index 5f24c8174..36fcadc3f 100644
--- a/src/renderer/src/main.tsx
+++ b/src/renderer/src/main.tsx
@@ -16,7 +16,7 @@ await initializeApp().finally(() => {
const $container = document.querySelector("#root") as HTMLElement
-if (ELECTRON && getOS() === "Windows") {
+if (window.electron && getOS() === "Windows") {
$container.style.borderRadius = "12px"
$container.style.overflow = "hidden"
$container.style.paddingTop = "24px"
diff --git a/src/renderer/src/modules/entry-column/index.tsx b/src/renderer/src/modules/entry-column/index.tsx
index ab15dd893..d90441b48 100644
--- a/src/renderer/src/modules/entry-column/index.tsx
+++ b/src/renderer/src/modules/entry-column/index.tsx
@@ -214,7 +214,7 @@ const ListHeader: FC<{
const headerTitle = useFeedHeaderTitle()
const os = getOS()
- const titleAtBottom = ELECTRON && os === "macOS"
+ const titleAtBottom = window.electron && os === "macOS"
const isInCollectionList = feedId === FEED_COLLECTION_LIST
const titleInfo = !!headerTitle && (
diff --git a/src/renderer/src/modules/entry-column/video-item.tsx b/src/renderer/src/modules/entry-column/video-item.tsx
index dedddbc09..c8bd5e582 100644
--- a/src/renderer/src/modules/entry-column/video-item.tsx
+++ b/src/renderer/src/modules/entry-column/video-item.tsx
@@ -13,7 +13,7 @@ import { useMemo, useRef, useState } from "react"
import { ReactVirtuosoItemPlaceholder } from "../../components/ui/placeholder"
import type { UniversalItemProps } from "./types"
-const ViewTag = ELECTRON ? "webview" : "iframe"
+const ViewTag = window.electron ? "webview" : "iframe"
export function VideoItem({ entryId, entryPreview, translation }: UniversalItemProps) {
const entry = useEntry(entryId) || entryPreview
diff --git a/src/renderer/src/modules/feed-column/index.tsx b/src/renderer/src/modules/feed-column/index.tsx
index a08732b50..e87099d7a 100644
--- a/src/renderer/src/modules/feed-column/index.tsx
+++ b/src/renderer/src/modules/feed-column/index.tsx
@@ -139,7 +139,7 @@ export function FeedColumn({ children }: PropsWithChildren) {
)
const normalStyle =
- !ELECTRON || window.electron?.process.platform !== "darwin"
+ !window.electron || window.electron.process.platform !== "darwin"
const unreadByView = useUnreadByView()
diff --git a/src/renderer/src/modules/settings/tabs/apperance.tsx b/src/renderer/src/modules/settings/tabs/apperance.tsx
index 82925effd..415445b43 100644
--- a/src/renderer/src/modules/settings/tabs/apperance.tsx
+++ b/src/renderer/src/modules/settings/tabs/apperance.tsx
@@ -43,7 +43,7 @@ export const SettingAppearance = () => {
label="Dark Mode"
checked={isDark}
onCheckedChange={(e) => {
- if (ELECTRON) {
+ if (window.electron) {
tipcClient?.setAppearance(e ? "dark" : "light")
} else {
setDarkInWebApp(e ? "dark" : "light")
@@ -66,7 +66,7 @@ export const SettingAppearance = () => {
},
{
disabled:
- !ELECTRON || !["macOS", "Linux"].includes(getOS()),
+ !window.electron || !["macOS", "Linux"].includes(getOS()),
label: "Dock Badge",
key: "showDockBadge",
onChange: (value) => setUISetting("showDockBadge", value),
@@ -81,7 +81,7 @@ export const SettingAppearance = () => {
type: "title",
value: "Content",
},
- !!ELECTRON && Fonts,
+ !!window.electron && Fonts,
ShikiTheme,
{
diff --git a/src/renderer/src/modules/settings/tabs/general.tsx b/src/renderer/src/modules/settings/tabs/general.tsx
index ab777b267..304ac0898 100644
--- a/src/renderer/src/modules/settings/tabs/general.tsx
+++ b/src/renderer/src/modules/settings/tabs/general.tsx
@@ -114,7 +114,7 @@ export const SettingGeneral = () => {
]}
/>
- {/* {ELECTRON&& (
+ {/* {window.electron && (
-
+
)}
diff --git a/src/renderer/src/providers/root-providers.tsx b/src/renderer/src/providers/root-providers.tsx
index 01408c6f6..601c1a4cf 100644
--- a/src/renderer/src/providers/root-providers.tsx
+++ b/src/renderer/src/providers/root-providers.tsx
@@ -48,6 +48,6 @@ export const RootProviders: FC = ({ children }) => (
const Devtools = () => (
<>
- {!ELECTRON && }
+ {!window.electron && }
>
)
diff --git a/src/renderer/src/tipc.ts b/src/renderer/src/tipc.ts
index e684eb80f..c733cbc07 100644
--- a/src/renderer/src/tipc.ts
+++ b/src/renderer/src/tipc.ts
@@ -1,8 +1,7 @@
import { createEventHandlers } from "@egoist/tipc/renderer"
import type { RendererHandlers } from "@main/renderer-handlers"
-export const handlers = ELECTRON ?
- window.electron &&
+export const handlers = window.electron ?
createEventHandlers({
on: (channel, callback) => {
if (!window.electron) return () => {}