mirror of
https://github.com/Boof2015/prism.git
synced 2026-08-17 03:02:42 +02:00
update the UI/UX for settings
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { useEffect, type CSSProperties, type JSX } from 'react'
|
||||
import { useEffect, useLayoutEffect, useRef, type CSSProperties, type JSX } from 'react'
|
||||
import { useAudioStore } from '../stores/audioStore'
|
||||
import { useSettingsStore } from '../stores/settingsStore'
|
||||
import { useThemeStore, PRESETS, PRESET_IDS } from '../stores/themeStore'
|
||||
@@ -17,9 +17,11 @@ const SCOPE_LABELS: Record<ScopeKind, string> = {
|
||||
|
||||
interface BottomBarProps {
|
||||
onClose: () => void
|
||||
onHeightChange?: (height: number) => void
|
||||
}
|
||||
|
||||
export default function BottomBar({ onClose }: BottomBarProps): JSX.Element {
|
||||
export default function BottomBar({ onClose, onHeightChange }: BottomBarProps): JSX.Element {
|
||||
const rootRef = useRef<HTMLDivElement | null>(null)
|
||||
|
||||
const hiddenScopes = useSettingsStore((s) => s.hiddenScopes)
|
||||
const toggleScope = useSettingsStore((s) => s.toggleScope)
|
||||
@@ -50,6 +52,33 @@ export default function BottomBar({ onClose }: BottomBarProps): JSX.Element {
|
||||
void refreshDevices()
|
||||
}, [refreshBackendSupport, refreshSystemSources, refreshDevices])
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (!onHeightChange || !rootRef.current) return
|
||||
|
||||
const rootElement = rootRef.current
|
||||
let frameId = 0
|
||||
|
||||
const reportHeight = (): void => {
|
||||
cancelAnimationFrame(frameId)
|
||||
frameId = requestAnimationFrame(() => {
|
||||
onHeightChange(Math.ceil(rootElement.getBoundingClientRect().height))
|
||||
})
|
||||
}
|
||||
|
||||
reportHeight()
|
||||
|
||||
const resizeObserver = new ResizeObserver(() => {
|
||||
reportHeight()
|
||||
})
|
||||
|
||||
resizeObserver.observe(rootElement)
|
||||
|
||||
return () => {
|
||||
cancelAnimationFrame(frameId)
|
||||
resizeObserver.disconnect()
|
||||
}
|
||||
}, [onHeightChange])
|
||||
|
||||
const handleSourceChange = async (value: string): Promise<void> => {
|
||||
if (value.startsWith('system:')) {
|
||||
const sourceId = value.slice('system:'.length)
|
||||
@@ -84,135 +113,149 @@ export default function BottomBar({ onClose }: BottomBarProps): JSX.Element {
|
||||
: 'Idle'
|
||||
|
||||
return (
|
||||
<div className="bottom-bar">
|
||||
<section className="bottom-bar__section">
|
||||
<div className="bottom-bar__section-title">Modules</div>
|
||||
<div className="bottom-bar__inline">
|
||||
{SCOPE_KINDS.map((kind) => {
|
||||
const active = !hiddenScopes.has(kind)
|
||||
return (
|
||||
<button
|
||||
key={kind}
|
||||
type="button"
|
||||
className={`settings-chip ${active ? 'is-active' : ''}`.trim()}
|
||||
onClick={() => toggleScope(kind)}
|
||||
title={SCOPE_LABELS[kind]}
|
||||
>
|
||||
{SCOPE_LABELS[kind]}
|
||||
</button>
|
||||
)
|
||||
})}
|
||||
<div className="bottom-bar" ref={rootRef}>
|
||||
<div className="bottom-bar__rail" aria-label="Global settings">
|
||||
<div className="bottom-bar__rail-content">
|
||||
<section className="bottom-bar__section bottom-bar__section--modules">
|
||||
<div className="bottom-bar__section-title">Modules</div>
|
||||
<div className="bottom-bar__section-body">
|
||||
<div className="bottom-bar__inline bottom-bar__inline--chips">
|
||||
{SCOPE_KINDS.map((kind) => {
|
||||
const active = !hiddenScopes.has(kind)
|
||||
return (
|
||||
<button
|
||||
key={kind}
|
||||
type="button"
|
||||
className={`settings-chip ${active ? 'is-active' : ''}`.trim()}
|
||||
onClick={() => toggleScope(kind)}
|
||||
title={SCOPE_LABELS[kind]}
|
||||
>
|
||||
{SCOPE_LABELS[kind]}
|
||||
</button>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div className="bottom-bar__divider" />
|
||||
|
||||
<section className="bottom-bar__section bottom-bar__section--theme">
|
||||
<div className="bottom-bar__section-title">Theme</div>
|
||||
<div className="bottom-bar__section-body">
|
||||
<div className="bottom-bar__inline bottom-bar__inline--theme">
|
||||
{PRESET_IDS.map((id) => {
|
||||
const preset = PRESETS[id]
|
||||
const active = presetId === id && !customAccent
|
||||
return (
|
||||
<button
|
||||
key={id}
|
||||
type="button"
|
||||
className={`settings-swatch ${active ? 'is-active' : ''}`.trim()}
|
||||
style={{ '--swatch-color': preset.accent } as CSSProperties}
|
||||
onClick={() => setPreset(id)}
|
||||
title={preset.name}
|
||||
aria-label={preset.name}
|
||||
/>
|
||||
)
|
||||
})}
|
||||
<input
|
||||
className="settings-accent-input"
|
||||
type="color"
|
||||
value={accent}
|
||||
onChange={(event) => setCustomAccent(event.target.value)}
|
||||
title="Custom accent color"
|
||||
/>
|
||||
{customAccent && (
|
||||
<button
|
||||
type="button"
|
||||
className="settings-chip"
|
||||
onClick={() => setCustomAccent(null)}
|
||||
>
|
||||
Reset
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div className="bottom-bar__divider" />
|
||||
|
||||
<section className="bottom-bar__section bottom-bar__section--source">
|
||||
<div className="bottom-bar__section-title">Audio Source</div>
|
||||
<div className="bottom-bar__section-body">
|
||||
<div className="bottom-bar__inline">
|
||||
<select
|
||||
className="settings-control__select"
|
||||
value={selectedSourceValue}
|
||||
onChange={(event) => {
|
||||
void handleSourceChange(event.target.value)
|
||||
}}
|
||||
>
|
||||
<optgroup label="Output Devices">
|
||||
{visibleSystemSources.map((source) => (
|
||||
<option key={source.id} value={`system:${source.id}`}>
|
||||
{source.isDefault ? `${source.label} (Default)` : source.label}
|
||||
</option>
|
||||
))}
|
||||
</optgroup>
|
||||
{showInputDevices ? (
|
||||
<optgroup label="Input Devices">
|
||||
{devices.map((device) => (
|
||||
<option key={device.deviceId} value={`device:${device.deviceId}`}>
|
||||
{device.label || `Input ${device.deviceId.slice(0, 8)}`}
|
||||
</option>
|
||||
))}
|
||||
</optgroup>
|
||||
) : null}
|
||||
</select>
|
||||
|
||||
<div className={`settings-status-pill is-${captureStatus}`.trim()}>
|
||||
<span className="settings-status-pill__dot" />
|
||||
<span>{indicatorLabel}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{captureError ? (
|
||||
<div className="settings-error-text bottom-bar__error-text">{captureError}</div>
|
||||
) : null}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div className="bottom-bar__divider" />
|
||||
|
||||
<section className="bottom-bar__section bottom-bar__section--trim">
|
||||
<div className="bottom-bar__section-title">Trim</div>
|
||||
<div className="bottom-bar__section-body">
|
||||
<div className="bottom-bar__inline">
|
||||
<span className="bottom-bar__trim-value">
|
||||
{inputGainDb > 0 ? '+' : ''}{inputGainDb.toFixed(1)}dB
|
||||
</span>
|
||||
<input
|
||||
className="settings-control__range bottom-bar__trim-slider"
|
||||
type="range"
|
||||
min={-12}
|
||||
max={12}
|
||||
step={0.5}
|
||||
value={inputGainDb}
|
||||
onChange={(event) => setInputGain(Number(event.target.value))}
|
||||
onDoubleClick={() => setInputGain(0)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<div className="bottom-bar__divider" />
|
||||
|
||||
<section className="bottom-bar__section">
|
||||
<div className="bottom-bar__section-title">Theme</div>
|
||||
<div className="bottom-bar__inline">
|
||||
{PRESET_IDS.map((id) => {
|
||||
const preset = PRESETS[id]
|
||||
const active = presetId === id && !customAccent
|
||||
return (
|
||||
<button
|
||||
key={id}
|
||||
type="button"
|
||||
className={`settings-swatch ${active ? 'is-active' : ''}`.trim()}
|
||||
style={{ '--swatch-color': preset.accent } as CSSProperties}
|
||||
onClick={() => setPreset(id)}
|
||||
title={preset.name}
|
||||
aria-label={preset.name}
|
||||
/>
|
||||
)
|
||||
})}
|
||||
<input
|
||||
className="settings-accent-input"
|
||||
type="color"
|
||||
value={accent}
|
||||
onChange={(event) => setCustomAccent(event.target.value)}
|
||||
title="Custom accent color"
|
||||
/>
|
||||
{customAccent && (
|
||||
<button
|
||||
type="button"
|
||||
className="settings-chip"
|
||||
onClick={() => setCustomAccent(null)}
|
||||
>
|
||||
Reset
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div className="bottom-bar__divider" />
|
||||
|
||||
<section className="bottom-bar__section">
|
||||
<div className="bottom-bar__section-title">Audio Source</div>
|
||||
<div className="bottom-bar__inline">
|
||||
<select
|
||||
className="settings-control__select"
|
||||
value={selectedSourceValue}
|
||||
onChange={(event) => {
|
||||
void handleSourceChange(event.target.value)
|
||||
}}
|
||||
>
|
||||
<optgroup label="Output Devices">
|
||||
{visibleSystemSources.map((source) => (
|
||||
<option key={source.id} value={`system:${source.id}`}>
|
||||
{source.isDefault ? `${source.label} (Default)` : source.label}
|
||||
</option>
|
||||
))}
|
||||
</optgroup>
|
||||
{showInputDevices ? (
|
||||
<optgroup label="Input Devices">
|
||||
{devices.map((device) => (
|
||||
<option key={device.deviceId} value={`device:${device.deviceId}`}>
|
||||
{device.label || `Input ${device.deviceId.slice(0, 8)}`}
|
||||
</option>
|
||||
))}
|
||||
</optgroup>
|
||||
) : null}
|
||||
</select>
|
||||
|
||||
<div className={`settings-status-pill is-${captureStatus}`.trim()}>
|
||||
<span className="settings-status-pill__dot" />
|
||||
<span>{indicatorLabel}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{captureError ? (
|
||||
<div className="settings-error-text">{captureError}</div>
|
||||
) : null}
|
||||
</section>
|
||||
|
||||
<div className="bottom-bar__divider" />
|
||||
|
||||
<section className="bottom-bar__section">
|
||||
<div className="bottom-bar__section-title">Trim</div>
|
||||
<div className="bottom-bar__inline">
|
||||
<span className="bottom-bar__trim-value">
|
||||
{inputGainDb > 0 ? '+' : ''}{inputGainDb.toFixed(1)}dB
|
||||
</span>
|
||||
<input
|
||||
className="settings-control__range bottom-bar__trim-slider"
|
||||
type="range"
|
||||
min={-12}
|
||||
max={12}
|
||||
step={0.5}
|
||||
value={inputGainDb}
|
||||
onChange={(event) => setInputGain(Number(event.target.value))}
|
||||
onDoubleClick={() => setInputGain(0)}
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
className="settings-panel__close"
|
||||
onClick={onClose}
|
||||
>
|
||||
Close
|
||||
</button>
|
||||
<div className="bottom-bar__actions">
|
||||
<button
|
||||
type="button"
|
||||
className="settings-panel__close bottom-bar__close"
|
||||
onClick={onClose}
|
||||
>
|
||||
Close
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -74,6 +74,23 @@ function ToggleChip({
|
||||
)
|
||||
}
|
||||
|
||||
function ToggleGroup({
|
||||
label,
|
||||
children,
|
||||
}: {
|
||||
label: string
|
||||
children: ReactNode
|
||||
}): JSX.Element {
|
||||
return (
|
||||
<div className="settings-control settings-control--full settings-control--stack">
|
||||
<span className="settings-control__label">{label}</span>
|
||||
<div className="settings-chip-row">
|
||||
{children}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function SelectControl({
|
||||
label,
|
||||
value,
|
||||
@@ -175,7 +192,7 @@ export default function ScopeSettingsSection({
|
||||
))}
|
||||
</SelectControl>
|
||||
|
||||
<div className="settings-chip-row settings-control--full">
|
||||
<ToggleGroup label="Display">
|
||||
<ToggleChip
|
||||
label="Fill"
|
||||
active={current.fillGradient}
|
||||
@@ -191,7 +208,7 @@ export default function ScopeSettingsSection({
|
||||
active={current.showGrid}
|
||||
onClick={() => onUpdate('spectrum', { showGrid: !current.showGrid })}
|
||||
/>
|
||||
</div>
|
||||
</ToggleGroup>
|
||||
|
||||
<RangeControl
|
||||
label="Tilt"
|
||||
@@ -234,7 +251,7 @@ export default function ScopeSettingsSection({
|
||||
const current = settings as ScopeSettings['oscilloscope']
|
||||
return (
|
||||
<>
|
||||
<div className="settings-chip-row settings-control--full">
|
||||
<ToggleGroup label="Options">
|
||||
<ToggleChip
|
||||
label="Pitch Lock"
|
||||
active={current.pitchLock}
|
||||
@@ -250,7 +267,7 @@ export default function ScopeSettingsSection({
|
||||
active={current.showGrid}
|
||||
onClick={() => onUpdate('oscilloscope', { showGrid: !current.showGrid })}
|
||||
/>
|
||||
</div>
|
||||
</ToggleGroup>
|
||||
|
||||
<RangeControl
|
||||
label="Line Width"
|
||||
@@ -282,7 +299,7 @@ export default function ScopeSettingsSection({
|
||||
<option value="linear-bipolar">Linear (Bi)</option>
|
||||
</SelectControl>
|
||||
|
||||
<div className="settings-chip-row settings-control--full">
|
||||
<ToggleGroup label="Overlays">
|
||||
<ToggleChip
|
||||
label="RGB"
|
||||
active={current.multiband}
|
||||
@@ -293,7 +310,7 @@ export default function ScopeSettingsSection({
|
||||
active={current.showGrid}
|
||||
onClick={() => onUpdate('vectorscope', { showGrid: !current.showGrid })}
|
||||
/>
|
||||
</div>
|
||||
</ToggleGroup>
|
||||
|
||||
<RangeControl
|
||||
label="Persistence"
|
||||
@@ -421,13 +438,13 @@ export default function ScopeSettingsSection({
|
||||
const current = settings as ScopeSettings['waveform']
|
||||
return (
|
||||
<>
|
||||
<div className="settings-chip-row settings-control--full">
|
||||
<ToggleGroup label="Bands">
|
||||
<ToggleChip
|
||||
label="Multiband"
|
||||
active={current.multiband}
|
||||
onClick={() => onUpdate('waveform', { multiband: !current.multiband })}
|
||||
/>
|
||||
</div>
|
||||
</ToggleGroup>
|
||||
|
||||
<RangeControl
|
||||
label="Gain"
|
||||
|
||||
@@ -1,10 +1,16 @@
|
||||
import { useMemo, type CSSProperties, type JSX } from 'react'
|
||||
import { useLayoutEffect, useMemo, useRef, type CSSProperties, type JSX } from 'react'
|
||||
import { buildAnalyzerGridTemplateColumns } from '../analyzerLayout'
|
||||
import ScopeSettingsSection from './ScopeSettingsSection'
|
||||
import { useSettingsStore } from '../stores/settingsStore'
|
||||
|
||||
export default function SettingsPanel(): JSX.Element {
|
||||
interface SettingsPanelProps {
|
||||
onHeightChange?: (height: number) => void
|
||||
}
|
||||
|
||||
export default function SettingsPanel({ onHeightChange }: SettingsPanelProps): JSX.Element {
|
||||
const { scopeSettings, updateScopeSettings, hiddenScopes, scopeOrder, widthWeights, scopePopouts } = useSettingsStore()
|
||||
const panelRef = useRef<HTMLDivElement | null>(null)
|
||||
const scopeTrackRef = useRef<HTMLDivElement | null>(null)
|
||||
|
||||
const dockedScopes = useMemo(
|
||||
() => scopeOrder.filter((kind) => !hiddenScopes.has(kind) && !scopePopouts[kind]?.poppedOut),
|
||||
@@ -16,9 +22,39 @@ export default function SettingsPanel(): JSX.Element {
|
||||
return { gridTemplateColumns } as CSSProperties
|
||||
}, [dockedScopes, widthWeights])
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (!onHeightChange || !panelRef.current) return
|
||||
|
||||
const panelElement = panelRef.current
|
||||
let frameId = 0
|
||||
|
||||
const reportHeight = (): void => {
|
||||
cancelAnimationFrame(frameId)
|
||||
frameId = requestAnimationFrame(() => {
|
||||
onHeightChange(Math.ceil(panelElement.scrollHeight))
|
||||
})
|
||||
}
|
||||
|
||||
reportHeight()
|
||||
|
||||
const resizeObserver = new ResizeObserver(() => {
|
||||
reportHeight()
|
||||
})
|
||||
|
||||
resizeObserver.observe(panelElement)
|
||||
if (scopeTrackRef.current) {
|
||||
resizeObserver.observe(scopeTrackRef.current)
|
||||
}
|
||||
|
||||
return () => {
|
||||
cancelAnimationFrame(frameId)
|
||||
resizeObserver.disconnect()
|
||||
}
|
||||
}, [dockedScopes, onHeightChange, scopeTrackStyle])
|
||||
|
||||
return (
|
||||
<div className="settings-panel">
|
||||
<div className="settings-panel__scope-track" style={scopeTrackStyle}>
|
||||
<div className="settings-panel" ref={panelRef}>
|
||||
<div className="settings-panel__scope-track" style={scopeTrackStyle} ref={scopeTrackRef}>
|
||||
{dockedScopes.map((kind) => (
|
||||
<ScopeSettingsSection
|
||||
key={kind}
|
||||
|
||||
Reference in New Issue
Block a user