Skip to content

Commit aeaf3e3

Browse files
committed
Fix Source Column issues
1 parent 453ce19 commit aeaf3e3

File tree

2 files changed

+28
-17
lines changed

2 files changed

+28
-17
lines changed

src/components/Row.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const Row = ({ children, href, activeSegments, isActiveOverride, loading, ...pro
7272
)}
7373
{isPending && <div className="bg-relisten-600/30 w-2 animate-pulse" />}
7474

75-
{!isPending && isActive && <div className="bg-relisten-600 w-2" />}
75+
{!isPending && isActive && <div className="bg-relisten-600 w-2 min-w-2" />}
7676
<Flex className="w-full flex-1 items-center justify-between p-1 leading-tight">
7777
{children}
7878
</Flex>

src/components/TapesColumn.tsx

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ import React from 'react';
44

55
import { durationToHHMMSS } from '../lib/utils';
66

7+
import { sourceSearchParamsLoader } from '@/lib/searchParams/sourceSearchParam';
78
import { Source } from '../types';
89
import Column from './Column';
910
import Flex from './Flex';
1011
import Row from './Row';
1112
import RowHeader from './RowHeader';
1213
import { Props, useSourceData } from './SongsColumn';
1314
import Tag from './Tag';
14-
import { useSearchParams } from 'next/navigation';
15-
import { sourceSearchParamsLoader } from '@/lib/searchParams/sourceSearchParam';
1615

1716
const exists = (str = ''): boolean => {
1817
return !!str && !/unknown/i.test(str);
@@ -46,7 +45,7 @@ const TapesColumn = (props: Props) => {
4645
href={`/${artistSlug}/${year}/${month}/${day}?source=${sourceObj.id}`}
4746
isActiveOverride={activeSourceId === sourceObj?.id}
4847
>
49-
<div>
48+
<div className="w-full">
5049
<Flex className="mb-1">
5150
<div className="min-w-[53px]">{durationToHHMMSS(sourceObj.duration)}</div>
5251
{sourceObj.is_soundboard && <Tag>SBD</Tag>}
@@ -57,10 +56,10 @@ const TapesColumn = (props: Props) => {
5756
</Flex>
5857
{Number(sourceObj?.avg_rating) > 0 && (
5958
<Flex className="py-1 text-xs">
60-
<div className="min-w-[48px] pr-2 text-[#696969]">
59+
<div className="min-w-[48px] pr-2 text-foreground-muted whitespace-nowrap">
6160
{artistSlug === 'phish' ? 'Dot Net' : 'Rating'}:
6261
</div>{' '}
63-
<div>
62+
<div className="truncate">
6463
{Number(sourceObj.avg_rating).toFixed(2)} /{' '}
6564
{sourceObj.num_ratings || sourceObj.num_reviews}{' '}
6665
{pluralize('rating', sourceObj?.num_ratings || sourceObj?.num_reviews || 0)}
@@ -69,37 +68,49 @@ const TapesColumn = (props: Props) => {
6968
)}
7069
{exists(sourceObj.taper) && (
7170
<Flex className="py-1 text-xs">
72-
<div className="min-w-[48px] pr-2 text-[#696969]">Taper:</div>{' '}
73-
<div>{sourceObj.taper}</div>
71+
<div className="min-w-[48px] pr-2 text-foreground-muted whitespace-nowrap">
72+
Taper:
73+
</div>{' '}
74+
<div className="truncate">{sourceObj.taper}</div>
7475
</Flex>
7576
)}
7677
{exists(sourceObj.transferrer) && (
7778
<Flex className="py-1 text-xs">
78-
<div className="min-w-[48px] pr-2 text-[#696969]">Transferrer:</div>{' '}
79-
<div>{sourceObj.transferrer}</div>
79+
<div className="min-w-[48px] pr-2 text-foreground-muted whitespace-nowrap">
80+
Transferrer:
81+
</div>{' '}
82+
<div className="truncate">{sourceObj.transferrer}</div>
8083
</Flex>
8184
)}
8285
{exists(sourceObj.upstream_identifier) && (
8386
<Flex className="py-1 text-xs">
84-
<div className="min-w-[48px] pr-2 text-[#696969]">SHNID:</div>{' '}
85-
<div>{sourceObj.upstream_identifier}</div>
87+
<div className="min-w-[48px] pr-2 text-foreground-muted whitespace-nowrap">
88+
SHNID:
89+
</div>{' '}
90+
<div className="truncate">{sourceObj.upstream_identifier}</div>
8691
</Flex>
8792
)}
8893
{exists(sourceObj.source) && (
8994
<Flex className="py-1 text-xs">
90-
<div className="min-w-[48px] pr-2 text-[#696969]">Source:</div>{' '}
91-
<div>{sourceObj.source}</div>
95+
<div className="min-w-[48px] pr-2 text-foreground-muted whitespace-nowrap">
96+
Source:
97+
</div>{' '}
98+
<div className="truncate">{sourceObj.source}</div>
9299
</Flex>
93100
)}
94101
{exists(sourceObj.lineage) && (
95102
<Flex className="py-1 text-xs">
96-
<div className="min-w-[48px] pr-2 text-[#696969]">Lineage:</div>{' '}
97-
<div>{sourceObj.lineage}</div>
103+
<div className="min-w-[48px] pr-2 text-foreground-muted whitespace-nowrap">
104+
Lineage:
105+
</div>{' '}
106+
<div className="truncate">{sourceObj.lineage}</div>
98107
</Flex>
99108
)}
100109
{exists(sourceObj.taper_notes) && (
101110
<Flex className="py-1 text-xs">
102-
<div className="min-w-[48px] pr-2 text-[#696969]">Taper Notes:</div>{' '}
111+
<div className="min-w-[48px] pr-2 text-foreground-muted whitespace-nowrap">
112+
Taper Notes:
113+
</div>{' '}
103114
<TaperNotes notes={sourceObj.taper_notes} />
104115
</Flex>
105116
)}

0 commit comments

Comments
 (0)