Skip to content

Edge-Drop is a clipboard shelf on the edge of your screen. Hover to open it. Drag files and images into any app, click to copy text and links. Free and open-source for Windows.

feat(settings): redesign vertical settings with modular cards and unify subcategory dividers across horizontal and vertical views

Deepender252bd98ce7f16f
diff --git a/electron/main/ipc.ts b/electron/main/ipc.ts
index 593e65f..e065546 100644
--- a/electron/main/ipc.ts
+++ b/electron/main/ipc.ts
@@ -673,7 +673,7 @@ export function registerIpc(): void {
popUpAndRetract(1500)
}
}
- if (patch.autoUpdates !== undefined) {
+ if (patch.autoUpdates !== undefined || patch.updateMode !== undefined) {
syncAutoUpdaterState()
}
if (patch.toggleHotkey !== undefined) {
diff --git a/electron/main/updater.ts b/electron/main/updater.ts
index 3ff619d..5b480b3 100644
--- a/electron/main/updater.ts
+++ b/electron/main/updater.ts
@@ -2,6 +2,7 @@ import { app, net } from 'electron'
import { isStoreBuild } from './config'
import { pushState } from './state'
import { getSettings } from '../store/settings'
+import { resolveUpdateMode } from '../../shared/types'
// Module-level reference to the single autoUpdater instance.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -25,15 +26,16 @@ export function quitAndInstallUpdate(): void {
}
/**
- * Syncs the autoDownload flag on electron-updater whenever user changes settings.
+ * Syncs the download flags on electron-updater whenever user changes settings.
+ * Only 'auto' mode downloads; 'notify' checks without downloading.
*/
export function syncAutoUpdaterState(): void {
if (isStoreBuild() || !_autoUpdater) return
- const settings = getSettings()
- const enabled = settings.autoUpdates !== false
- _autoUpdater.autoDownload = enabled
- _autoUpdater.autoInstallOnAppQuit = enabled
- console.log('[AutoUpdater] Synced autoDownload =', enabled)
+ const mode = resolveUpdateMode(getSettings())
+ const autoDownload = mode === 'auto'
+ _autoUpdater.autoDownload = autoDownload
+ _autoUpdater.autoInstallOnAppQuit = autoDownload
+ console.log('[AutoUpdater] Synced mode =', mode, 'autoDownload =', autoDownload)
}
function semverCompare(v1: string, v2: string): number {
@@ -183,11 +185,15 @@ export function initAutoUpdater(): void {
_autoUpdater = autoUpdater
const settings = getSettings()
- const autoUpdatesEnabled = settings.autoUpdates !== false
+ const mode = resolveUpdateMode(settings)
+ const autoDownload = mode === 'auto'
+ // 'notify' still checks at launch (tiny version query) but never downloads
+ // on its own; 'off' stays fully network-silent.
+ const shouldCheck = mode !== 'off'
autoUpdater.logger = console
- autoUpdater.autoDownload = autoUpdatesEnabled
- autoUpdater.autoInstallOnAppQuit = autoUpdatesEnabled
+ autoUpdater.autoDownload = autoDownload
+ autoUpdater.autoInstallOnAppQuit = autoDownload
if (!app.isPackaged) {
console.log('[AutoUpdater] Unpackaged dev build detected — enabling forceDevUpdateConfig')
@@ -228,8 +234,13 @@ export function initAutoUpdater(): void {
console.warn('[AutoUpdater] Update check error:', msg)
})
- // Initiate background update check ONLY if autoUpdates is enabled!
- if (autoUpdatesEnabled) {
+ // Background check runs in 'auto' and 'notify' modes; only 'off' stays
+ // fully network-silent. In 'notify' mode autoDownload is off, so a found
+ // update only surfaces the Download/Skip prompt — nothing downloads.
+ if (shouldCheck) {
+ if (!autoDownload) {
+ console.log('[AutoUpdater] Notify mode: background check without auto-download.')
+ }
setTimeout(() => {
autoUpdater.checkForUpdates().catch((err: Error | string) => {
const msg = typeof err === 'string' ? err : err?.message
@@ -237,7 +248,7 @@ export function initAutoUpdater(): void {
})
}, 3000)
} else {
- console.log('[AutoUpdater] Automatic updates disabled by user setting. Staying network-silent on startup.')
+ console.log('[AutoUpdater] Updates disabled by user setting. Staying network-silent on startup.')
}
} catch (err) {
console.error('[AutoUpdater] Initialization failed:', err)
diff --git a/electron/store/settings.ts b/electron/store/settings.ts
index a0e787c..53b949b 100644
--- a/electron/store/settings.ts
+++ b/electron/store/settings.ts
@@ -6,7 +6,7 @@
* defaults so a bad field never takes the whole app down.
*/
import { readFileSync, writeFileSync, existsSync } from 'node:fs'
-import { DEFAULT_SETTINGS, type Settings } from '../../shared/types'
+import { DEFAULT_SETTINGS, isUpdateMode, type Settings } from '../../shared/types'
import { PATHS } from './paths'
let cache: Settings | null = null
@@ -30,6 +30,17 @@ function merge(base: Settings, patch: Partial<Settings>): Settings {
if (typeof out.language !== 'string' || !out.language.trim()) {
out.language = 'system'
}
+ // Update mode migration + validation. Legacy files carry only autoUpdates;
+ // map them (false -> 'off', anything else -> 'auto') so existing installs
+ // keep byte-identical behavior. Then sync the legacy boolean back from the
+ // mode so downgraded app versions still read a sensible value.
+ if (!isUpdateMode(out.updateMode)) {
+ out.updateMode = out.autoUpdates === false ? 'off' : 'auto'
+ }
+ out.autoUpdates = out.updateMode === 'auto'
+ if (typeof out.skippedUpdateVersion !== 'string' || !out.skippedUpdateVersion.trim()) {
+ out.skippedUpdateVersion = undefined
+ }
return out
}
diff --git a/shared/types.ts b/shared/types.ts
index 21f3195..2d19568 100644
--- a/shared/types.ts
+++ b/shared/types.ts
@@ -11,6 +11,27 @@
/** Maximum number of sub-items that may live in a single stack/bundle. */
export const MAX_STACK = 10
+/** Update behavior mode. See Settings.updateMode. */
+export type UpdateMode = 'auto' | 'notify' | 'off'
+
+const UPDATE_MODES: readonly UpdateMode[] = ['auto', 'notify', 'off']
+
+/**
+ * Resolve the effective update mode. Prefers the stored updateMode; migrates
+ * legacy autoUpdates booleans (true/missing -> 'auto', false -> 'off') so
+ * existing installs keep their exact behavior with zero surprises.
+ */
+export function resolveUpdateMode(s: Pick<Settings, 'updateMode' | 'autoUpdates'>): UpdateMode {
+ if (s.updateMode === 'auto' || s.updateMode === 'notify' || s.updateMode === 'off') {
+ return s.updateMode
+ }
+ return s.autoUpdates === false ? 'off' : 'auto'
+}
+
+export function isUpdateMode(value: unknown): value is UpdateMode {
+ return (UPDATE_MODES as readonly unknown[]).includes(value)
+}
+
/** How a clipboard bitmap was captured. Omitted on older persisted items. */
export type ClipboardImageSource = 'screenshot' | 'image'
@@ -180,8 +201,16 @@ export interface Settings {
hoverActivation?: boolean
/** Font size scale multiplier (0.85 = Small, 1.00 = Normal, 1.15 = Large). Default: 1.0. */
fontSizeScale?: number
- /** When true, automatically checks for and downloads app updates in background. Default: true. */
+ /** When true, automatically checks for and downloads app updates in background. Default: true. Legacy: kept in sync from updateMode for downgrade safety. */
autoUpdates?: boolean
+ /**
+ * Update behavior mode: 'auto' (check + download + prompt restart),
+ * 'notify' (check at launch, prompt with Download/Skip, never auto-download),
+ * 'off' (fully silent, zero network). Default: 'auto'. Supersedes autoUpdates.
+ */
+ updateMode?: UpdateMode
+ /** Version string the user skipped; that exact version is not re-prompted until a newer one appears. */
+ skippedUpdateVersion?: string
/** Active UI language code ('system' | 'en' | 'es' | 'fr' | 'de' | ...). Default: 'system'. */
language?: string
/** When true, pasting an unpinned item updates its timestamp to move it to the top of Recent. Default: true. */
@@ -222,6 +251,8 @@ export const DEFAULT_SETTINGS: Settings = {
hoverActivation: true,
fontSizeScale: 1.0,
autoUpdates: true,
+ updateMode: 'auto',
+ skippedUpdateVersion: undefined,
language: 'system',
toggleHotkey: 'Alt+C'
}
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 3a4bf51..6ee9ead 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -375,7 +375,7 @@ export function Header({ isHorizontal = false, itemCount, clearProps }: HeaderPr
>
<CloseIcon />
</span>
- {!settingsOpen && (updateInfo?.downloaded || ((settings.autoUpdates ?? true) && updateInfo?.hasUpdate)) && (
+ {!settingsOpen && (updateInfo?.downloaded || updateInfo?.hasUpdate) && (
<span
style={{
position: 'absolute',
diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
index e7f3b22..a579766 100644
--- a/src/components/Settings.tsx
+++ b/src/components/Settings.tsx
@@ -1,7 +1,8 @@
import { useEffect, useState, useRef, useLayoutEffect } from 'react'
import { motion, AnimatePresence } from 'framer-motion'
import { useStore } from '../store/appStore'
-import type { DisplayInfo } from '../../shared/types'
+import type { DisplayInfo, UpdateMode } from '../../shared/types'
+import { resolveUpdateMode } from '../../shared/types'
import {
LogoIndicatorIcon,
TickIndicatorIcon,
@@ -168,13 +169,18 @@ export function Settings({
}, [])
const updateDownloaded = updateInfo?.downloaded ? { version: updateInfo.latestVersion } : null
- const autoUpdates = settings.autoUpdates ?? true
+ const updateMode = resolveUpdateMode(settings)
const checkState = useStore((s) => s.manualCheckState)
const handleManualCheck = () => useStore.getState().startManualCheck()
const handleStartDownload = () => useStore.getState().startManualDownload()
- const isDownloading = checkState.status === 'downloading' || (!updateDownloaded && (settings.autoUpdates ?? true) && !!updateInfo?.hasUpdate)
+ // Downloading while a real download runs (manual or auto). In 'auto' mode a
+ // just-found update starts downloading immediately, so cover that gap too;
+ // in 'notify' mode a found update waits for the user's Download click.
+ const isDownloading = checkState.status === 'downloading' || (!updateDownloaded && !!updateInfo?.hasUpdate && (updateMode === 'auto' || !!updateInfo?.downloadProgress))
+ // Background-found update waiting for a decision (notify mode prompt).
+ const hasBackgroundUpdate = !updateDownloaded && !isDownloading && !!updateInfo?.hasUpdate
const downloadPercent = updateInfo?.downloadProgress?.percent ?? 0
// ── Tab state & Independent Scroll Memory per section ──────────────────────
@@ -219,11 +225,13 @@ export function Settings({
// ── Update banner ref & status tracking ────────────────────────────────────
const updateBannerRef = useRef<HTMLDivElement | null>(null)
- const hasUpdatePrompt = !isStoreBuild && (!autoUpdates || !!(updateDownloaded || isDownloading || checkState.status === 'available'))
+ // Active update states, mode-independent: banners and prompts show whenever
+ // an update is known (auto download, notify prompt, or manual result).
+ const hasUpdatePrompt = !isStoreBuild && !!(updateDownloaded || isDownloading || checkState.status === 'available' || hasBackgroundUpdate)
// ── Floating Scroll Indicator Badge for Off-Screen Update Banner ────────────
const [isUpdateCardVisible, setIsUpdateCardVisible] = useState(false)
- const hasActiveUpdate = !isStoreBuild && !!(updateDownloaded || isDownloading || checkState.status === 'available')
+ const hasActiveUpdate = !isStoreBuild && !!(updateDownloaded || isDownloading || checkState.status === 'available' || hasBackgroundUpdate)
const showScrollUpdateBadge = hasActiveUpdate && !isUpdateCardVisible
useEffect(() => {
@@ -291,92 +299,97 @@ export function Settings({
const PersistentFooter = (
<>
{/* Community & Support */}
- <div className="setting-group-label" style={{ marginTop: 20 }}>{t('footer.communityAndSupport')}</div>
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('footer.communityAndSupport') || 'COMMUNITY & SUPPORT'}</span>
+ </div>
- <div className="setting-row vertical" style={{ gap: 10 }}>
- <div className="setting-info">
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">FEEDBACK</div>
<div className="setting-title">{t('footer.feedbackTitle')}</div>
<div className="setting-desc">{t('footer.feedbackDesc')}</div>
</div>
- <button
- className="pill display-pill"
- style={{ width: '100%', justifyContent: 'center', padding: '7px 14px', cursor: 'pointer', whiteSpace: 'nowrap', fontSize: '12.5px' }}
- onClick={() => {
- playButtonClickSound()
- window.open('https://github.com/Deepender25/Edge-Drop/issues/new/choose', '_blank')
- }}
- >
- {t('footer.submitFeedback')}
- </button>
- </div>
-
- {/* Support & GitHub Promo Footer */}
- <div className="setting-divider" style={{ marginTop: 20 }} />
-
- <div className="support-promo">
- <div className="support-promo-title">
- {t('footer.supportPromo')}
- </div>
- <div className="support-buttons-group">
- {/* Primary Action: Support via Ko-fi / UPI */}
+ <div className="shelf-card-bottom">
<button
- className="kofi-support-btn"
+ className="pill display-pill"
+ style={{ width: '100%', justifyContent: 'center', padding: '7px 14px', cursor: 'pointer', whiteSpace: 'nowrap', fontSize: '12.5px' }}
onClick={() => {
playButtonClickSound()
- window.open('https://www.edgedrop.app/supportedgedrop', '_blank')
+ window.open('https://github.com/Deepender25/Edge-Drop/issues/new/choose', '_blank')
}}
>
- <svg width="14" height="14" viewBox="0 0 24 24" fill="#ff4757" stroke="none" style={{ flexShrink: 0 }}>
- <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"/>
- </svg>
- <span>{t('footer.supportOnKofi')}</span>
+ {t('footer.submitFeedback')}
</button>
+ </div>
+ </div>
- {/* Secondary Action: GitHub Star on GitHub builds / Review on Microsoft Store for Store builds */}
- {isStoreBuild ? (
+ {/* Support & GitHub Promo Card */}
+ <div className="setting-card" style={{ padding: '14px' }}>
+ <div className="support-promo" style={{ margin: 0, padding: 0, background: 'transparent', border: 'none' }}>
+ <div className="support-promo-title">
+ {t('footer.supportPromo')}
+ </div>
+ <div className="support-buttons-group">
+ {/* Primary Action: Support via Ko-fi / UPI */}
<button
- type="button"
- className="store-review-promo-btn"
+ className="kofi-support-btn"
onClick={() => {
playButtonClickSound()
- window.open('ms-windows-store://review/?ProductId=9P3JMHN9M4NR', '_blank')
+ window.open('https://www.edgedrop.app/supportedgedrop', '_blank')
}}
>
- <MicrosoftStoreLogo width={14} height={14} className="store-logo-icon" />
- <span>{t('footer.reviewOnStore')}</span>
+ <svg width="14" height="14" viewBox="0 0 24 24" fill="#ff4757" stroke="none" style={{ flexShrink: 0 }}>
+ <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"/>
+ </svg>
+ <span>{t('footer.supportOnKofi')}</span>
</button>
- ) : (
+
+ {/* Secondary Action: GitHub Star on GitHub builds / Review on Microsoft Store for Store builds */}
+ {isStoreBuild ? (
+ <button
+ type="button"
+ className="store-review-promo-btn"
+ onClick={() => {
+ playButtonClickSound()
+ window.open('ms-windows-store://review/?ProductId=9P3JMHN9M4NR', '_blank')
+ }}
+ >
+ <MicrosoftStoreLogo width={14} height={14} className="store-logo-icon" />
+ <span>{t('footer.reviewOnStore')}</span>
+ </button>
+ ) : (
+ <button
+ type="button"
+ className="github-promo-btn"
+ onClick={() => {
+ playButtonClickSound()
+ window.open('https://github.com/Deepender25/Edge-Drop', '_blank')
+ }}
+ >
+ <GithubOctocatLogo width={14} height={14} className="github-octocat-icon" />
+ <span>{t('footer.starOnGithub')}</span>
+ <StarIcon width={13} height={13} className="star-icon" fill="#fbbf24" stroke="#fbbf24" style={{ marginLeft: 2 }} />
+ </button>
+ )}
+ </div>
+ <div className="app-version-footer">
+ <span>{t('footer.version')} {currentVersion || '0.3.1'}</span>
+ <span className="version-separator">·</span>
<button
type="button"
- className="github-promo-btn"
+ className="version-changelog-link"
onClick={() => {
playButtonClickSound()
- window.open('https://github.com/Deepender25/Edge-Drop', '_blank')
+ if (currentVersion) {
+ patch({ lastSeenChangelogVersion: currentVersion })
+ }
+ window.open('https://www.edgedrop.app/changelog', '_blank')
}}
>
- <GithubOctocatLogo width={14} height={14} className="github-octocat-icon" />
- <span>{t('footer.starOnGithub')}</span>
- <StarIcon width={13} height={13} className="star-icon" fill="#fbbf24" stroke="#fbbf24" style={{ marginLeft: 2 }} />
+ <span>{t('header.whatsNew')}</span>
+ <span style={{ fontSize: 10, opacity: 0.7 }}>↗</span>
</button>
- )}
- </div>
- <div className="app-version-footer">
- <span>{t('footer.version')} {currentVersion || '0.3.1'}</span>
- <span className="version-separator">·</span>
- <button
- type="button"
- className="version-changelog-link"
- onClick={() => {
- playButtonClickSound()
- if (currentVersion) {
- patch({ lastSeenChangelogVersion: currentVersion })
- }
- window.open('https://www.edgedrop.app/changelog', '_blank')
- }}
- >
- <span>{t('header.whatsNew')}</span>
- <span style={{ fontSize: 10, opacity: 0.7 }}>↗</span>
- </button>
+ </div>
</div>
</div>
@@ -398,7 +411,10 @@ export function Settings({
// ── Manual update card renderer shared between vertical and horizontal views ──
const renderManualUpdateCard = (withRef = false) => {
- if (!hasUpdatePrompt) return null
+ // Callers gate visibility; the idle branch below IS the Check button, so
+ // the card renders in every state on GitHub builds. Store builds never
+ // call this (whole update section is hidden there).
+ if (isStoreBuild) return null
return (
<div className="manual-update-section" ref={withRef ? updateBannerRef : undefined} style={{ width: '100%' }}>
<div className="manual-update-card">
@@ -449,12 +465,12 @@ export function Settings({
: 'Downloading update...'}
</button>
</>
- ) : checkState.status === 'available' ? (
+ ) : (checkState.status === 'available' || hasBackgroundUpdate) ? (
<>
<div className="manual-update-info">
<div className="manual-update-title">
<span className="manual-update-dot ready" />
- <span>{t('behaviour.updateAvailableTitle', { version: checkState.version || '' })}</span>
+ <span>{t('behaviour.updateAvailableTitle', { version: checkState.version || updateInfo?.latestVersion || '' })}</span>
</div>
<div className="manual-update-desc">
{t('behaviour.updateAvailableDesc')}
@@ -694,75 +710,18 @@ export function Settings({
onWheel={handleShelfWheel}
onScroll={handleShelfScroll}
>
- {/* ── CARD 0: Update Banner (if applicable) ── */}
- {hasUpdatePrompt && horizontalTab === 'behaviour' && (
- <div className="settings-shelf-card update-card">
- <div className="shelf-card-top">
- <div className="setting-group-label" style={{ color: '#ffd60a' }}>UPDATE</div>
- <div className="setting-title" style={{ lineHeight: 1.3 }}>
- {updateDownloaded
- ? t('behaviour.updateReadyTitle', { version: updateDownloaded.version })
- : isDownloading
- ? 'Downloading Update...'
- : checkState.status === 'available'
- ? t('behaviour.updateAvailableTitle', { version: checkState.version || '' })
- : t('behaviour.checkForUpdates')}
- </div>
- </div>
- <div className="shelf-card-bottom">
- {updateDownloaded ? (
- <button
- type="button"
- className="pill primary-pill"
- style={{ width: '100%', justifyContent: 'center', background: '#ffd60a', color: '#000000', fontWeight: 600, height: 32, fontSize: 11.5 }}
- onClick={() => {
- playButtonClickSound()
- void window.edge.installUpdate()
- }}
- >
- {t('behaviour.restartToUpdate')}
- </button>
- ) : isDownloading ? (
- <div className="shelf-update-progress-wrap">
- <div className="shelf-progress-bar" style={{ width: `${downloadPercent}%` }} />
- <span className="shelf-progress-text">{downloadPercent > 0 ? `${downloadPercent}%` : 'Connecting...'}</span>
- </div>
- ) : checkState.status === 'available' ? (
- <button
- type="button"
- className="pill primary-pill"
- style={{ width: '100%', justifyContent: 'center', height: 32, fontSize: 11.5 }}
- onClick={() => {
- playButtonClickSound()
- handleStartDownload()
- }}
- >
- {t('behaviour.downloadAndUpdate')}
- </button>
- ) : (
- <button
- type="button"
- className="pill display-pill"
- style={{ width: '100%', justifyContent: 'center', height: 32, fontSize: 11.5 }}
- onClick={() => {
- playButtonClickSound()
- handleManualCheck()
- }}
- >
- {t('behaviour.checkForUpdates')}
- </button>
- )}
- </div>
- </div>
- )}
-
{/* ── TAB 1: BEHAVIOUR ── */}
{horizontalTab === 'behaviour' && (
<>
+ {/* ── SUB-GROUP 1 DIVIDER: General & Startup ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('tabs.generalStartup') || 'GENERAL & STARTUP'}</span>
+ </div>
+
{/* Card 1: Language */}
<div className="settings-shelf-card shortcuts-card behaviour-col">
<div className="shelf-card-top">
- <div className="setting-group-label">LANGUAGE</div>
+ <div className="setting-group-label">GENERAL</div>
<div className="setting-title">{t('behaviour.languageTitle')}</div>
<div className="setting-desc">Select application display language</div>
</div>
@@ -799,29 +758,55 @@ export function Settings({
</div>
</div>
- {/* Card 2: Global Toggle Shortcut */}
- <div className="settings-shelf-card hotkey-card behaviour-col">
+ {/* Card 2: Launch at Login */}
+ <div className="settings-shelf-card system-card behaviour-col">
<div className="shelf-card-top">
- <div className="setting-group-label">KEYBOARD SHORTCUT</div>
- <div className="setting-title">{t('behaviour.toggleHotkeyTitle')}</div>
- <div className="setting-desc">Press anywhere to toggle Edge-Drop</div>
+ <div className="setting-group-label">STARTUP</div>
</div>
- <div className="shelf-card-bottom">
- <HotkeyRecorder
- hotkey={settings.toggleHotkey || 'Alt+C'}
- onChange={(nextHotkey) => {
- patch({ toggleHotkey: nextHotkey })
- pushToast({
- id: Date.now().toString(),
- message: t('toast.shortcutUpdated', { shortcut: nextHotkey }),
- tone: 'info'
- })
- }}
- />
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('behaviour.launchAtLoginTitle')}</div>
+ <div className="setting-desc">{t('behaviour.launchAtLoginDesc')}</div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.launchAtLogin}
+ onChange={(v) => {
+ useStore.setState((s) => ({
+ settings: { ...s.settings, launchAtLogin: v }
+ }))
+ void patch({ launchAtLogin: v })
+ }}
+ />
+ </div>
+ </div>
+ </div>
+
+ {/* Card 3: Incognito Mode */}
+ <div className="settings-shelf-card incognito-card behaviour-col">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">PRIVACY</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('behaviour.incognitoTitle')}</div>
+ <div className="setting-desc">{t('behaviour.incognitoDesc')}</div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.incognito}
+ onChange={(v) => patch({ incognito: v })}
+ />
+ </div>
</div>
</div>
- {/* Card 3: Hover Activation */}
+ {/* ── SUB-GROUP 2 DIVIDER: Shortcuts & Hover ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('tabs.activationShortcuts') || 'SHORTCUTS & HOVER'}</span>
+ </div>
+
+ {/* Card 4: Hover Activation */}
<div className="settings-shelf-card hover-card behaviour-col">
<div className="shelf-card-top">
<div className="setting-group-label">HOVER ACTIVATION</div>
@@ -850,7 +835,29 @@ export function Settings({
</div>
</div>
- {/* Card 4: Fullscreen Protection */}
+ {/* Card 5: Global Toggle Shortcut */}
+ <div className="settings-shelf-card hotkey-card behaviour-col">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">KEYBOARD SHORTCUT</div>
+ <div className="setting-title">{t('behaviour.toggleHotkeyTitle')}</div>
+ <div className="setting-desc">Press anywhere to toggle Edge-Drop</div>
+ </div>
+ <div className="shelf-card-bottom">
+ <HotkeyRecorder
+ hotkey={settings.toggleHotkey || 'Alt+C'}
+ onChange={(nextHotkey) => {
+ patch({ toggleHotkey: nextHotkey })
+ pushToast({
+ id: Date.now().toString(),
+ message: t('toast.shortcutUpdated', { shortcut: nextHotkey }),
+ tone: 'info'
+ })
+ }}
+ />
+ </div>
+ </div>
+
+ {/* Card 6: Fullscreen Protection */}
<div className="settings-shelf-card fullscreen-card behaviour-col">
<div className="shelf-card-top">
<div className="setting-group-label">FULLSCREEN PROTECTION</div>
@@ -874,50 +881,31 @@ export function Settings({
</div>
</div>
- {/* Card 5: Launch at Login */}
- <div className="settings-shelf-card system-card behaviour-col">
- <div className="shelf-card-top">
- <div className="setting-group-label">STARTUP</div>
- </div>
- <div className="shelf-card-inline">
- <div className="shelf-card-inline-text">
- <div className="setting-title">{t('behaviour.launchAtLoginTitle')}</div>
- <div className="setting-desc">{t('behaviour.launchAtLoginDesc')}</div>
- </div>
- <div className="shelf-card-inline-action">
- <Toggle
- checked={settings.launchAtLogin}
- onChange={(v) => {
- useStore.setState((s) => ({
- settings: { ...s.settings, launchAtLogin: v }
- }))
- void patch({ launchAtLogin: v })
- }}
- />
- </div>
- </div>
+ {/* ── SUB-GROUP 3 DIVIDER: Clipboard Rules ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('tabs.clipboardRules') || 'CLIPBOARD RULES'}</span>
</div>
- {/* Card 6: Incognito Mode */}
- <div className="settings-shelf-card incognito-card behaviour-col">
+ {/* Card 7: Move Pasted to Top */}
+ <div className="settings-shelf-card order-card behaviour-col">
<div className="shelf-card-top">
- <div className="setting-group-label">PRIVACY</div>
+ <div className="setting-group-label">CLIPBOARD BEHAVIOUR</div>
</div>
<div className="shelf-card-inline">
<div className="shelf-card-inline-text">
- <div className="setting-title">{t('behaviour.incognitoTitle')}</div>
- <div className="setting-desc">{t('behaviour.incognitoDesc')}</div>
+ <div className="setting-title">{t('behaviour.movePastedToTopTitle')}</div>
+ <div className="setting-desc">{t('behaviour.movePastedToTopDesc')}</div>
</div>
<div className="shelf-card-inline-action">
<Toggle
- checked={settings.incognito}
- onChange={(v) => patch({ incognito: v })}
+ checked={settings.movePastedToTop ?? true}
+ onChange={(v) => patch({ movePastedToTop: v })}
/>
</div>
</div>
</div>
- {/* Card 7: Clear Unpinned on Restart */}
+ {/* Card 8: Clear Unpinned on Restart */}
<div className="settings-shelf-card rules-card behaviour-col">
<div className="shelf-card-top">
<div className="setting-group-label">RESTART CLEANUP</div>
@@ -936,23 +924,9 @@ export function Settings({
</div>
</div>
- {/* Card 8: Move Pasted to Top */}
- <div className="settings-shelf-card order-card behaviour-col">
- <div className="shelf-card-top">
- <div className="setting-group-label">CLIPBOARD BEHAVIOUR</div>
- </div>
- <div className="shelf-card-inline">
- <div className="shelf-card-inline-text">
- <div className="setting-title">{t('behaviour.movePastedToTopTitle')}</div>
- <div className="setting-desc">{t('behaviour.movePastedToTopDesc')}</div>
- </div>
- <div className="shelf-card-inline-action">
- <Toggle
- checked={settings.movePastedToTop ?? true}
- onChange={(v) => patch({ movePastedToTop: v })}
- />
- </div>
- </div>
+ {/* ── SUB-GROUP 4 DIVIDER: Storage & Retention ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('tabs.storageRetention') || 'STORAGE & RETENTION'}</span>
</div>
{/* Card 9: History Capacity */}
@@ -1014,77 +988,166 @@ export function Settings({
</div>
</div>
- {/* Card 11: Application Updates */}
+ {/* ── SUB-GROUP 5 DIVIDER: Updates ── */}
+ {!isStoreBuild && (
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('tabs.updates') || 'UPDATES'}</span>
+ </div>
+ )}
+
+ {/* Card 11: Application Updates (3-mode selector) */}
<div className="settings-shelf-card updates-card behaviour-col">
<div className="shelf-card-top">
<div className="setting-group-label">UPDATES</div>
+ <div className="setting-title">{t('behaviour.autoUpdatesTitle')}</div>
+ <div className="setting-desc">
+ {!isStoreBuild
+ ? (updateMode === 'auto'
+ ? t('behaviour.autoUpdatesDescOn')
+ : updateMode === 'notify'
+ ? (t('behaviour.updateModeNotifyDesc') || 'Check at launch and notify — never downloads automatically')
+ : t('behaviour.autoUpdatesDescOff'))
+ : 'Managed by Microsoft Store'}
+ </div>
</div>
- <div className="shelf-card-inline">
- {!isStoreBuild ? (
- <>
- <div className="shelf-card-inline-text">
- <div className="setting-title">{t('behaviour.autoUpdatesTitle')}</div>
- <div className="setting-desc">
- {(settings.autoUpdates ?? true) ? t('behaviour.autoUpdatesDescOn') : t('behaviour.autoUpdatesDescOff')}
- </div>
- </div>
- <div className="shelf-card-inline-action">
- <Toggle
- checked={settings.autoUpdates ?? true}
- onChange={(v) => patch({ autoUpdates: v })}
- />
- </div>
- </>
- ) : (
- <div className="shelf-card-inline-text">
- <div className="setting-title">Microsoft Store</div>
- <div className="setting-desc">Managed by Microsoft Store</div>
+ {!isStoreBuild && (
+ <div className="shelf-card-bottom">
+ <div className="setting-pills" style={{ display: 'grid', gridTemplateColumns: 'repeat(3, 1fr)', gap: 5, width: '100%' }}>
+ {([
+ { id: 'auto' as UpdateMode, label: t('behaviour.updateModeAuto') || 'Automatic' },
+ { id: 'notify' as UpdateMode, label: t('behaviour.updateModeNotify') || 'Notify me' },
+ { id: 'off' as UpdateMode, label: t('behaviour.updateModeOff') || 'Off' }
+ ]).map((opt) => (
+ <button
+ key={opt.id}
+ type="button"
+ className={`pill ${updateMode === opt.id ? 'active' : ''}`}
+ style={{ height: 32, fontSize: 11, fontWeight: 500, padding: '0 4px', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', justifyContent: 'center' }}
+ onClick={() => { playButtonClickSound(); patch({ updateMode: opt.id }) }}
+ >
+ {opt.label}
+ </button>
+ ))}
</div>
- )}
- </div>
- </div>
-
- {/* Card 12: Check for Updates Button */}
- <div className="settings-shelf-card check-updates-card behaviour-col">
- <div className="shelf-card-top">
- <div className="setting-group-label">UPDATE STATUS</div>
- <div className="setting-title">Check for Updates</div>
- <div className="setting-desc">Edge-Drop v{currentVersion || '0.3.1'}</div>
- </div>
- <div className="shelf-card-bottom">
- <button
- type="button"
- className="pill display-pill"
- style={{ width: '100%', justifyContent: 'center', padding: '6px 12px', fontSize: 11.5, height: 32 }}
- onClick={() => {
- playButtonClickSound()
- handleManualCheck()
- }}
- >
- {checkState.status === 'checking'
- ? t('behaviour.checkingForUpdates')
- : checkState.status === 'up-to-date'
- ? `${t('behaviour.isUpToDate')}`
- : t('behaviour.checkForUpdates')}
- </button>
- </div>
+ </div>
+ )}
</div>
- {/* Card 13: Community & Feedback */}
- {renderHorizontalCommunityCard()}
-
- {/* Card 14: About & Quit */}
- {renderHorizontalAboutCard()}
+ {/* Card 12: Update Status & Actions */}
+ {!isStoreBuild && (
+ <div className="settings-shelf-card check-updates-card behaviour-col" ref={updateBannerRef}>
+ <div className="shelf-card-top">
+ <div className="setting-group-label" style={hasUpdatePrompt ? { color: '#ffd60a' } : undefined}>
+ {hasUpdatePrompt ? 'UPDATE' : 'UPDATE STATUS'}
+ </div>
+ <div className="setting-title" style={{ lineHeight: 1.3 }}>
+ {updateDownloaded
+ ? t('behaviour.updateReadyTitle', { version: updateDownloaded.version })
+ : isDownloading
+ ? 'Downloading Update...'
+ : (checkState.status === 'available' || hasBackgroundUpdate)
+ ? t('behaviour.updateAvailableTitle', { version: checkState.version || updateInfo?.latestVersion || '' })
+ : t('behaviour.checkForUpdates')}
+ </div>
+ <div className="setting-desc">
+ {updateDownloaded
+ ? t('behaviour.updateReadyDesc')
+ : isDownloading
+ ? t('behaviour.downloadingUpdate')
+ : (checkState.status === 'available' || hasBackgroundUpdate)
+ ? `Edge-Drop v${checkState.version || updateInfo?.latestVersion || ''}`
+ : `Edge-Drop v${currentVersion || '0.3.1'}`}
+ </div>
+ </div>
+ <div className="shelf-card-bottom">
+ {updateDownloaded ? (
+ <button
+ type="button"
+ className="pill primary-pill"
+ style={{ width: '100%', justifyContent: 'center', background: '#ffd60a', color: '#000000', fontWeight: 600, height: 32, fontSize: 11.5 }}
+ onClick={() => {
+ playButtonClickSound()
+ void window.edge.installUpdate()
+ }}
+ >
+ {t('behaviour.restartToUpdate')}
+ </button>
+ ) : isDownloading ? (
+ <div className="shelf-update-progress-wrap" style={{ width: '100%' }}>
+ <div className="shelf-progress-bar" style={{ width: `${downloadPercent}%` }} />
+ <span className="shelf-progress-text">{downloadPercent > 0 ? `${downloadPercent}%` : 'Connecting...'}</span>
+ </div>
+ ) : (checkState.status === 'available' || hasBackgroundUpdate) ? (
+ <div style={{ display: 'flex', flexDirection: 'column', gap: 6, width: '100%' }}>
+ <button
+ type="button"
+ className="pill primary-pill"
+ style={{ width: '100%', justifyContent: 'center', height: 30, fontSize: 11.5 }}
+ onClick={() => {
+ playButtonClickSound()
+ handleStartDownload()
+ }}
+ >
+ {t('behaviour.downloadAndUpdate')}
+ </button>
+ <button
+ type="button"
+ className="pill display-pill"
+ style={{ width: '100%', justifyContent: 'center', height: 28, fontSize: 11 }}
+ onClick={() => {
+ playButtonClickSound()
+ useStore.getState().dismissUpdate()
+ }}
+ >
+ {t('behaviour.skip')}
+ </button>
+ </div>
+ ) : (
+ <button
+ type="button"
+ className="pill display-pill"
+ style={{ width: '100%', justifyContent: 'center', padding: '6px 12px', fontSize: 11.5, height: 32 }}
+ onClick={() => {
+ playButtonClickSound()
+ handleManualCheck()
+ }}
+ >
+ {checkState.status === 'checking'
+ ? t('behaviour.checkingForUpdates')
+ : checkState.status === 'up-to-date'
+ ? `${t('behaviour.isUpToDate')}`
+ : t('behaviour.checkForUpdates')}
+ </button>
+ )}
+ </div>
+ </div>
+ )}
+
+ {/* ── SUB-GROUP 6 DIVIDER: Community & Support ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('footer.communityAndSupport') || 'COMMUNITY & SUPPORT'}</span>
+ </div>
+
+ {/* Card 13: Community & Feedback */}
+ {renderHorizontalCommunityCard()}
+
+ {/* Card 14: About & Quit */}
+ {renderHorizontalAboutCard()}
</>
)}
{/* ── TAB 2: POSITION ── */}
{horizontalTab === 'position' && (
<>
+ {/* ── SUB-GROUP 1 DIVIDER: Position ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('tabs.position') || 'POSITION'}</span>
+ </div>
+
{/* Card 1: Edge Placement */}
<div className="settings-shelf-card placement-card position-col">
<div className="shelf-card-top">
- <div className="setting-group-label">{t('tabs.position')}</div>
+ <div className="setting-group-label">PLACEMENT</div>
<div className="setting-title" style={{ color: '#ffffff' }}>{t('position.edgePlacementTitle')}</div>
<div className="setting-desc">{t('position.edgePlacementDesc')}</div>
</div>
@@ -1182,6 +1245,10 @@ export function Settings({
</div>
</div>
+ {/* ── SUB-GROUP 2 DIVIDER: Trigger Zone ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('position.triggerZone') || 'TRIGGER ZONE'}</span>
+ </div>
{/* Card 5: Hover Area Size */}
<div className="settings-shelf-card trigger-bar-card position-col">
@@ -1303,6 +1370,11 @@ export function Settings({
</div>
</div>
+ {/* ── SUB-GROUP 3 DIVIDER: Community & Support ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('footer.communityAndSupport') || 'COMMUNITY & SUPPORT'}</span>
+ </div>
+
{/* Card 9: Community & Feedback */}
{renderHorizontalCommunityCard()}
@@ -1314,10 +1386,15 @@ export function Settings({
{/* ── TAB 3: APPEARANCE ── */}
{horizontalTab === 'appearance' && (
<>
+ {/* ── SUB-GROUP 1 DIVIDER: Copy Indicator ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('appearance.copyIndicatorTitle') || 'COPY INDICATOR'}</span>
+ </div>
+
{/* Card 1: Copy Indicator Toggle */}
<div className="settings-shelf-card beacon-toggle-card appearance-col">
<div className="shelf-card-top">
- <div className="setting-group-label">{t('appearance.copyIndicatorTitle')}</div>
+ <div className="setting-group-label">COPY BEACON</div>
</div>
<div className="shelf-card-inline">
<div className="shelf-card-inline-text">
@@ -1337,7 +1414,7 @@ export function Settings({
{(settings.showCopyIndicator ?? true) && (
<div className="settings-shelf-card copy-card appearance-col">
<div className="shelf-card-top">
- <div className="setting-group-label">{t('appearance.indicatorStyleTitle')}</div>
+ <div className="setting-group-label">BEACON STYLE</div>
</div>
<div className="shelf-card-inline">
<div className="shelf-card-inline-text">
@@ -1362,6 +1439,10 @@ export function Settings({
</div>
)}
+ {/* ── SUB-GROUP 2 DIVIDER: Audio & Feedback ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('appearance.audioAndFeedback') || 'AUDIO FEEDBACK'}</span>
+ </div>
{/* Card 4: Audio & Feedback */}
<div className="settings-shelf-card audio-card appearance-col">
@@ -1385,6 +1466,11 @@ export function Settings({
</div>
</div>
+ {/* ── SUB-GROUP 3 DIVIDER: Community & Support ── */}
+ <div className="shelf-section-divider">
+ <span className="shelf-section-divider-text">{t('footer.communityAndSupport') || 'COMMUNITY & SUPPORT'}</span>
+ </div>
+
{/* Card 5: Community & Feedback */}
{renderHorizontalCommunityCard()}
@@ -1442,225 +1528,288 @@ export function Settings({
exit={{ opacity: 0, scale: 0.98, y: -4 }}
transition={{ duration: 0.2, ease: [0.16, 1, 0.3, 1] }}
>
- {/* ── GROUP: Behaviour ─────────────────────────────────── */}
- <div className="setting-group-label">{t('tabs.behaviour')}</div>
+ {/* ── SUB-GROUP 1: General & Startup ───────────────── */}
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('tabs.generalStartup') || 'GENERAL & STARTUP'}</span>
+ </div>
- {/* ── Language Selector ── */}
- <div style={{
- display: 'flex',
- flexDirection: 'column',
- gap: 8,
- padding: '2px 0'
- }}>
- <div>
+ {/* Card 1: Language */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">GENERAL</div>
<div className="setting-title">{t('behaviour.languageTitle')}</div>
- <div className="setting-desc" style={{ marginTop: 2 }}>{t('behaviour.languageDesc')}</div>
+ <div className="setting-desc">{t('behaviour.languageDesc')}</div>
+ </div>
+ <div className="shelf-card-bottom">
+ <LanguageDropdown />
</div>
- <LanguageDropdown />
</div>
- <div className="setting-divider" />
+ {/* Card 2: Launch at Login */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">STARTUP</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('behaviour.launchAtLoginTitle')}</div>
+ <div className="setting-desc">{t('behaviour.launchAtLoginDesc')}</div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.launchAtLogin}
+ onChange={(v) => {
+ useStore.setState((s) => ({
+ settings: { ...s.settings, launchAtLogin: v }
+ }))
+ void patch({ launchAtLogin: v })
+ }}
+ />
+ </div>
+ </div>
+ </div>
- <div className="setting-row">
- <div className="setting-info">
- <div className="setting-title">{t('behaviour.launchAtLoginTitle')}</div>
- <div className="setting-desc">{t('behaviour.launchAtLoginDesc')}</div>
+ {/* Card 3: Incognito Mode */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">PRIVACY</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('behaviour.incognitoTitle')}</div>
+ <div className="setting-desc">{t('behaviour.incognitoDesc')}</div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.incognito}
+ onChange={(v) => patch({ incognito: v })}
+ />
+ </div>
</div>
- <Toggle
- checked={settings.launchAtLogin}
- onChange={(v) => {
- useStore.setState((s) => ({
- settings: { ...s.settings, launchAtLogin: v }
- }))
- void patch({ launchAtLogin: v })
- }}
- />
</div>
- <div className="setting-divider" />
+ {/* ── SUB-GROUP 2: Shortcuts & Hover ──────────────── */}
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('tabs.activationShortcuts') || 'SHORTCUTS & HOVER'}</span>
+ </div>
- <div className="setting-row">
- <div className="setting-info">
- <div className="setting-title">{t('behaviour.incognitoTitle')}</div>
- <div className="setting-desc">{t('behaviour.incognitoDesc')}</div>
+ {/* Card 4: Hover Activation */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">HOVER ACTIVATION</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('behaviour.hoverActivationTitle')}</div>
+ <div className="setting-desc">
+ {(settings.hoverActivation ?? true)
+ ? t('behaviour.hoverActivationDescOn')
+ : t('behaviour.hoverActivationDescOff', { shortcut: settings.toggleHotkey || 'Alt+C' })}
+ </div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.hoverActivation ?? true}
+ onChange={(v) => {
+ if (!v) {
+ patch({ hoverActivation: false, suppressInFullscreen: false })
+ } else {
+ patch({ hoverActivation: true, suppressInFullscreen: true })
+ }
+ }}
+ />
+ </div>
</div>
- <Toggle
- checked={settings.incognito}
- onChange={(v) => patch({ incognito: v })}
- />
</div>
- <div className="setting-divider" />
-
- <div className="setting-row">
- <div className="setting-info">
- <div className="setting-title">{t('behaviour.hoverActivationTitle')}</div>
- <div className="setting-desc" style={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap', gap: '3px 5px', marginTop: 2 }}>
- {(settings.hoverActivation ?? true) ? (
- <span>{t('behaviour.hoverActivationDescOn')}</span>
- ) : (
- <span>{t('behaviour.hoverActivationDescOff', { shortcut: settings.toggleHotkey || 'Alt+C' })}</span>
- )}
+ {/* Card 5: Global Toggle Shortcut */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">KEYBOARD SHORTCUT</div>
+ <div className="setting-title">{t('behaviour.toggleHotkeyTitle')}</div>
+ <div className="setting-desc">{t('behaviour.toggleHotkeyDesc')}</div>
+ </div>
+ <div className="shelf-card-bottom">
+ <HotkeyRecorder
+ hotkey={settings.toggleHotkey || 'Alt+C'}
+ onChange={(nextHotkey) => {
+ patch({ toggleHotkey: nextHotkey })
+ pushToast({
+ id: Date.now().toString(),
+ message: t('toast.shortcutUpdated', { shortcut: nextHotkey }),
+ tone: 'info'
+ })
+ }}
+ />
+ </div>
+ </div>
+
+ {/* Card 6: Fullscreen Protection */}
+ <div className="setting-card" style={{ opacity: (settings.hoverActivation ?? true) ? 1 : 0.45, transition: 'opacity 0.2s ease' }}>
+ <div className="shelf-card-top">
+ <div className="setting-group-label">FULLSCREEN PROTECTION</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('behaviour.fullscreenProtectionTitle')}</div>
+ <div className="setting-desc">
+ {(settings.hoverActivation ?? true)
+ ? t('behaviour.fullscreenProtectionDesc')
+ : t('behaviour.disabledHoverOff')}
+ </div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={(settings.hoverActivation ?? true) ? settings.suppressInFullscreen : false}
+ onChange={(v) => (settings.hoverActivation ?? true) && patch({ suppressInFullscreen: v })}
+ disabled={!(settings.hoverActivation ?? true)}
+ />
</div>
</div>
- <Toggle
- checked={settings.hoverActivation ?? true}
- onChange={(v) => {
- if (!v) {
- patch({ hoverActivation: false, suppressInFullscreen: false })
- } else {
- patch({ hoverActivation: true, suppressInFullscreen: true })
- }
- }}
- />
</div>
- <div className="setting-divider" />
+ {/* ── SUB-GROUP 3: Clipboard Rules ─────────────────── */}
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('tabs.clipboardRules') || 'CLIPBOARD RULES'}</span>
+ </div>
- {/* ── Global Toggle Shortcut (Vertical Layout) ── */}
- <div style={{
- display: 'flex',
- flexDirection: 'column',
- gap: 8,
- padding: '2px 0'
- }}>
- <div>
- <div className="setting-title">{t('behaviour.toggleHotkeyTitle')}</div>
- <div className="setting-desc" style={{ marginTop: 2 }}>{t('behaviour.toggleHotkeyDesc')}</div>
+ {/* Card 7: Move Pasted to Top */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">CLIPBOARD BEHAVIOUR</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('behaviour.movePastedToTopTitle')}</div>
+ <div className="setting-desc">{t('behaviour.movePastedToTopDesc')}</div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.movePastedToTop ?? true}
+ onChange={(v) => patch({ movePastedToTop: v })}
+ />
+ </div>
</div>
- <HotkeyRecorder
- hotkey={settings.toggleHotkey || 'Alt+C'}
- onChange={(nextHotkey) => {
- patch({ toggleHotkey: nextHotkey })
- pushToast({
- id: Date.now().toString(),
- message: t('toast.shortcutUpdated', { shortcut: nextHotkey }),
- tone: 'info'
- })
- }}
- />
</div>
- <div className="setting-divider" />
-
- <div className="setting-row" style={{ opacity: (settings.hoverActivation ?? true) ? 1 : 0.45, transition: 'opacity 0.2s ease' }}>
- <div className="setting-info">
- <div className="setting-title">{t('behaviour.fullscreenProtectionTitle')}</div>
- <div className="setting-desc">
- {(settings.hoverActivation ?? true)
- ? t('behaviour.fullscreenProtectionDesc')
- : t('behaviour.disabledHoverOff')}
+ {/* Card 8: Clear Unpinned on Restart */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">RESTART CLEANUP</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('behaviour.clearUnpinnedTitle')}</div>
+ <div className="setting-desc">{t('behaviour.clearUnpinnedDesc')}</div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.clearUnpinnedOnRestart}
+ onChange={(v) => patch({ clearUnpinnedOnRestart: v })}
+ />
</div>
</div>
- <Toggle
- checked={(settings.hoverActivation ?? true) ? settings.suppressInFullscreen : false}
- onChange={(v) => (settings.hoverActivation ?? true) && patch({ suppressInFullscreen: v })}
- disabled={!(settings.hoverActivation ?? true)}
- />
</div>
- <div className="setting-divider" />
+ {/* ── SUB-GROUP 4: Storage & Retention ─────────────── */}
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('tabs.storageRetention') || 'STORAGE & RETENTION'}</span>
+ </div>
- <div className="setting-row">
- <div className="setting-info">
- <div className="setting-title">{t('behaviour.clearUnpinnedTitle')}</div>
- <div className="setting-desc">{t('behaviour.clearUnpinnedDesc')}</div>
+ {/* Card 9: History Capacity */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">STORAGE CAPACITY</div>
+ <div className="setting-title">{t('behaviour.capacityTitle')}</div>
+ <div className="setting-desc">{t('behaviour.capacityDesc')}</div>
+ </div>
+ <div className="shelf-card-bottom">
+ <div className="setting-pills">
+ {[
+ { label: '100', val: 100 },
+ { label: '250', val: 250 },
+ { label: '500', val: 500 },
+ { label: '1000', val: 1000 }
+ ].map((opt) => (
+ <button
+ key={opt.val}
+ className={`pill ${settings.historyLimit === opt.val ? 'active' : ''}`}
+ onClick={() => { playButtonClickSound(); patch({ historyLimit: opt.val }) }}
+ >
+ {opt.label}
+ </button>
+ ))}
+ </div>
</div>
- <Toggle
- checked={settings.clearUnpinnedOnRestart}
- onChange={(v) => patch({ clearUnpinnedOnRestart: v })}
- />
</div>
- <div className="setting-divider" />
-
- <div className="setting-row">
- <div className="setting-info">
- <div className="setting-title">{t('behaviour.movePastedToTopTitle')}</div>
- <div className="setting-desc">{t('behaviour.movePastedToTopDesc')}</div>
+ {/* Card 10: Auto-Delete Timer */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">AUTO-DELETE</div>
+ <div className="setting-title">{t('behaviour.autoDeleteTitle')}</div>
+ <div className="setting-desc">{t('behaviour.autoDeleteDesc')}</div>
+ </div>
+ <div className="shelf-card-bottom">
+ <div className="setting-pills">
+ {[
+ { label: t('behaviour.never'), val: 0 },
+ { label: '1h', val: 1 },
+ { label: '6h', val: 6 },
+ { label: '24h', val: 24 },
+ { label: '7d', val: 168 }
+ ].map((opt) => (
+ <button
+ key={opt.val}
+ className={`pill ${settings.autoDeleteHours === opt.val ? 'active' : ''}`}
+ onClick={() => { playButtonClickSound(); patch({ autoDeleteHours: opt.val }) }}
+ >
+ {opt.label}
+ </button>
+ ))}
+ </div>
</div>
- <Toggle
- checked={settings.movePastedToTop ?? true}
- onChange={(v) => patch({ movePastedToTop: v })}
- />
</div>
+ {/* ── UPDATES SECTION (Consolidated above Community & Support) ── */}
{!isStoreBuild && (
<>
- <div className="setting-divider" />
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('tabs.updates') || 'UPDATES'}</span>
+ </div>
- <div className="setting-row">
- <div className="setting-info">
+ {/* Card 11: Auto Updates (3-way selector) */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">UPDATES</div>
<div className="setting-title">{t('behaviour.autoUpdatesTitle')}</div>
<div className="setting-desc">
- {(settings.autoUpdates ?? true)
+ {updateMode === 'auto'
? t('behaviour.autoUpdatesDescOn')
+ : updateMode === 'notify'
+ ? (t('behaviour.updateModeNotifyDesc') || 'Check at launch and notify — never downloads automatically')
: t('behaviour.autoUpdatesDescOff')}
</div>
</div>
- <Toggle
- checked={settings.autoUpdates ?? true}
- onChange={(v) => patch({ autoUpdates: v })}
- />
+ <div className="shelf-card-bottom">
+ <div className="setting-pills" style={{ display: 'grid', gridTemplateColumns: 'repeat(3, 1fr)', gap: 5 }}>
+ {([
+ { label: t('behaviour.updateModeAuto') || 'Automatic', val: 'auto' as UpdateMode },
+ { label: t('behaviour.updateModeNotify') || 'Notify me', val: 'notify' as UpdateMode },
+ { label: t('behaviour.updateModeOff') || 'Off', val: 'off' as UpdateMode }
+ ]).map((opt) => (
+ <button
+ key={opt.val}
+ className={`pill ${updateMode === opt.val ? 'active' : ''}`}
+ onClick={() => { playButtonClickSound(); patch({ updateMode: opt.val }) }}
+ >
+ {opt.label}
+ </button>
+ ))}
+ </div>
+ </div>
</div>
- </>
- )}
-
- <div className="setting-divider" />
-
- <div className="setting-row vertical">
- <div className="setting-info">
- <div className="setting-title">{t('behaviour.autoDeleteTitle')}</div>
- <div className="setting-desc">{t('behaviour.autoDeleteDesc')}</div>
- </div>
- <div className="setting-pills">
- {[
- { label: t('behaviour.never'), val: 0 },
- { label: '1h', val: 1 },
- { label: '6h', val: 6 },
- { label: '24h', val: 24 },
- { label: '7d', val: 168 }
- ].map((opt) => (
- <button
- key={opt.val}
- className={`pill ${settings.autoDeleteHours === opt.val ? 'active' : ''}`}
- onClick={() => { playButtonClickSound(); patch({ autoDeleteHours: opt.val }) }}
- >
- {opt.label}
- </button>
- ))}
- </div>
- </div>
-
- <div className="setting-divider" />
-
- <div className="setting-row vertical">
- <div className="setting-info">
- <div className="setting-title">{t('behaviour.capacityTitle')}</div>
- <div className="setting-desc">{t('behaviour.capacityDesc')}</div>
- </div>
- <div className="setting-pills">
- {[
- { label: '100', val: 100 },
- { label: '250', val: 250 },
- { label: '500', val: 500 },
- { label: '1000', val: 1000 }
- ].map((opt) => (
- <button
- key={opt.val}
- className={`pill ${settings.historyLimit === opt.val ? 'active' : ''}`}
- onClick={() => { playButtonClickSound(); patch({ historyLimit: opt.val }) }}
- >
- {opt.label}
- </button>
- ))}
- </div>
- </div>
- {/* ── Update Control (Shown at bottom above Community) ── */}
- {hasUpdatePrompt && (
- <>
- <div className="setting-divider" style={{ marginTop: 20 }} />
{renderManualUpdateCard(true)}
</>
)}
@@ -1679,50 +1828,54 @@ export function Settings({
transition={{ duration: 0.2, ease: [0.16, 1, 0.3, 1] }}
>
{/* ── GROUP: Position ──────────────────────────────────── */}
- <div className="setting-group-label">{t('tabs.position')}</div>
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('tabs.position') || 'POSITION'}</span>
+ </div>
- <div className="setting-row vertical">
- <div className="setting-info">
+ {/* Card 1: Edge Placement */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">PLACEMENT</div>
<div className="setting-title">{t('position.edgePlacementTitle')}</div>
<div className="setting-desc">{t('position.edgePlacementDesc')}</div>
</div>
- <div className="placement-3way-wrap">
- <button
- type="button"
- className={`pill ${(edgeTransition?.active ? edgeTransition.to === 'left' : settings.stickPosition === 'left') ? 'active' : ''} ${edgeTransition?.active && edgeTransition.to === 'left' ? 'transitioning' : ''}`}
- disabled={edgeTransition?.active}
- onClick={() => {
- void startEdgeTransition('left')
- }}
- >
- {t('position.leftEdge') || 'Left Edge'}
- </button>
- <button
- type="button"
- className={`pill ${(edgeTransition?.active ? edgeTransition.to === 'top' : settings.stickPosition === 'top') ? 'active' : ''} ${edgeTransition?.active && edgeTransition.to === 'top' ? 'transitioning' : ''}`}
- disabled={edgeTransition?.active}
- onClick={() => {
- void startEdgeTransition('top')
- }}
- >
- {t('position.topEdge') || 'Top Edge'}
- </button>
- <button
- type="button"
- className={`pill ${(edgeTransition?.active ? edgeTransition.to === 'right' : settings.stickPosition === 'right') ? 'active' : ''} ${edgeTransition?.active && edgeTransition.to === 'right' ? 'transitioning' : ''}`}
- disabled={edgeTransition?.active}
- onClick={() => {
- void startEdgeTransition('right')
- }}
- >
- {t('position.rightEdge') || 'Right Edge'}
- </button>
+ <div className="shelf-card-bottom">
+ <div className="placement-3way-wrap">
+ <button
+ type="button"
+ className={`pill ${(edgeTransition?.active ? edgeTransition.to === 'left' : settings.stickPosition === 'left') ? 'active' : ''} ${edgeTransition?.active && edgeTransition.to === 'left' ? 'transitioning' : ''}`}
+ disabled={edgeTransition?.active}
+ onClick={() => {
+ void startEdgeTransition('left')
+ }}
+ >
+ {t('position.leftEdge') || 'Left Edge'}
+ </button>
+ <button
+ type="button"
+ className={`pill ${(edgeTransition?.active ? edgeTransition.to === 'top' : settings.stickPosition === 'top') ? 'active' : ''} ${edgeTransition?.active && edgeTransition.to === 'top' ? 'transitioning' : ''}`}
+ disabled={edgeTransition?.active}
+ onClick={() => {
+ void startEdgeTransition('top')
+ }}
+ >
+ {t('position.topEdge') || 'Top Edge'}
+ </button>
+ <button
+ type="button"
+ className={`pill ${(edgeTransition?.active ? edgeTransition.to === 'right' : settings.stickPosition === 'right') ? 'active' : ''} ${edgeTransition?.active && edgeTransition.to === 'right' ? 'transitioning' : ''}`}
+ disabled={edgeTransition?.active}
+ onClick={() => {
+ void startEdgeTransition('right')
+ }}
+ >
+ {t('position.rightEdge') || 'Right Edge'}
+ </button>
+ </div>
</div>
</div>
- <div className="setting-divider" />
-
- {/* Position Range Slider (Vertical for left/right, Horizontal for top) */}
+ {/* Card 2: Position Range Slider */}
{(() => {
const isHorizontal = settings.stickPosition === 'top'
const offsetVal = isHorizontal ? (settings.horizontalOffset ?? 0.5) : (settings.verticalOffset ?? 0.5)
@@ -1730,332 +1883,358 @@ export function Settings({
const sliderDesc = isHorizontal ? (t('position.horizontalPositionDesc') || 'Adjust horizontal alignment along screen edge') : t('position.verticalPositionDesc')
return (
- <div className="setting-row vertical" style={{ gap: 10 }}>
- <div className="setting-slider-header">
- <div className="setting-info">
- <div className="setting-title">{sliderTitle}</div>
- <div className="setting-desc">{sliderDesc}</div>
- </div>
- <div className="setting-slider-val">
- {`${Math.round(offsetVal * 100)}%`}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">ALIGNMENT</div>
+ <div className="setting-slider-header" style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', width: '100%' }}>
+ <div>
+ <div className="setting-title">{sliderTitle}</div>
+ <div className="setting-desc">{sliderDesc}</div>
+ </div>
+ <div className="setting-slider-val">
+ {`${Math.round(offsetVal * 100)}%`}
+ </div>
</div>
</div>
- <div className="setting-slider-wrap">
- <input
- type="range"
- min="0"
- max="1"
- step="0.002"
- className="setting-range-input"
- value={offsetVal}
- style={{
- background: `linear-gradient(to right, #ffffff 0%, #ffffff ${offsetVal * 100}%, rgba(255, 255, 255, 0.12) ${offsetVal * 100}%, rgba(255, 255, 255, 0.12) 100%)`
- }}
- onPointerDown={() => {
- void window.edge.setInteractive(true)
- setSliderActive(true)
- }}
- onPointerUp={(e) => {
- setSliderActive(false)
- const val = parseFloat((e.target as HTMLInputElement).value)
- if (isHorizontal) {
- patch({ horizontalOffset: val })
- } else {
- handleSliderRelease(val)
- }
- }}
- onPointerCancel={(e) => {
- setSliderActive(false)
- const val = parseFloat((e.target as HTMLInputElement).value)
- if (isHorizontal) {
- patch({ horizontalOffset: val })
- } else {
- handleSliderRelease(val)
- }
- }}
- onLostPointerCapture={(e) => {
- setSliderActive(false)
- const val = parseFloat((e.target as HTMLInputElement).value)
- if (isHorizontal) {
- patch({ horizontalOffset: val })
- } else {
- handleSliderRelease(val)
- }
- }}
- onChange={(e) => {
- const raw = parseFloat(e.target.value)
- if (isHorizontal) {
- patch({ horizontalOffset: raw })
- } else {
- handleSliderInput(raw)
- }
- }}
- />
+ <div className="shelf-card-bottom">
+ <div className="setting-slider-wrap">
+ <input
+ type="range"
+ min="0"
+ max="1"
+ step="0.002"
+ className="setting-range-input"
+ value={offsetVal}
+ style={{
+ background: `linear-gradient(to right, #ffffff 0%, #ffffff ${offsetVal * 100}%, rgba(255, 255, 255, 0.12) ${offsetVal * 100}%, rgba(255, 255, 255, 0.12) 100%)`
+ }}
+ onPointerDown={() => {
+ void window.edge.setInteractive(true)
+ setSliderActive(true)
+ }}
+ onPointerUp={(e) => {
+ setSliderActive(false)
+ const val = parseFloat((e.target as HTMLInputElement).value)
+ if (isHorizontal) {
+ patch({ horizontalOffset: val })
+ } else {
+ handleSliderRelease(val)
+ }
+ }}
+ onPointerCancel={(e) => {
+ setSliderActive(false)
+ const val = parseFloat((e.target as HTMLInputElement).value)
+ if (isHorizontal) {
+ patch({ horizontalOffset: val })
+ } else {
+ handleSliderRelease(val)
+ }
+ }}
+ onLostPointerCapture={(e) => {
+ setSliderActive(false)
+ const val = parseFloat((e.target as HTMLInputElement).value)
+ if (isHorizontal) {
+ patch({ horizontalOffset: val })
+ } else {
+ handleSliderRelease(val)
+ }
+ }}
+ onChange={(e) => {
+ const raw = parseFloat(e.target.value)
+ if (isHorizontal) {
+ patch({ horizontalOffset: raw })
+ } else {
+ handleSliderInput(raw)
+ }
+ }}
+ />
- <div className="setting-slider-ticks">
- {Array.from({ length: 21 }, (_, i) => {
- const tickVal = i / 20
- const isMajor = i % 5 === 0
- const isActive = tickVal <= offsetVal
- return (
- <span
- key={i}
- className={`slider-tick${isMajor ? ' major' : ''}${isActive ? ' active' : ''}`}
- />
- )
- })}
- </div>
+ <div className="setting-slider-ticks">
+ {Array.from({ length: 21 }, (_, i) => {
+ const tickVal = i / 20
+ const isMajor = i % 5 === 0
+ const isActive = tickVal <= offsetVal
+ return (
+ <span
+ key={i}
+ className={`slider-tick${isMajor ? ' major' : ''}${isActive ? ' active' : ''}`}
+ />
+ )
+ })}
+ </div>
- <div className="setting-slider-labels">
- {[
- { label: isHorizontal ? 'Left' : '0%', val: 0 },
- { label: 'Center', val: 0.5 },
- { label: isHorizontal ? 'Right' : '100%', val: 1.0 }
- ].map((pos) => {
- const active = Math.abs(offsetVal - pos.val) < 0.04
- return (
- <button
- key={pos.val}
- type="button"
- className={`slider-label-btn${active ? ' active' : ''}`}
- onClick={() => {
- if (isHorizontal) {
- patch({ horizontalOffset: pos.val })
- } else {
- handleSliderRelease(pos.val)
- }
- }}
- >
- {pos.label}
- </button>
- )
- })}
+ <div className="setting-slider-labels">
+ {[
+ { label: isHorizontal ? 'Left' : '0%', val: 0 },
+ { label: 'Center', val: 0.5 },
+ { label: isHorizontal ? 'Right' : '100%', val: 1.0 }
+ ].map((pos) => {
+ const active = Math.abs(offsetVal - pos.val) < 0.04
+ return (
+ <button
+ key={pos.val}
+ type="button"
+ className={`slider-label-btn${active ? ' active' : ''}`}
+ onClick={() => {
+ if (isHorizontal) {
+ patch({ horizontalOffset: pos.val })
+ } else {
+ handleSliderRelease(pos.val)
+ }
+ }}
+ >
+ {pos.label}
+ </button>
+ )
+ })}
+ </div>
</div>
</div>
</div>
)
})()}
- <div className="setting-divider" />
-
- <div className="setting-row vertical">
- <div className="setting-info">
+ {/* Card 3: Target Display */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">DISPLAY MONITOR</div>
<div className="setting-title">{t('position.displayTitle')}</div>
<div className="setting-desc">{t('position.displayDesc')}</div>
</div>
- <div className="setting-pills">
- {displays.length === 0 && <div className="pill disabled">{t('position.loadingDisplays')}</div>}
- {displays.map((d) => {
- const currentDisplay = displays.find((disp) => disp.isCurrent)
- const activeDisplayId = currentDisplay
- ? currentDisplay.id
- : (settings.stickDisplayId ?? displays.find((disp) => disp.isPrimary)?.id ?? displays[0]?.id)
- const isActive = activeDisplayId === d.id
- const displayName = d.isPrimary ? t('position.primaryDisplay') : d.name
- return (
- <button
- key={d.id}
- className={`pill display-pill ${isActive ? 'active' : ''}`}
- onClick={() => {
- playButtonClickSound()
- patch({ stickDisplayId: d.id })
- useStore.getState().notifyPositionChanged()
- }}
- >
- <div className="pill-name">{displayName}</div>
- <div className="pill-res">{d.resolution}</div>
- </button>
- )
- })}
+ <div className="shelf-card-bottom">
+ <div className="setting-pills">
+ {displays.length === 0 && <div className="pill disabled">{t('position.loadingDisplays')}</div>}
+ {displays.map((d) => {
+ const currentDisplay = displays.find((disp) => disp.isCurrent)
+ const activeDisplayId = currentDisplay
+ ? currentDisplay.id
+ : (settings.stickDisplayId ?? displays.find((disp) => disp.isPrimary)?.id ?? displays[0]?.id)
+ const isActive = activeDisplayId === d.id
+ const displayName = d.isPrimary ? t('position.primaryDisplay') : d.name
+ return (
+ <button
+ key={d.id}
+ className={`pill display-pill ${isActive ? 'active' : ''}`}
+ onClick={() => {
+ playButtonClickSound()
+ patch({ stickDisplayId: d.id })
+ useStore.getState().notifyPositionChanged()
+ }}
+ >
+ <div className="pill-name">{displayName}</div>
+ <div className="pill-res">{d.resolution}</div>
+ </button>
+ )
+ })}
+ </div>
</div>
</div>
{/* ── GROUP: Trigger Zone ──────────────────────────────── */}
- <div className="setting-group-label" style={{ marginTop: 20 }}>{t('position.triggerZone')}</div>
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('position.triggerZone') || 'TRIGGER ZONE'}</span>
+ </div>
- <div className="setting-row">
- <div className="setting-info">
- <div className="setting-title">{t('position.edgeLocationHintTitle')}</div>
- <div className="setting-desc">{t('position.edgeLocationHintDesc')}</div>
+ {/* Card 4: Location Hint */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">LOCATION HINT</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('position.edgeLocationHintTitle')}</div>
+ <div className="setting-desc">{t('position.edgeLocationHintDesc')}</div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.showEdgeLocationHint ?? false}
+ onChange={(v) => patch({ showEdgeLocationHint: v })}
+ />
+ </div>
</div>
- <Toggle
- checked={settings.showEdgeLocationHint ?? false}
- onChange={(v) => patch({ showEdgeLocationHint: v })}
- />
</div>
- <div className="setting-divider" />
-
- <div className="setting-row vertical">
- <div className="setting-info">
+ {/* Card 5: Trigger Alignment */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">TRIGGER POSITION</div>
<div className="setting-title">{t('position.edgeTriggerPositionTitle')}</div>
<div className="setting-desc">{t('position.edgeTriggerPositionDesc')}</div>
</div>
- <div className="setting-pills">
- {[
- { label: isHorizontal ? (t('position.left') || 'Left') : t('position.top'), val: 'top' as const },
- { label: t('position.center'), val: 'center' as const },
- { label: isHorizontal ? (t('position.right') || 'Right') : t('position.bottom'), val: 'bottom' as const }
- ].map((opt) => (
- <button
- key={opt.val}
- className={`pill ${(settings.triggerAlignment || 'center') === opt.val ? 'active' : ''}`}
- onClick={() => {
- playButtonClickSound()
- patch({ triggerAlignment: opt.val })
- useStore.getState().notifyPositionChanged()
- }}
- >
- {opt.label}
- </button>
- ))}
+ <div className="shelf-card-bottom">
+ <div className="setting-pills">
+ {[
+ { label: (settings.stickPosition === 'top') ? (t('position.left') || 'Left') : t('position.top'), val: 'top' as const },
+ { label: t('position.center'), val: 'center' as const },
+ { label: (settings.stickPosition === 'top') ? (t('position.right') || 'Right') : t('position.bottom'), val: 'bottom' as const }
+ ].map((opt) => (
+ <button
+ key={opt.val}
+ className={`pill ${(settings.triggerAlignment || 'center') === opt.val ? 'active' : ''}`}
+ onClick={() => {
+ playButtonClickSound()
+ patch({ triggerAlignment: opt.val })
+ useStore.getState().notifyPositionChanged()
+ }}
+ >
+ {opt.label}
+ </button>
+ ))}
+ </div>
</div>
</div>
- <div className="setting-divider" />
-
- <div className="setting-row vertical">
- <div className="setting-info">
+ {/* Card 6: Hover Area Size */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">HOVER ZONE LENGTH</div>
<div className="setting-title">{t('position.hoverAreaSizeTitle')}</div>
<div className="setting-desc">{t('position.hoverAreaSizeDesc')}</div>
</div>
- <div className="setting-pills">
- {[
- { label: t('appearance.small'), val: 0.25 },
- { label: t('position.medium'), val: 0.4 },
- { label: t('appearance.large'), val: 0.6 }
- ].map((opt) => (
- <button
- key={opt.label}
- className={`pill ${Math.abs(settings.hotZoneHeight - opt.val) < 0.08 ? 'active' : ''}`}
- onClick={() => {
- playButtonClickSound()
- patch({ hotZoneHeight: opt.val })
- }}
- >
- {opt.label}
- </button>
- ))}
+ <div className="shelf-card-bottom">
+ <div className="setting-pills">
+ {[
+ { label: t('appearance.small'), val: 0.25 },
+ { label: t('position.medium'), val: 0.4 },
+ { label: t('appearance.large'), val: 0.6 }
+ ].map((opt) => (
+ <button
+ key={opt.label}
+ className={`pill ${Math.abs(settings.hotZoneHeight - opt.val) < 0.08 ? 'active' : ''}`}
+ onClick={() => {
+ playButtonClickSound()
+ patch({ hotZoneHeight: opt.val })
+ }}
+ >
+ {opt.label}
+ </button>
+ ))}
+ </div>
</div>
</div>
- <div className="setting-divider" />
-
- {/* Edge Trigger Thickness Range Slider */}
- <div className="setting-row vertical" style={{ gap: 10 }}>
- <div className="setting-slider-header">
- <div className="setting-info">
- <div className="setting-title">{t('position.edgeTriggerThicknessTitle')}</div>
- <div className="setting-desc">{t('position.edgeTriggerThicknessDesc')}</div>
- </div>
- <div className="setting-slider-val">
- {`${settings.hotZoneWidth ?? 3}px`}
+ {/* Card 7: Edge Trigger Thickness */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">TRIGGER THICKNESS</div>
+ <div className="setting-slider-header" style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', width: '100%' }}>
+ <div>
+ <div className="setting-title">{t('position.edgeTriggerThicknessTitle')}</div>
+ <div className="setting-desc">{t('position.edgeTriggerThicknessDesc')}</div>
+ </div>
+ <div className="setting-slider-val">
+ {`${settings.hotZoneWidth ?? 3}px`}
+ </div>
</div>
</div>
- <div className="setting-slider-wrap">
- {(() => {
- const currentPx = settings.hotZoneWidth ?? 3
- const pct = Math.max(0, Math.min(100, ((currentPx - 1) / (7 - 1)) * 100))
- return (
- <input
- type="range"
- min="1"
- max="7"
- step="1"
- className="setting-range-input"
- value={currentPx}
- style={{
- touchAction: 'none',
- background: `linear-gradient(to right, #ffffff 0%, #ffffff ${pct}%, rgba(255, 255, 255, 0.12) ${pct}%, rgba(255, 255, 255, 0.12) 100%)`
- }}
- onPointerDown={() => {
- void window.edge.setInteractive(true)
- setSliderActive(true)
- }}
- onPointerUp={(e) => {
- handleThicknessRelease(parseInt((e.target as HTMLInputElement).value, 10))
- }}
- onPointerCancel={(e) => {
- handleThicknessRelease(parseInt((e.target as HTMLInputElement).value, 10))
- }}
- onLostPointerCapture={(e) => {
- handleThicknessRelease(parseInt((e.target as HTMLInputElement).value, 10))
- }}
- onChange={(e) => {
- handleThicknessInput(parseInt(e.target.value, 10))
- }}
- />
- )
- })()}
-
- <div className="setting-slider-ticks">
- {Array.from({ length: 7 }, (_, i) => {
- const tickPx = i + 1
+ <div className="shelf-card-bottom">
+ <div className="setting-slider-wrap">
+ {(() => {
const currentPx = settings.hotZoneWidth ?? 3
- const isMajor = tickPx === 1 || tickPx === 4 || tickPx === 7
- const isActive = currentPx === tickPx
+ const pct = Math.max(0, Math.min(100, ((currentPx - 1) / (7 - 1)) * 100))
return (
- <span
- key={tickPx}
- className={`slider-tick${isMajor ? ' major' : ''}${isActive ? ' active' : ''}`}
+ <input
+ type="range"
+ min="1"
+ max="7"
+ step="1"
+ className="setting-range-input"
+ value={currentPx}
+ style={{
+ touchAction: 'none',
+ background: `linear-gradient(to right, #ffffff 0%, #ffffff ${pct}%, rgba(255, 255, 255, 0.12) ${pct}%, rgba(255, 255, 255, 0.12) 100%)`
+ }}
+ onPointerDown={() => {
+ void window.edge.setInteractive(true)
+ setSliderActive(true)
+ }}
+ onPointerUp={(e) => {
+ handleThicknessRelease(parseInt((e.target as HTMLInputElement).value, 10))
+ }}
+ onPointerCancel={(e) => {
+ handleThicknessRelease(parseInt((e.target as HTMLInputElement).value, 10))
+ }}
+ onLostPointerCapture={(e) => {
+ handleThicknessRelease(parseInt((e.target as HTMLInputElement).value, 10))
+ }}
+ onChange={(e) => {
+ handleThicknessInput(parseInt(e.target.value, 10))
+ }}
/>
)
- })}
- </div>
+ })()}
+
+ <div className="setting-slider-ticks">
+ {Array.from({ length: 7 }, (_, i) => {
+ const tickPx = i + 1
+ const currentPx = settings.hotZoneWidth ?? 3
+ const isMajor = tickPx === 1 || tickPx === 4 || tickPx === 7
+ const isActive = currentPx === tickPx
+ return (
+ <span
+ key={tickPx}
+ className={`slider-tick${isMajor ? ' major' : ''}${isActive ? ' active' : ''}`}
+ />
+ )
+ })}
+ </div>
- <div className="setting-slider-labels">
- {[
- { label: 'Min', val: 1 },
- { label: 'Mid', val: 4 },
- { label: 'Max', val: 7 }
- ].map((preset) => {
- const currentPx = settings.hotZoneWidth ?? 3
- const active = currentPx === preset.val
- return (
- <button
- key={preset.val}
- type="button"
- className={`slider-label-btn${active ? ' active' : ''}`}
- onClick={() => {
- if (currentPx !== preset.val) {
- handleThicknessRelease(preset.val)
- }
- }}
- >
- {preset.label}
- </button>
- )
- })}
+ <div className="setting-slider-labels">
+ {[
+ { label: 'Min', val: 1 },
+ { label: 'Mid', val: 4 },
+ { label: 'Max', val: 7 }
+ ].map((preset) => {
+ const currentPx = settings.hotZoneWidth ?? 3
+ const active = currentPx === preset.val
+ return (
+ <button
+ key={preset.val}
+ type="button"
+ className={`slider-label-btn${active ? ' active' : ''}`}
+ onClick={() => {
+ if (currentPx !== preset.val) {
+ handleThicknessRelease(preset.val)
+ }
+ }}
+ >
+ {preset.label}
+ </button>
+ )
+ })}
+ </div>
</div>
</div>
</div>
- <div className="setting-divider" />
-
- <div className="setting-row vertical">
- <div className="setting-info">
+ {/* Card 8: Panel Height */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">PANEL HEIGHT</div>
<div className="setting-title">{t('position.panelHeightTitle')}</div>
<div className="setting-desc">{t('position.panelHeightDesc')}</div>
</div>
- <div className="setting-pills">
- {[
- { label: t('appearance.small'), val: 0.5 },
- { label: t('position.medium'), val: 0.65 },
- { label: t('appearance.large'), val: 0.8 }
- ].map((opt) => (
- <button
- key={opt.label}
- className={`pill ${Math.abs((settings.panelHeight || 0.6) - opt.val) < 0.08 ? 'active' : ''}`}
- onClick={() => {
- playButtonClickSound()
- patch({ panelHeight: opt.val })
- }}
- >
- {opt.label}
- </button>
- ))}
+ <div className="shelf-card-bottom">
+ <div className="setting-pills">
+ {[
+ { label: t('appearance.small'), val: 0.5 },
+ { label: t('position.medium'), val: 0.65 },
+ { label: t('appearance.large'), val: 0.8 }
+ ].map((opt) => (
+ <button
+ key={opt.label}
+ className={`pill ${Math.abs((settings.panelHeight || 0.6) - opt.val) < 0.08 ? 'active' : ''}`}
+ onClick={() => {
+ playButtonClickSound()
+ patch({ panelHeight: opt.val })
+ }}
+ >
+ {opt.label}
+ </button>
+ ))}
+ </div>
</div>
</div>
@@ -2073,42 +2252,55 @@ export function Settings({
transition={{ duration: 0.2, ease: [0.16, 1, 0.3, 1] }}
>
{/* ── GROUP: Copy Indicator ────────────────────────────── */}
- <div className="setting-group-label">{t('appearance.copyIndicatorTitle')}</div>
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('appearance.copyIndicatorTitle') || 'COPY INDICATOR'}</span>
+ </div>
- <div className="setting-row">
- <div className="setting-info">
- <div className="setting-title">{t('appearance.copyIndicatorTitle')}</div>
- <div className="setting-desc">{t('appearance.copyIndicatorDesc')}</div>
+ {/* Card 1: Copy Indicator Toggle */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">COPY BEACON</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('appearance.copyIndicatorTitle')}</div>
+ <div className="setting-desc">{t('appearance.copyIndicatorDesc')}</div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.showCopyIndicator ?? true}
+ onChange={(v) => patch({ showCopyIndicator: v })}
+ />
+ </div>
</div>
- <Toggle
- checked={settings.showCopyIndicator ?? true}
- onChange={(v) => patch({ showCopyIndicator: v })}
- />
</div>
+ {/* Card 2: Indicator Style */}
{(settings.showCopyIndicator ?? true) && (
- <>
- <div className="setting-divider" />
-
- <div className="setting-row">
- <div className="setting-info">
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">BEACON STYLE</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
<div className="setting-title">{t('appearance.indicatorStyleTitle')}</div>
<div className="setting-desc">
{t('appearance.indicatorStyleDesc')}
</div>
</div>
-
- <button
- type="button"
- className={`icon-btn style-preview-toggle-btn ${isFlyoutActive ? 'active' : ''}`}
- title={isFlyoutActive ? 'Close Style Selector' : 'Open Indicator Style Selector'}
- onClick={(e) => {
- playButtonClickSound()
- handleToggleFlyout(e.currentTarget)
- }}
- >
- {isFlyoutActive ? <CloseIcon /> : <ChevronRightIcon />}
- </button>
+ <div className="shelf-card-inline-action">
+ <button
+ type="button"
+ className={`icon-btn style-preview-toggle-btn ${isFlyoutActive ? 'active' : ''}`}
+ title={isFlyoutActive ? 'Close Style Selector' : 'Open Indicator Style Selector'}
+ onClick={(e) => {
+ playButtonClickSound()
+ handleToggleFlyout(e.currentTarget)
+ }}
+ >
+ {isFlyoutActive ? <CloseIcon /> : <ChevronRightIcon />}
+ </button>
+ </div>
</div>
{isTutorial && localInlineOpen && (
@@ -2234,54 +2426,68 @@ export function Settings({
</div>
</motion.div>
)}
- </>
+ </div>
)}
{/* ── GROUP: Typography ────────────────────────────────── */}
- <div className="setting-group-label" style={{ marginTop: 20 }}>{t('appearance.typography')}</div>
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('appearance.typography') || 'TYPOGRAPHY'}</span>
+ </div>
- <div className="setting-row vertical">
- <div className="setting-info">
+ {/* Card 3: Text Size */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">TEXT SIZE</div>
<div className="setting-title">{t('appearance.textSizeTitle')}</div>
<div className="setting-desc">{t('appearance.textSizeDesc')}</div>
</div>
- <div className="setting-pills">
- {[
- { label: t('appearance.small'), val: 0.85 },
- { label: t('appearance.normal'), val: 1.0 },
- { label: t('appearance.large'), val: 1.15 }
- ].map((opt) => (
- <button
- key={opt.label}
- className={`pill ${Math.abs((settings.fontSizeScale ?? 1.0) - opt.val) < 0.05 ? 'active' : ''}`}
- onClick={() => {
- playButtonClickSound()
- patch({ fontSizeScale: opt.val })
- }}
- >
- {opt.label}
- </button>
- ))}
+ <div className="shelf-card-bottom">
+ <div className="setting-pills">
+ {[
+ { label: t('appearance.small'), val: 0.85 },
+ { label: t('appearance.normal'), val: 1.0 },
+ { label: t('appearance.large'), val: 1.15 }
+ ].map((opt) => (
+ <button
+ key={opt.label}
+ className={`pill ${Math.abs((settings.fontSizeScale ?? 1.0) - opt.val) < 0.05 ? 'active' : ''}`}
+ onClick={() => {
+ playButtonClickSound()
+ patch({ fontSizeScale: opt.val })
+ }}
+ >
+ {opt.label}
+ </button>
+ ))}
+ </div>
</div>
</div>
- <div className="setting-divider" />
-
{/* ── GROUP: Audio & Feedback ──────────────────────────── */}
- <div className="setting-group-label" style={{ marginTop: 20 }}>{t('appearance.audioAndFeedback')}</div>
+ <div className="setting-section-divider">
+ <span className="setting-section-divider-text">{t('appearance.audioAndFeedback') || 'AUDIO FEEDBACK'}</span>
+ </div>
- <div className="setting-row">
- <div className="setting-info">
- <div className="setting-title">{t('behaviour.soundEffectsTitle')}</div>
- <div className="setting-desc">{t('behaviour.soundEffectsDesc')}</div>
+ {/* Card 4: Audio Feedback */}
+ <div className="setting-card">
+ <div className="shelf-card-top">
+ <div className="setting-group-label">AUDIO FEEDBACK</div>
+ </div>
+ <div className="shelf-card-inline">
+ <div className="shelf-card-inline-text">
+ <div className="setting-title">{t('behaviour.soundEffectsTitle')}</div>
+ <div className="setting-desc">{t('behaviour.soundEffectsDesc')}</div>
+ </div>
+ <div className="shelf-card-inline-action">
+ <Toggle
+ checked={settings.soundEffects ?? true}
+ onChange={(v) => {
+ if (v) playToggleSound(true)
+ patch({ soundEffects: v })
+ }}
+ />
+ </div>
</div>
- <Toggle
- checked={settings.soundEffects ?? true}
- onChange={(v) => {
- if (v) playToggleSound(true)
- patch({ soundEffects: v })
- }}
- />
</div>
{PersistentFooter}
diff --git a/src/i18n/translations.ts b/src/i18n/translations.ts
index 2c305b0..7c61bfa 100644
--- a/src/i18n/translations.ts
+++ b/src/i18n/translations.ts
@@ -11,6 +11,11 @@ export interface TranslationKeys {
behaviour: string
position: string
appearance: string
+ updates?: string
+ generalStartup?: string
+ activationShortcuts?: string
+ clipboardRules?: string
+ storageRetention?: string
}
header: {
searchPlaceholder: string
@@ -47,6 +52,10 @@ export interface TranslationKeys {
autoUpdatesTitle: string
autoUpdatesDescOn: string
autoUpdatesDescOff: string
+ updateModeAuto?: string
+ updateModeNotify?: string
+ updateModeOff?: string
+ updateModeNotifyDesc?: string
checkForUpdates: string
checkingForUpdates: string
isUpToDate: string
@@ -487,7 +496,12 @@ export const en: TranslationKeys = {
"tabs": {
"behaviour": "Behaviour",
"position": "Position",
- "appearance": "Appearance"
+ "appearance": "Appearance",
+ "updates": "Updates",
+ "generalStartup": "General & Startup",
+ "activationShortcuts": "Shortcuts & Hover",
+ "clipboardRules": "Clipboard Rules",
+ "storageRetention": "Storage & Retention"
},
"header": {
"searchPlaceholder": "Search history...",
@@ -519,7 +533,11 @@ export const en: TranslationKeys = {
"soundEffectsDesc": "Play tactile audio feedback for toggles, sliders, and button clicks",
"autoUpdatesTitle": "Automatic updates",
"autoUpdatesDescOn": "Check for and download app updates automatically in background",
- "autoUpdatesDescOff": "Background update checks paused. Check for updates manually below",
+ "autoUpdatesDescOff": "Fully silent. The app never checks for updates on its own",
+ "updateModeAuto": "Automatic",
+ "updateModeNotify": "Notify me",
+ "updateModeOff": "Off",
+ "updateModeNotifyDesc": "Check at launch and notify — never downloads automatically",
"checkForUpdates": "Check for updates",
"checkingForUpdates": "Checking GitHub for updates...",
"isUpToDate": "✓ Edge-Drop is up to date",
diff --git a/src/store/appStore.ts b/src/store/appStore.ts
index ffe3208..592f7b0 100644
--- a/src/store/appStore.ts
+++ b/src/store/appStore.ts
@@ -307,6 +307,14 @@ export const useStore = create<AppState>((set, get) => ({
resetManualCheck: () => set({ manualCheckState: { status: 'idle' } }),
setUpdateAvailable: (info) => {
+ // Skip memory: a version the user explicitly skipped is not re-prompted
+ // by background checks. A different (newer) version clears the stale skip
+ // and surfaces normally. Manual checks bypass this (their own state).
+ const skipped = get().settings.skippedUpdateVersion
+ if (skipped && info.version === skipped) return
+ if (skipped && info.version !== skipped) {
+ void get().patchSettings({ skippedUpdateVersion: undefined }).catch(() => {})
+ }
set({
updateInfo: {
hasUpdate: true,
@@ -349,7 +357,15 @@ export const useStore = create<AppState>((set, get) => ({
})
},
- dismissUpdate: () => set({ updateInfo: null, manualCheckState: { status: 'idle' } }),
+ dismissUpdate: () => {
+ // Skip = "remind me next launch": persist the skipped version so this
+ // exact version is not re-prompted, while a newer one still surfaces.
+ const skipped = get().updateInfo?.latestVersion || get().manualCheckState.version
+ if (skipped) {
+ void get().patchSettings({ skippedUpdateVersion: skipped }).catch(() => {})
+ }
+ set({ updateInfo: null, manualCheckState: { status: 'idle' } })
+ },
async installUpdate() {
await edge.installUpdate()
diff --git a/src/styles/settings.css b/src/styles/settings.css
index 2ddd16f..1dd4bf3 100644
--- a/src/styles/settings.css
+++ b/src/styles/settings.css
@@ -139,13 +139,44 @@
flex-shrink: 0;
}
+/* ── Section Dividers across Vertical Settings (Matches Horizontal Subcategory Style) ── */
+.setting-section-divider {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ margin: 22px 2px 10px;
+ user-select: none;
+ flex-shrink: 0;
+}
+
+.setting-section-divider:first-of-type,
+.setting-section-divider:first-child {
+ margin-top: 6px;
+}
+
+.setting-section-divider .setting-section-divider-text {
+ font-size: calc(9.5px * var(--font-scale, 1));
+ font-weight: 600;
+ letter-spacing: 0.08em;
+ text-transform: uppercase;
+ color: rgba(255, 255, 255, 0.38);
+ white-space: nowrap;
+}
+
+.setting-section-divider::after {
+ content: '';
+ flex: 1;
+ height: 1px;
+ background: rgba(255, 255, 255, 0.08);
+}
+
.setting-group-label {
- font-size: calc(11px * var(--font-scale, 1));
+ font-size: calc(10px * var(--font-scale, 1));
font-weight: 700;
text-transform: uppercase;
letter-spacing: 0.08em;
- color: rgba(255, 255, 255, 0.88);
- margin: 14px 4px 6px;
+ color: rgba(255, 255, 255, 0.42);
+ margin: 18px 4px 8px;
user-select: none;
white-space: normal;
word-break: break-word;
@@ -156,6 +187,129 @@
margin-top: 4px;
}
+/* ── Vertical Setting Card (Matches Horizontal Shelf Card Aesthetic) ── */
+.setting-card {
+ width: 100%;
+ background: var(--bg-card, #141414);
+ border: none;
+ border-radius: var(--radius-card, 16px);
+ padding: 12px 14px;
+ margin-bottom: 8px;
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ box-sizing: border-box;
+ position: relative;
+ overflow: hidden;
+ user-select: none;
+ -webkit-user-select: none;
+ transition: background 0.14s ease;
+}
+
+.setting-card::before {
+ content: '';
+ position: absolute;
+ inset: 0;
+ border-radius: inherit;
+ pointer-events: none;
+ z-index: 2;
+ transition: opacity 0.14s ease;
+ background:
+ radial-gradient(
+ ellipse 70% 1px at 50% 0%,
+ rgba(255, 255, 255, 0.22) 0%,
+ rgba(255, 255, 255, 0.08) 45%,
+ transparent 80%
+ ) top / 100% 1px no-repeat,
+ linear-gradient(
+ 90deg,
+ transparent 0%,
+ rgba(255, 255, 255, 0.035) 20%,
+ rgba(255, 255, 255, 0.035) 80%,
+ transparent 100%
+ ) bottom / 100% 1px no-repeat;
+}
+
+.setting-card:hover {
+ background: var(--bg-card-hover, #1c1c1c);
+}
+
+.setting-card:hover::before {
+ opacity: 1.2;
+}
+
+.setting-card .setting-group-label {
+ font-size: 9.5px;
+ font-weight: 700;
+ letter-spacing: 0.08em;
+ text-transform: uppercase;
+ color: rgba(255, 255, 255, 0.42);
+ margin: 0 0 2px 0;
+ flex-shrink: 0;
+}
+
+.setting-card .setting-title {
+ font-size: calc(13px * var(--font-scale, 1));
+ font-weight: 600;
+ color: #ffffff;
+ line-height: 1.3;
+}
+
+.setting-card .setting-desc {
+ font-size: calc(11.5px * var(--font-scale, 1));
+ color: rgba(255, 255, 255, 0.62);
+ line-height: 1.4;
+ margin-top: 2px;
+}
+
+.setting-card .shelf-card-inline {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 12px;
+ width: 100%;
+}
+
+.setting-card .shelf-card-top {
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+ width: 100%;
+}
+
+.setting-card .shelf-card-bottom {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+ width: 100%;
+ margin-top: 2px;
+}
+
+.setting-card .setting-pills .pill {
+ height: 32px;
+ border-radius: 10px;
+ background: rgba(255, 255, 255, 0.05);
+ border: 1px solid rgba(255, 255, 255, 0.08);
+ color: rgba(255, 255, 255, 0.78);
+ font-size: 11.5px;
+ font-weight: 500;
+ transition: all 0.14s ease;
+}
+
+.setting-card .setting-pills .pill:hover {
+ background: rgba(255, 255, 255, 0.09);
+ border-color: rgba(255, 255, 255, 0.16);
+ color: #ffffff;
+}
+
+.setting-card .setting-pills .pill.active {
+ background: #ffffff;
+ color: #000000;
+ font-weight: 600;
+ border-color: #ffffff;
+ box-shadow: 0 2px 10px rgba(255, 255, 255, 0.2);
+}
+
.setting-badge-subtle {
display: inline-flex;
align-items: center;
@@ -1456,6 +1610,42 @@
gap: 12px;
}
+/* Vertical subsection divider in horizontal shelf matching recent-header */
+.settings-shelf-track.tab-view .shelf-section-divider {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ width: 20px;
+ min-width: 20px;
+ height: 146px;
+ margin: 0 2px 0 0;
+ padding: 0;
+ background: transparent;
+ border-left: 1px solid rgba(255, 255, 255, 0.08);
+ box-sizing: border-box;
+ flex-shrink: 0;
+ user-select: none;
+}
+
+.settings-shelf-track.tab-view .shelf-section-divider:first-child {
+ border-left: none;
+}
+
+.settings-shelf-track.tab-view .shelf-section-divider .shelf-section-divider-text {
+ writing-mode: vertical-rl;
+ transform: rotate(180deg);
+ font-size: calc(9.5px * var(--font-scale, 1));
+ font-weight: 600;
+ letter-spacing: 0.08em;
+ text-transform: uppercase;
+ color: rgba(255, 255, 255, 0.38);
+ max-height: 130px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
.settings-shelf-track.tab-view .settings-shelf-card,
.settings-shelf-card {
flex: 0 0 auto;
@@ -1686,7 +1876,7 @@
}
.settings-shelf-card.updates-card {
- width: 240px;
+ width: 290px;
}
.settings-shelf-card.check-updates-card {
diff --git a/tests/horizontalSettings.test.ts b/tests/horizontalSettings.test.ts
index fdb4859..fa3448a 100644
--- a/tests/horizontalSettings.test.ts
+++ b/tests/horizontalSettings.test.ts
@@ -177,9 +177,10 @@ describe('Horizontal Card Shelf Settings Layout', () => {
// Should contain trigger thickness
expect(horizontalBlock).toContain('trigger-thickness-card')
expect(horizontalBlock).toContain('handleThicknessRelease')
- // Should contain auto-updates toggle
+ // Should contain 3-mode updates selector (Automatic / Notify me / Off)
expect(horizontalBlock).toContain('autoUpdatesTitle')
- expect(horizontalBlock).toContain('autoUpdates: v')
+ expect(horizontalBlock).toContain('updateMode')
+ expect(horizontalBlock).toContain("patch({ updateMode: opt.id })")
// Should contain clearUnpinnedOnRestart
expect(horizontalBlock).toContain('clearUnpinnedTitle')
expect(horizontalBlock).toContain('clearUnpinnedOnRestart')
diff --git a/tests/updateMode.test.ts b/tests/updateMode.test.ts
new file mode 100644
index 0000000..b9afb47
--- /dev/null
+++ b/tests/updateMode.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from 'vitest'
+import { isUpdateMode, resolveUpdateMode } from '../shared/types'
+
+describe('updateMode resolution and legacy migration', () => {
+ it('defaults to auto when nothing is stored', () => {
+ expect(resolveUpdateMode({})).toBe('auto')
+ })
+
+ it('prefers a stored valid mode over the legacy boolean', () => {
+ expect(resolveUpdateMode({ updateMode: 'notify', autoUpdates: true })).toBe('notify')
+ expect(resolveUpdateMode({ updateMode: 'off', autoUpdates: true })).toBe('off')
+ expect(resolveUpdateMode({ updateMode: 'auto', autoUpdates: false })).toBe('auto')
+ })
+
+ it('migrates legacy booleans with zero behavior change', () => {
+ expect(resolveUpdateMode({ autoUpdates: true })).toBe('auto')
+ expect(resolveUpdateMode({ autoUpdates: false })).toBe('off')
+ })
+
+ it('falls back to the legacy boolean on corrupt mode values', () => {
+ expect(resolveUpdateMode({ updateMode: 'sometimes' as never, autoUpdates: false })).toBe('off')
+ expect(resolveUpdateMode({ updateMode: '' as never })).toBe('auto')
+ })
+
+ it('validates mode values', () => {
+ expect(isUpdateMode('auto')).toBe(true)
+ expect(isUpdateMode('notify')).toBe(true)
+ expect(isUpdateMode('off')).toBe(true)
+ expect(isUpdateMode('sometimes')).toBe(false)
+ expect(isUpdateMode(undefined)).toBe(false)
+ })
+})