mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-22 07:15:47 +00:00
b6ac879b14
* feat(settings): add SettingsSubCard primitives for sub-section controls Reusable wrappers (SettingsSubCard / SettingsField / SettingsRow / SettingsValue / SettingsCallout) that encapsulate the settings-norm-* sub-card styles. Per-mode and detail controls inside a settings section should use these instead of hand-rolling the box with inline padding or one-off classes — the lack of a shared primitive is what let recent additions drift off the pattern. * refactor(settings): move the Audio tab onto the SettingsSubCard primitives Normalization, Track transitions and Hi-Res now build their sub-cards from the shared primitives instead of raw settings-norm-* markup. Track Previews, which rendered its sub-options bare with inline styles and dividers, now uses the same sub-card so the whole Audio tab is consistent. Behaviour and styling unchanged; Track Previews' start/duration become labelled slider rows like Normalization. * refactor(settings): move the remaining tabs onto SettingsSubCard Apply the shared sub-card primitives across the rest of Settings so every tab matches the Audio-tab reference look: - Appearance: grid columns, window buttons, UI scale, font, seekbar - Library: random-mix blacklist, rating-filter detail - Input: in-app + global keybind lists - Integrations: Discord templates, external-artwork BYOK - System: language, Linux Wayland text render, clock format, logging - Storage: media dir, hot-cache detail, downloads folder - Backup: mode picker + per-mode export/import Detail/per-mode controls now sit in the bordered sub-card; toggle groups stay on SettingsToggle. Behaviour unchanged. * refactor(settings): box the data-heavy and shared sections in SettingsSubCard Bring the previously-skipped 'borderline' sections onto the sub-card too: - Playback speed: wrap the settings-mode controls in a sub-card; the compact player-popup path is left untouched (shares the component via the compact flag) - Theme scheduler: mode picker + theme/time selects move into the sub-card - Cover-cache + analytics strategy: the per-server tables sit in a sub-card Behaviour unchanged; the table layouts and the playback-rate-* internals stay as they are, only the surrounding sub-card is added for visual consistency.
195 lines
9.6 KiB
TypeScript
195 lines
9.6 KiB
TypeScript
import { useState } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { Keyboard, RotateCcw, X } from 'lucide-react';
|
|
import { IN_APP_SHORTCUT_ACTIONS, GLOBAL_SHORTCUT_ACTIONS } from '../../config/shortcutActions';
|
|
import { useGlobalShortcutsStore, type GlobalAction, buildGlobalShortcut, formatGlobalShortcut } from '../../store/globalShortcutsStore';
|
|
import { useKeybindingsStore, type KeyAction, buildInAppBinding, formatBinding } from '../../store/keybindingsStore';
|
|
import SettingsSubSection from '../SettingsSubSection';
|
|
import { SettingsGroup } from './SettingsGroup';
|
|
import { SettingsSubCard } from './SettingsSubCard';
|
|
|
|
export function InputTab() {
|
|
const { t } = useTranslation();
|
|
const kb = useKeybindingsStore();
|
|
const gs = useGlobalShortcutsStore();
|
|
const [listeningFor, setListeningFor] = useState<KeyAction | null>(null);
|
|
const [listeningForGlobal, setListeningForGlobal] = useState<GlobalAction | null>(null);
|
|
|
|
return (
|
|
<>
|
|
<SettingsSubSection
|
|
title={t('settings.inputKeybindingsTitle')}
|
|
icon={<Keyboard size={16} />}
|
|
action={
|
|
<button
|
|
type="button"
|
|
className="btn btn-ghost"
|
|
style={{ fontSize: 12, color: 'var(--text-muted)', padding: '2px 6px' }}
|
|
onClick={() => { kb.resetToDefaults(); setListeningFor(null); }}
|
|
data-tooltip={t('settings.shortcutsReset')}
|
|
aria-label={t('settings.shortcutsReset')}
|
|
>
|
|
<RotateCcw size={14} />
|
|
</button>
|
|
}
|
|
>
|
|
<div className="settings-card">
|
|
<SettingsGroup>
|
|
<SettingsSubCard>
|
|
<div style={{ display: 'flex', flexDirection: 'column', gap: '4px' }}>
|
|
{IN_APP_SHORTCUT_ACTIONS.map(({ id: action, getLabel }) => {
|
|
const label = getLabel(t);
|
|
const bound = kb.bindings[action];
|
|
const isListening = listeningFor === action;
|
|
return (
|
|
<div key={action} style={{
|
|
display: 'flex', alignItems: 'center', justifyContent: 'space-between',
|
|
padding: '8px 10px', borderRadius: 'var(--radius-sm)',
|
|
background: isListening ? 'var(--accent-dim)' : 'transparent',
|
|
transition: 'background 0.15s',
|
|
}}>
|
|
<span style={{ fontSize: 13, color: 'var(--text-primary)' }}>{label}</span>
|
|
<div style={{ display: 'flex', alignItems: 'center', gap: '6px' }}>
|
|
<button
|
|
onClick={() => {
|
|
if (isListening) { setListeningFor(null); return; }
|
|
setListeningFor(action);
|
|
const handler = (e: KeyboardEvent) => {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
if (e.code === 'Escape') {
|
|
setListeningFor(null);
|
|
window.removeEventListener('keydown', handler, true);
|
|
return;
|
|
}
|
|
const chord = buildInAppBinding(e);
|
|
if (!chord) return;
|
|
const existing = (Object.entries(kb.bindings) as [KeyAction, string | null][])
|
|
.find(([, c]) => c === chord)?.[0];
|
|
if (existing && existing !== action) kb.setBinding(existing, null);
|
|
kb.setBinding(action, chord);
|
|
setListeningFor(null);
|
|
window.removeEventListener('keydown', handler, true);
|
|
};
|
|
window.addEventListener('keydown', handler, true);
|
|
}}
|
|
className="keybind-badge"
|
|
style={{
|
|
minWidth: 72, padding: '3px 10px', borderRadius: 'var(--radius-sm)',
|
|
fontSize: 12, fontWeight: 600, fontFamily: 'monospace',
|
|
background: isListening ? 'var(--accent)' : bound ? 'var(--bg-hover)' : 'var(--bg-card)',
|
|
color: isListening ? 'var(--bg-app)' : bound ? 'var(--text-primary)' : 'var(--text-muted)',
|
|
border: `1px solid ${isListening ? 'var(--accent)' : 'var(--border-subtle)'}`,
|
|
cursor: 'pointer',
|
|
}}
|
|
>
|
|
{isListening ? t('settings.shortcutListening') : bound ? formatBinding(bound) : t('settings.shortcutUnbound')}
|
|
</button>
|
|
{bound && !isListening && (
|
|
<button
|
|
onClick={() => kb.setBinding(action, null)}
|
|
style={{ background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-muted)', padding: '2px 4px', lineHeight: 1 }}
|
|
data-tooltip={t('settings.shortcutClear')}
|
|
>
|
|
<X size={12} />
|
|
</button>
|
|
)}
|
|
</div>
|
|
</div>
|
|
);
|
|
})}
|
|
</div>
|
|
</SettingsSubCard>
|
|
</SettingsGroup>
|
|
</div>
|
|
</SettingsSubSection>
|
|
|
|
<SettingsSubSection
|
|
title={t('settings.globalShortcutsTitle')}
|
|
icon={<Keyboard size={16} />}
|
|
description={t('settings.globalShortcutsNote')}
|
|
action={
|
|
<button
|
|
type="button"
|
|
className="btn btn-ghost"
|
|
style={{ fontSize: 12, color: 'var(--text-muted)', padding: '2px 6px' }}
|
|
onClick={() => { gs.resetAll(); setListeningForGlobal(null); }}
|
|
data-tooltip={t('settings.shortcutsReset')}
|
|
aria-label={t('settings.shortcutsReset')}
|
|
>
|
|
<RotateCcw size={14} />
|
|
</button>
|
|
}
|
|
>
|
|
<div className="settings-card">
|
|
<SettingsGroup>
|
|
<SettingsSubCard>
|
|
<div style={{ display: 'flex', flexDirection: 'column', gap: '4px' }}>
|
|
{GLOBAL_SHORTCUT_ACTIONS.map(({ id: action, getLabel }) => {
|
|
const label = getLabel(t);
|
|
const bound = gs.shortcuts[action] ?? null;
|
|
const isListening = listeningForGlobal === action;
|
|
return (
|
|
<div key={action} style={{
|
|
display: 'flex', alignItems: 'center', justifyContent: 'space-between',
|
|
padding: '8px 10px', borderRadius: 'var(--radius-sm)',
|
|
background: isListening ? 'var(--accent-dim)' : 'transparent',
|
|
transition: 'background 0.15s',
|
|
}}>
|
|
<span style={{ fontSize: 13, color: 'var(--text-primary)' }}>{label}</span>
|
|
<div style={{ display: 'flex', alignItems: 'center', gap: '6px' }}>
|
|
<button
|
|
onClick={() => {
|
|
if (isListening) { setListeningForGlobal(null); return; }
|
|
setListeningForGlobal(action);
|
|
const handler = (e: KeyboardEvent) => {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
if (e.code === 'Escape') {
|
|
setListeningForGlobal(null);
|
|
window.removeEventListener('keydown', handler, true);
|
|
return;
|
|
}
|
|
const shortcut = buildGlobalShortcut(e);
|
|
if (shortcut) {
|
|
gs.setShortcut(action, shortcut);
|
|
setListeningForGlobal(null);
|
|
window.removeEventListener('keydown', handler, true);
|
|
}
|
|
};
|
|
window.addEventListener('keydown', handler, true);
|
|
}}
|
|
className="keybind-badge"
|
|
style={{
|
|
minWidth: 120, padding: '3px 10px', borderRadius: 'var(--radius-sm)',
|
|
fontSize: 12, fontWeight: 600, fontFamily: 'monospace',
|
|
background: isListening ? 'var(--accent)' : bound ? 'var(--bg-hover)' : 'var(--bg-card)',
|
|
color: isListening ? 'var(--bg-app)' : bound ? 'var(--text-primary)' : 'var(--text-muted)',
|
|
border: `1px solid ${isListening ? 'var(--accent)' : 'var(--border-subtle)'}`,
|
|
cursor: 'pointer',
|
|
}}
|
|
>
|
|
{isListening ? t('settings.shortcutListening') : bound ? formatGlobalShortcut(bound) : t('settings.shortcutUnbound')}
|
|
</button>
|
|
{bound && !isListening && (
|
|
<button
|
|
onClick={() => gs.setShortcut(action, null)}
|
|
style={{ background: 'none', border: 'none', cursor: 'pointer', color: 'var(--text-muted)', padding: '2px 4px', lineHeight: 1 }}
|
|
data-tooltip={t('settings.shortcutClear')}
|
|
>
|
|
<X size={12} />
|
|
</button>
|
|
)}
|
|
</div>
|
|
</div>
|
|
);
|
|
})}
|
|
</div>
|
|
</SettingsSubCard>
|
|
</SettingsGroup>
|
|
</div>
|
|
</SettingsSubSection>
|
|
</>
|
|
);
|
|
}
|