diff --git a/apps/mobile/app/(app)/(tabs)/home/index.tsx b/apps/mobile/app/(app)/(tabs)/home/index.tsx index e50db54..7d1348a 100644 --- a/apps/mobile/app/(app)/(tabs)/home/index.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/index.tsx @@ -62,7 +62,10 @@ export default function HomeScreen() { return ( diff --git a/apps/mobile/components/convex-auth-recovery.tsx b/apps/mobile/components/convex-auth-recovery.tsx index ad3045a..1ca770e 100644 --- a/apps/mobile/components/convex-auth-recovery.tsx +++ b/apps/mobile/components/convex-auth-recovery.tsx @@ -71,7 +71,10 @@ class ConvexAuthErrorBoundary extends Component< } } -export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) { +export function ConvexAuthRecovery({ + children, + onInvalidate, +}: ConvexAuthRecoveryProps) { const localAuth = useLocalConvexAuth() const serverAuth = useServerConvexAuth() const hadServerAuthRef = useRef(false) @@ -113,9 +116,9 @@ export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecover const sessionEstablished = Boolean( serverAuth && - !serverAuth.isLoading && - !serverAuth.isRefreshing && - serverAuth.isAuthenticated + !serverAuth.isLoading && + !serverAuth.isRefreshing && + serverAuth.isAuthenticated ) return ( diff --git a/apps/mobile/components/ios-swipe-to-remove-row.tsx b/apps/mobile/components/ios-swipe-to-remove-row.tsx index b32ada8..76a6edd 100644 --- a/apps/mobile/components/ios-swipe-to-remove-row.tsx +++ b/apps/mobile/components/ios-swipe-to-remove-row.tsx @@ -112,7 +112,10 @@ function SwipeRowBody({ setIsOpen(false) }, [removing, translateX]) - const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group]) + const handleSwipeStart = useCallback( + () => group.setOpen(close), + [close, group] + ) const handleSettle = useCallback( (open: boolean) => { @@ -251,8 +254,7 @@ function SwipeRowBody({ const pillWidth = Math.max( 0, resting + - (revealed - PILL_COMMITTED_MARGIN * 2 - resting) * - commitProgress.value + (revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value ) const restingHeight = interpolate( pillWidth, diff --git a/apps/mobile/hooks/cover-palette-source.ts b/apps/mobile/hooks/cover-palette-source.ts index aab94e2..3084df7 100644 --- a/apps/mobile/hooks/cover-palette-source.ts +++ b/apps/mobile/hooks/cover-palette-source.ts @@ -83,7 +83,11 @@ export function createCoverPaletteSource({ const [waitedKey, setWaitedKey] = useState(null) const swatches = - resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null + resolved.key === key + ? resolved.swatches + : key + ? cachedSwatches(key) + : null useEffect(() => { if (!key || hasCover === false) return diff --git a/apps/mobile/lib/auth-errors.ts b/apps/mobile/lib/auth-errors.ts index 56e27fb..71a89f9 100644 --- a/apps/mobile/lib/auth-errors.ts +++ b/apps/mobile/lib/auth-errors.ts @@ -1,9 +1,6 @@ import { ConvexError, type Value } from "convex/values" -const AUTH_ERROR_MESSAGES = new Set([ - "Not authenticated", - "User not logged in", -]) +const AUTH_ERROR_MESSAGES = new Set(["Not authenticated", "User not logged in"]) function matchesAuthMessage(message: string): boolean { if (AUTH_ERROR_MESSAGES.has(message)) { diff --git a/apps/mobile/lib/auth-storage.ts b/apps/mobile/lib/auth-storage.ts index 190e717..57435d0 100644 --- a/apps/mobile/lib/auth-storage.ts +++ b/apps/mobile/lib/auth-storage.ts @@ -37,7 +37,9 @@ export function authStorageKey(key: string, storageNamespace: string): string { return `${key}_${escapedNamespace}` } -export async function clearStoredAuthTokens(storageNamespace: string): Promise { +export async function clearStoredAuthTokens( + storageNamespace: string +): Promise { await Promise.all( AUTH_STORAGE_KEYS.map((key) => secureRemoveItem(authStorageKey(key, storageNamespace)) diff --git a/apps/mobile/lib/format.ts b/apps/mobile/lib/format.ts index 0217bc3..0d2e6c8 100644 --- a/apps/mobile/lib/format.ts +++ b/apps/mobile/lib/format.ts @@ -5,7 +5,10 @@ export function formatDuration(seconds: number): string { return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}` } -export function formatRemainingDuration(current: number, total: number): string { +export function formatRemainingDuration( + current: number, + total: number +): string { const remaining = Math.max(0, Math.floor(total) - Math.floor(current)) return `-${formatDuration(remaining)}` } diff --git a/apps/mobile/lib/legacy-cover-palette.ts b/apps/mobile/lib/legacy-cover-palette.ts index 7bcbd5e..c18821c 100644 --- a/apps/mobile/lib/legacy-cover-palette.ts +++ b/apps/mobile/lib/legacy-cover-palette.ts @@ -79,7 +79,9 @@ export function deriveCoverPalette( secondaryForeground: toHex(secondaryForeground), accent: toHex(accent), accentForeground: toHex(accentForeground), - accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)), + accentText: toHex( + withMinContrast(accent, background, SECONDARY_MIN_CONTRAST) + ), surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)), divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)), isDark: lightText, @@ -94,7 +96,10 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb { ? withLightness(color, Math.min(lch.l, 0.86)) : withLightness(color, Math.max(lch.l, 0.2)) const y = luminance(clamped) - if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) { + if ( + y <= DARK_BACKGROUND_MAX_LUMINANCE || + y >= LIGHT_BACKGROUND_MIN_LUMINANCE + ) { return clamped } @@ -125,7 +130,10 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null { } function prefersLightText(background: Rgb) { - return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background) + return ( + contrastRatio([255, 255, 255], background) >= + contrastRatio([0, 0, 0], background) + ) } /** Moves `color`'s lightness away from `background` until it reaches `min`. */ @@ -180,7 +188,10 @@ function withLuminance(color: Rgb, target: number): Rgb { high = mid } } - return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high) + return withLightness( + color, + target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high + ) } /** `amount` of `color` over `base`. */ @@ -206,7 +217,8 @@ function toLinear(channel: number) { } function fromLinear(value: number) { - const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055 + const c = + value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055 return c * 255 } diff --git a/apps/mobile/lib/server-config.ts b/apps/mobile/lib/server-config.ts index 4c64f0b..ffa4aa2 100644 --- a/apps/mobile/lib/server-config.ts +++ b/apps/mobile/lib/server-config.ts @@ -13,7 +13,10 @@ const SERVER_CONFIG_KEY = "otunes.server-config" const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config" function normalizeHostnameInput(input: string): string { - return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "") + return input + .trim() + .replace(/^https?:\/\//i, "") + .replace(/\/+$/, "") } function buildServerUrl(hostname: string): string { diff --git a/apps/web/app/(app)/recently-played/page.tsx b/apps/web/app/(app)/recently-played/page.tsx index 23d6d06..08f2c59 100644 --- a/apps/web/app/(app)/recently-played/page.tsx +++ b/apps/web/app/(app)/recently-played/page.tsx @@ -8,11 +8,7 @@ import { albumGridClassName } from "@/lib/album-grid-classes" import { api } from "@otunes/convex/_generated/api" import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types" -function RecentlyPlayedCard({ - item, -}: { - item: BrowseAlbum | PlaylistSummary -}) { +function RecentlyPlayedCard({ item }: { item: BrowseAlbum | PlaylistSummary }) { if ("owner" in item) { return } diff --git a/apps/web/app/(app)/search/page.tsx b/apps/web/app/(app)/search/page.tsx index ecdfa5c..1d02f44 100644 --- a/apps/web/app/(app)/search/page.tsx +++ b/apps/web/app/(app)/search/page.tsx @@ -9,7 +9,10 @@ import { ContentCarousel } from "@/components/content-carousel" import { SearchResultsSkeleton } from "@/components/library-skeletons" import { SearchPrompt } from "@/components/search-prompt" import { SearchSongItem } from "@/components/search-song-item" -import { SearchTopResultCard, type TopResult } from "@/components/search-top-result-card" +import { + SearchTopResultCard, + type TopResult, +} from "@/components/search-top-result-card" import { useCachedQuery } from "@/hooks/use-cached-query" import { api } from "@otunes/convex/_generated/api" @@ -107,10 +110,7 @@ function SearchResults({ query }: { query: string }) { )} {showPlaylists && ( - + )} diff --git a/apps/web/components/add-to-playlist-provider.tsx b/apps/web/components/add-to-playlist-provider.tsx index 3db99ed..c215e54 100644 --- a/apps/web/components/add-to-playlist-provider.tsx +++ b/apps/web/components/add-to-playlist-provider.tsx @@ -42,7 +42,9 @@ function formatAddToPlaylistToast( } const addedLabel = - addedCount > 1 ? `Added ${addedCount} songs to ${title}` : `Added to ${title}` + addedCount > 1 + ? `Added ${addedCount} songs to ${title}` + : `Added to ${title}` if (skippedCount === 0) { return addedLabel @@ -64,14 +66,15 @@ type AddToPlaylistContextValue = { openCreatePlaylist: () => void } -const AddToPlaylistContext = React.createContext( - null -) +const AddToPlaylistContext = + React.createContext(null) export function useAddToPlaylist() { const context = React.useContext(AddToPlaylistContext) if (!context) { - throw new Error("useAddToPlaylist must be used within AddToPlaylistProvider") + throw new Error( + "useAddToPlaylist must be used within AddToPlaylistProvider" + ) } return context } @@ -201,7 +204,10 @@ export function AddToPlaylistProvider({ setCreateOpen(true) }, []) - async function handleAddToPlaylist(playlistId: Id<"playlists">, title: string) { + async function handleAddToPlaylist( + playlistId: Id<"playlists">, + title: string + ) { setIsSubmitting(true) try { const { addedCount, skippedCount } = await addSongs({ diff --git a/apps/web/components/album-card.tsx b/apps/web/components/album-card.tsx index 076ac12..165c81a 100644 --- a/apps/web/components/album-card.tsx +++ b/apps/web/components/album-card.tsx @@ -104,10 +104,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) { onMouseEnter={() => setHovered(true)} onMouseLeave={() => setHovered(false)} > - + {album.title} -

- {album.artist.name} -

+

{album.artist.name}

diff --git a/apps/web/components/album-view.tsx b/apps/web/components/album-view.tsx index 5fe12fd..b0f40c9 100644 --- a/apps/web/components/album-view.tsx +++ b/apps/web/components/album-view.tsx @@ -44,7 +44,10 @@ import { albumCoverUrl } from "@/lib/cover-urls" import { sumDurationSeconds } from "@/lib/media-summary" import { albumDetailSongs, rememberSongs } from "@/lib/song-cache" -function formatMetadata(genre: string | null, year: number | null): string | null { +function formatMetadata( + genre: string | null, + year: number | null +): string | null { const parts: string[] = [] if (genre) { parts.push(genre) @@ -60,7 +63,9 @@ type AlbumTrackSection = { tracks: BrowseAlbumTrack[] } -function groupAlbumTracksByDisk(tracks: BrowseAlbumTrack[]): AlbumTrackSection[] { +function groupAlbumTracksByDisk( + tracks: BrowseAlbumTrack[] +): AlbumTrackSection[] { const hasDiskNumbers = tracks.some((track) => track.diskNumber !== null) if (!hasDiskNumbers) { return [{ label: null, tracks }] @@ -138,7 +143,11 @@ export function AlbumView({ } = useTrackSelection(album.tracks, validHighlightedSongId) const selectionPositions = React.useMemo( - () => getSelectionRangePositions(album.tracks.map((track) => track.id), selectedIds), + () => + getSelectionRangePositions( + album.tracks.map((track) => track.id), + selectedIds + ), [album.tracks, selectedIds] ) @@ -192,7 +201,11 @@ export function AlbumView({ const handleRowPlay = React.useCallback( (index: number) => { - void playFromSong(album.tracks[index].id, albumSongIds, `album:${album.id}`) + void playFromSong( + album.tracks[index].id, + albumSongIds, + `album:${album.id}` + ) }, [album.tracks, album.id, albumSongIds, playFromSong] ) @@ -215,7 +228,7 @@ export function AlbumView({
-
+
0 ? track.track : sectionTrackIndex + 1 + track.track > 0 + ? track.track + : sectionTrackIndex + 1 } subtitle={track.artists?.join(", ")} isActive={track.id === activeTrackId} diff --git a/apps/web/components/auth-form.tsx b/apps/web/components/auth-form.tsx index 65d1c26..65d6a38 100644 --- a/apps/web/components/auth-form.tsx +++ b/apps/web/components/auth-form.tsx @@ -13,7 +13,12 @@ import { CardHeader, CardTitle, } from "@/components/ui/card" -import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field" +import { + Field, + FieldError, + FieldGroup, + FieldLabel, +} from "@/components/ui/field" import { Input } from "@/components/ui/input" import { Spinner } from "@/components/ui/spinner" @@ -101,64 +106,64 @@ export function AuthForm({ administrator if you need access.

) : ( -
- - {flow === "signUp" && ( + + + {flow === "signUp" && ( + + Name + + + )} - Name + Email - )} - - Email - - - - Password - - - {error && {error}} - - - - {!hideSignUpLink ? ( -

- {text.switchPrompt}{" "} - - {text.switchLabel} - -

- ) : null} -
- + + Password + + + {error && {error}} + + + + {!hideSignUpLink ? ( +

+ {text.switchPrompt}{" "} + + {text.switchLabel} + +

+ ) : null} +
+ )} diff --git a/apps/web/components/convex-client-provider.tsx b/apps/web/components/convex-client-provider.tsx index 932fd27..5f9416c 100644 --- a/apps/web/components/convex-client-provider.tsx +++ b/apps/web/components/convex-client-provider.tsx @@ -39,6 +39,7 @@ export function ConvexClientProvider({ }) { return ( - {children} + {children}{" "} + ) } diff --git a/apps/web/components/favorite-media-button.tsx b/apps/web/components/favorite-media-button.tsx index e475640..07f2198 100644 --- a/apps/web/components/favorite-media-button.tsx +++ b/apps/web/components/favorite-media-button.tsx @@ -29,7 +29,7 @@ export function FavoriteMediaButton({ className={cn( "rounded-full", !isFavorite && - "hover:bg-primary hover:text-primary-foreground hover:border-transparent", + "hover:border-transparent hover:bg-primary hover:text-primary-foreground", className )} aria-label={isFavorite ? favoritedLabel : unfavoritedLabel} diff --git a/apps/web/components/media-collection-footer.tsx b/apps/web/components/media-collection-footer.tsx index 75f5cd4..4bfc3ee 100644 --- a/apps/web/components/media-collection-footer.tsx +++ b/apps/web/components/media-collection-footer.tsx @@ -1,7 +1,4 @@ -import { - formatMediaSummary, - formatReleaseDate, -} from "@/lib/media-summary" +import { formatMediaSummary, formatReleaseDate } from "@/lib/media-summary" import { TRACK_ROW_PADDING } from "@/lib/selection-range-styles" export function MediaCollectionFooter({ diff --git a/apps/web/components/options-modal.tsx b/apps/web/components/options-modal.tsx index b71fad4..7d6f53a 100644 --- a/apps/web/components/options-modal.tsx +++ b/apps/web/components/options-modal.tsx @@ -1,12 +1,7 @@ "use client" import { useAction, useMutation, useQuery } from "convex/react" -import { - MoreHorizontal, - Trash2, - Upload, - UserPlus, -} from "lucide-react" +import { MoreHorizontal, Trash2, Upload, UserPlus } from "lucide-react" import { useCallback, useEffect, useRef, useState } from "react" import { toast } from "sonner" @@ -153,9 +148,7 @@ function UserAvatar({ key={user.image ?? "fallback"} size={size === "sm" ? "sm" : "default"} > - {user.image ? ( - - ) : null} + {user.image ? : null} {initials} ) @@ -691,7 +684,9 @@ function UserRowActions({ setAdmin({ userId: user._id, isAdmin: !user.isAdmin }) .then(() => toast.success( - user.isAdmin ? "Admin access removed" : "User is now admin" + user.isAdmin + ? "Admin access removed" + : "User is now admin" ) ) .catch((error: Error) => toast.error(error.message)) diff --git a/apps/web/components/playback-provider.tsx b/apps/web/components/playback-provider.tsx index 77f98a7..e6582f6 100644 --- a/apps/web/components/playback-provider.tsx +++ b/apps/web/components/playback-provider.tsx @@ -341,9 +341,7 @@ export function useIsPlaying() { export function usePlaybackProgress() { const context = useContext(PlaybackProgressContext) if (!context) { - throw new Error( - "usePlaybackProgress must be used within PlaybackProvider" - ) + throw new Error("usePlaybackProgress must be used within PlaybackProvider") } return context } @@ -366,11 +364,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { api.playback.getPlaybackState, isSignedIn ? {} : "skip" ) - const syncPlaybackStateMutation = useMutation( - api.playback.syncPlaybackState - ) + const syncPlaybackStateMutation = useMutation(api.playback.syncPlaybackState) const recordPlayMutation = useMutation(api.playback.recordPlay) - const updateSongProgressMutation = useMutation(api.playback.updateSongProgress) + const updateSongProgressMutation = useMutation( + api.playback.updateSongProgress + ) useEffect(() => { if (!isSignedIn) { @@ -478,31 +476,27 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { const isPlaybackActive = Boolean(currentSongId && isPlaying) const repeatEnabled = playback.repeatEnabled const queueLength = queueSongIds.length - const nextQueueSongId = - queueSongIds.length > 1 ? queueSongIds[1] : null + const nextQueueSongId = queueSongIds.length > 1 ? queueSongIds[1] : null const nextQueueSongDoc = useCachedQuery( api.library.getSongPlaybackInfo, nextQueueSongId ? { id: nextQueueSongId } : "skip" ) - const seekTo = useCallback( - (seconds: number) => { - const audio = audioRef.current - if (!audio) { - return - } + const seekTo = useCallback((seconds: number) => { + const audio = audioRef.current + if (!audio) { + return + } - const maxDuration = - Number.isFinite(audio.duration) && audio.duration > 0 - ? audio.duration - : durationRef.current - const clamped = Math.max(0, Math.min(seconds, maxDuration || 0)) - audio.currentTime = clamped - currentTimeRef.current = clamped - setCurrentTime(clamped) - }, - [] - ) + const maxDuration = + Number.isFinite(audio.duration) && audio.duration > 0 + ? audio.duration + : durationRef.current + const clamped = Math.max(0, Math.min(seconds, maxDuration || 0)) + audio.currentTime = clamped + currentTimeRef.current = clamped + setCurrentTime(clamped) + }, []) const saveProgress = useCallback( (seconds: number) => { @@ -955,7 +949,13 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { } const preloadAudio = preloadAudioRef.current - if (shouldContinuePlaying && preloadAudio && nextQueueSongId && user && nextQueueSongDoc) { + if ( + shouldContinuePlaying && + preloadAudio && + nextQueueSongId && + user && + nextQueueSongDoc + ) { const settings = playbackLoadSettings( user, dolbyAtmosSupported, diff --git a/apps/web/components/queue-panel.tsx b/apps/web/components/queue-panel.tsx index d2513bc..a08984b 100644 --- a/apps/web/components/queue-panel.tsx +++ b/apps/web/components/queue-panel.tsx @@ -66,7 +66,7 @@ function HistorySongRow({ song }: { song: HistorySong }) { showAlbum={false} /> - + {formatDuration(song.durationSeconds)}
@@ -218,7 +218,11 @@ export function QueuePanel() { (index) => selectableQueue[index].queueIndex ) const targetQueueIndex = selectableQueue[targetLocalIndex].queueIndex - const next = moveQueueBlock(queueSongIds, fromQueueIndices, targetQueueIndex) + const next = moveQueueBlock( + queueSongIds, + fromQueueIndices, + targetQueueIndex + ) setDragIndex(null) @@ -263,7 +267,10 @@ export function QueuePanel() { {historySongs.length > 0 ? (
    {historySongs.map((song) => ( - + ))}
) : null} diff --git a/apps/web/components/songs-view.tsx b/apps/web/components/songs-view.tsx index b0404b7..889d1e3 100644 --- a/apps/web/components/songs-view.tsx +++ b/apps/web/components/songs-view.tsx @@ -50,8 +50,7 @@ export function SongsView() { const { isSongFavorite, toggleSongFavorite } = useFavorites() const { playFromLibrarySong } = usePlaybackActions() const [sortKey, setSortKey] = useState("title") - const [sortDirection, setSortDirection] = - useState("asc") + const [sortDirection, setSortDirection] = useState("asc") const loadMoreRef = useRef(null) const { results, status, loadMore, isCached } = useCachedPaginatedQuery( diff --git a/apps/web/components/theme-provider.tsx b/apps/web/components/theme-provider.tsx index 8ccdd17..290f7f1 100644 --- a/apps/web/components/theme-provider.tsx +++ b/apps/web/components/theme-provider.tsx @@ -29,8 +29,7 @@ function ThemeFavicon() { return } - const href = - resolvedTheme === "dark" ? "/favicon-dark.png" : "/favicon.png" + const href = resolvedTheme === "dark" ? "/favicon-dark.png" : "/favicon.png" for (const rel of ["icon", "shortcut icon"] as const) { let link = document.querySelector(`link[rel="${rel}"]`) diff --git a/apps/web/components/track-row.tsx b/apps/web/components/track-row.tsx index 9cbb54a..981af93 100644 --- a/apps/web/components/track-row.tsx +++ b/apps/web/components/track-row.tsx @@ -155,7 +155,9 @@ function FavoriteStarButton({ : "text-primary hover:text-primary", className )} - aria-label={isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`} + aria-label={ + isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}` + } onClick={(event) => { event.stopPropagation() onToggle() @@ -175,7 +177,7 @@ function ExplicitBadge({ inRange }: { inRange: boolean }) { return ( +
@@ -346,10 +354,16 @@ function TrackRowComponent({ ? "text-primary-foreground hover:text-primary-foreground/80 hover:underline" : "text-muted-foreground hover:text-foreground hover:underline" content = ( -
+
{favoriteStar} - +
diff --git a/apps/web/components/ui/dropdown-menu.tsx b/apps/web/components/ui/dropdown-menu.tsx index b047bea..d3f8bac 100644 --- a/apps/web/components/ui/dropdown-menu.tsx +++ b/apps/web/components/ui/dropdown-menu.tsx @@ -43,7 +43,10 @@ function DropdownMenuContent({ data-slot="dropdown-menu-content" sideOffset={sideOffset} align={align} - className={cn("z-50 max-h-(--radix-dropdown-menu-content-available-height) w-(--radix-dropdown-menu-trigger-width) min-w-32 origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:overflow-hidden data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10!", className )} + className={cn( + "relative z-50 max-h-(--radix-dropdown-menu-content-available-height) w-(--radix-dropdown-menu-trigger-width) min-w-32 origin-(--radix-dropdown-menu-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! data-[state=closed]:overflow-hidden data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95", + className + )} {...props} /> @@ -106,8 +109,7 @@ function DropdownMenuCheckboxItem({ data-slot="dropdown-menu-checkbox-item-indicator" > - + {children} @@ -149,8 +151,7 @@ function DropdownMenuRadioItem({ data-slot="dropdown-menu-radio-item-indicator" > - + {children} @@ -244,7 +245,10 @@ function DropdownMenuSubContent({ return ( ) diff --git a/apps/web/components/ui/input-otp.tsx b/apps/web/components/ui/input-otp.tsx index 941b9d1..3a26e02 100644 --- a/apps/web/components/ui/input-otp.tsx +++ b/apps/web/components/ui/input-otp.tsx @@ -78,8 +78,7 @@ function InputOTPSeparator({ ...props }: React.ComponentProps<"div">) { role="separator" {...props} > - +
) } diff --git a/apps/web/components/ui/menubar.tsx b/apps/web/components/ui/menubar.tsx index 7a326c9..97a4cdd 100644 --- a/apps/web/components/ui/menubar.tsx +++ b/apps/web/components/ui/menubar.tsx @@ -78,7 +78,10 @@ function MenubarContent({ align={align} alignOffset={alignOffset} sideOffset={sideOffset} - className={cn("z-50 min-w-36 origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )} + className={cn( + "relative z-50 min-w-36 origin-(--radix-menubar-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95", + className + )} {...props} /> @@ -130,8 +133,7 @@ function MenubarCheckboxItem({ > - + {children} @@ -159,8 +161,7 @@ function MenubarRadioItem({ > - + {children} @@ -254,7 +255,10 @@ function MenubarSubContent({ return ( ) diff --git a/apps/web/components/ui/native-select.tsx b/apps/web/components/ui/native-select.tsx index 21c4a30..5073291 100644 --- a/apps/web/components/ui/native-select.tsx +++ b/apps/web/components/ui/native-select.tsx @@ -27,7 +27,11 @@ function NativeSelect({ className="h-8 w-full min-w-0 appearance-none rounded-lg border border-input bg-transparent py-1 pr-8 pl-2.5 text-sm transition-colors outline-none select-none selection:bg-primary selection:text-primary-foreground placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:pointer-events-none disabled:cursor-not-allowed aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] data-[size=sm]:py-0.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40" {...props} /> -
) } diff --git a/apps/web/components/ui/navigation-menu.tsx b/apps/web/components/ui/navigation-menu.tsx index 09596b1..b658642 100644 --- a/apps/web/components/ui/navigation-menu.tsx +++ b/apps/web/components/ui/navigation-menu.tsx @@ -74,7 +74,10 @@ function NavigationMenuTrigger({ {...props} > {children}{" "} -