diff --git a/web/src/components/MemoEditor/components/AudioRecorderPanel.tsx b/web/src/components/MemoEditor/components/AudioRecorderPanel.tsx index ae95722a..d7943f39 100644 --- a/web/src/components/MemoEditor/components/AudioRecorderPanel.tsx +++ b/web/src/components/MemoEditor/components/AudioRecorderPanel.tsx @@ -4,47 +4,55 @@ import { formatAudioTime } from "@/components/MemoMetadata/Attachment/attachment import { Button } from "@/components/ui/button"; import { cn } from "@/lib/utils"; import { useTranslate } from "@/utils/i18n"; +import { useAudioWaveform } from "../hooks/useAudioWaveform"; import type { AudioRecorderPanelProps } from "../types/components"; +import { VoiceWaveform } from "./VoiceWaveform"; -export const AudioRecorderPanel: FC = ({ audioRecorder, onStop, onCancel }) => { +export const AudioRecorderPanel: FC = ({ audioRecorder, mediaStream, onStop, onCancel }) => { const t = useTranslate(); const { status, elapsedSeconds } = audioRecorder; const isRequestingPermission = status === "requesting_permission"; + const isRecording = status === "recording"; + const waveformLevels = useAudioWaveform(mediaStream, isRecording && mediaStream !== null); + const srStatusText = isRequestingPermission ? t("editor.audio-recorder.requesting-permission") : t("editor.audio-recorder.recording"); return ( -
-
-
-
- {isRequestingPermission ? t("editor.audio-recorder.requesting-permission") : t("editor.audio-recorder.recording")} -
-
- {isRequestingPermission ? ( - - ) : ( - - )} - {formatAudioTime(elapsedSeconds)} -
-
+
+
+ {isRequestingPermission ? : null} + {srStatusText} + + {formatAudioTime(elapsedSeconds)} +
-
- - -
+
+ +
); diff --git a/web/src/components/MemoEditor/components/VoiceWaveform.tsx b/web/src/components/MemoEditor/components/VoiceWaveform.tsx new file mode 100644 index 00000000..988c84f1 --- /dev/null +++ b/web/src/components/MemoEditor/components/VoiceWaveform.tsx @@ -0,0 +1,34 @@ +import type { FC } from "react"; +import { cn } from "@/lib/utils"; + +/** Max half-height of each bar (px); bars are centered vertically. */ +const MAX_BAR_PX = 11; +const MIN_BAR_PX = 2; + +type VoiceWaveformProps = { + levels: number[]; + className?: string; +}; + +/** + * Tight-packed vertical bars (rounded caps): fixed bar width + minimal gap — no `flex-1` columns + * so bars stay visually dense like compact voice-memo waveforms. + */ +export const VoiceWaveform: FC = ({ levels, className }) => { + return ( +
+ {levels.map((level, i) => { + const h = Math.max(MIN_BAR_PX, level * MAX_BAR_PX); + const centerDistance = Math.abs(i - (levels.length - 1) / 2) / (levels.length / 2); + const opacity = 0.35 + (1 - centerDistance) * 0.35; + return ( + + ); + })} +
+ ); +}; diff --git a/web/src/components/MemoEditor/hooks/index.ts b/web/src/components/MemoEditor/hooks/index.ts index dc2780d2..5854dfd1 100644 --- a/web/src/components/MemoEditor/hooks/index.ts +++ b/web/src/components/MemoEditor/hooks/index.ts @@ -1,5 +1,6 @@ // Custom hooks for MemoEditor (internal use only) export { useAudioRecorder } from "./useAudioRecorder"; +export { useAudioWaveform } from "./useAudioWaveform"; export { useAutoSave } from "./useAutoSave"; export { useBlobUrls } from "./useBlobUrls"; export { useDragAndDrop } from "./useDragAndDrop"; diff --git a/web/src/components/MemoEditor/hooks/useAudioRecorder.ts b/web/src/components/MemoEditor/hooks/useAudioRecorder.ts index 1bc9a99a..7df3b79c 100644 --- a/web/src/components/MemoEditor/hooks/useAudioRecorder.ts +++ b/web/src/components/MemoEditor/hooks/useAudioRecorder.ts @@ -1,4 +1,4 @@ -import { useEffect, useRef } from "react"; +import { useEffect, useRef, useState } from "react"; import type { LocalFile } from "../types/attachment"; import { useBlobUrls } from "./useBlobUrls"; @@ -50,6 +50,7 @@ function createRecordedFile(blob: Blob, mimeType: string): File { export const useAudioRecorder = (actions: AudioRecorderActions) => { const mediaRecorderRef = useRef(null); const mediaStreamRef = useRef(null); + const [recordingStream, setRecordingStream] = useState(null); const chunksRef = useRef([]); const startedAtRef = useRef(null); const elapsedTimerRef = useRef(null); @@ -67,6 +68,7 @@ export const useAudioRecorder = (actions: AudioRecorderActions) => { const cleanupStream = () => { mediaStreamRef.current?.getTracks().forEach((track) => track.stop()); mediaStreamRef.current = null; + setRecordingStream(null); }; const resetRecorderRefs = () => { @@ -130,6 +132,7 @@ export const useAudioRecorder = (actions: AudioRecorderActions) => { recorderMimeTypeRef.current = mimeType; mediaStreamRef.current = stream; + setRecordingStream(stream); mediaRecorderRef.current = mediaRecorder; chunksRef.current = []; @@ -221,5 +224,6 @@ export const useAudioRecorder = (actions: AudioRecorderActions) => { startRecording, stopRecording, resetRecording, + recordingStream, }; }; diff --git a/web/src/components/MemoEditor/hooks/useAudioWaveform.ts b/web/src/components/MemoEditor/hooks/useAudioWaveform.ts new file mode 100644 index 00000000..69b042de --- /dev/null +++ b/web/src/components/MemoEditor/hooks/useAudioWaveform.ts @@ -0,0 +1,99 @@ +import { useEffect, useState } from "react"; + +const BAR_COUNT = 40; +const IDLE_LEVEL = 0.08; +const UPDATE_MS = 33; +const CENTER_EMPHASIS = 0.35; +const BOOST_OFFSET = 0.04; +const BOOST_CURVE = 0.55; +const BOOST_GAIN = 2.8; + +const createIdleLevels = (): number[] => Array.from({ length: BAR_COUNT }, () => IDLE_LEVEL); + +const clamp01 = (value: number): number => Math.min(1, Math.max(0, value)); + +function computeLevels(dataArray: Uint8Array, bufferLength: number): number[] { + const sampled: number[] = []; + for (let i = 0; i < BAR_COUNT; i++) { + const start = Math.floor((i / BAR_COUNT) * bufferLength); + const end = Math.floor(((i + 1) / BAR_COUNT) * bufferLength); + let sum = 0; + for (let j = start; j < end; j++) { + sum += dataArray[j]; + } + const span = Math.max(1, end - start); + const avg = sum / (255 * span); + const boosted = Math.min(1, (avg + BOOST_OFFSET) ** BOOST_CURVE * BOOST_GAIN); + sampled.push(Math.max(IDLE_LEVEL, boosted)); + } + + const mirrored: number[] = []; + for (let i = 0; i < BAR_COUNT; i++) { + const j = BAR_COUNT - 1 - i; + const v = (sampled[i] + sampled[j]) / 2; + const centerDistance = Math.abs(i - (BAR_COUNT - 1) / 2) / (BAR_COUNT / 2); + const envelope = 1 - centerDistance * CENTER_EMPHASIS; + mirrored.push(Math.max(IDLE_LEVEL, clamp01(v * envelope))); + } + + for (let i = 1; i < BAR_COUNT - 1; i++) { + mirrored[i] = Math.max(IDLE_LEVEL, (mirrored[i - 1] + mirrored[i] * 2 + mirrored[i + 1]) / 4); + } + + return mirrored; +} + +/** + * Derives normalized bar levels (0–1) from a microphone MediaStream for live waveform UI. + */ +export function useAudioWaveform(stream: MediaStream | null, enabled: boolean): number[] { + const [levels, setLevels] = useState(createIdleLevels); + + useEffect(() => { + if (!enabled || !stream) { + setLevels(createIdleLevels()); + return; + } + + const audioContext = new AudioContext(); + const source = audioContext.createMediaStreamSource(stream); + const analyser = audioContext.createAnalyser(); + analyser.fftSize = 512; + analyser.minDecibels = -72; + analyser.maxDecibels = -8; + analyser.smoothingTimeConstant = 0.72; + source.connect(analyser); + + const bufferLength = analyser.frequencyBinCount; + const dataArray = new Uint8Array(bufferLength); + let rafId = 0; + let lastEmit = 0; + let first = true; + + const tick = (now: number) => { + analyser.getByteFrequencyData(dataArray); + if (first || now - lastEmit >= UPDATE_MS) { + first = false; + lastEmit = now; + setLevels(computeLevels(dataArray, bufferLength)); + } + rafId = requestAnimationFrame(tick); + }; + + const start = async () => { + await audioContext.resume(); + rafId = requestAnimationFrame(tick); + }; + + void start(); + + return () => { + cancelAnimationFrame(rafId); + source.disconnect(); + analyser.disconnect(); + void audioContext.close(); + }; + }, [stream, enabled]); + + return levels; +} diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsx index 018080f5..504ac4a2 100644 --- a/web/src/components/MemoEditor/index.tsx +++ b/web/src/components/MemoEditor/index.tsx @@ -206,6 +206,7 @@ const MemoEditorImpl: React.FC = ({ {isAudioRecorderOpen && (state.audioRecorder.status === "recording" || state.audioRecorder.status === "requesting_permission") && ( diff --git a/web/src/components/MemoEditor/types/components.ts b/web/src/components/MemoEditor/types/components.ts index b8cee491..3b33d577 100644 --- a/web/src/components/MemoEditor/types/components.ts +++ b/web/src/components/MemoEditor/types/components.ts @@ -32,6 +32,8 @@ export interface EditorMetadataProps { export interface AudioRecorderPanelProps { audioRecorder: EditorState["audioRecorder"]; + /** Active mic stream while recording; used for live waveform visualization. */ + mediaStream: MediaStream | null; onStop: () => void; onCancel: () => void; }