Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Change table to definition list in MetadataTable #774

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] Change table to definition list in MetadataTable #774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Change table to definition list in MetadataTable 
This begins the process of switching MetadataTable to use definition
lists rather than tables.
  • Loading branch information
@jwhitley
jwhitley committed Apr 29, 2023
commit 57f77c0a631dd0c33c9108155b7389b9179276a7
102 changes: 50 additions & 52 deletions src/components/Item/MetadataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,58 +142,56 @@ export const MetadataTable = Preact.memo(function MetadataTable({
if (!metadata || !order || order.length === 0) return null;

return (
<table className={c('meta-table')}>
<tbody>
{order.map((k) => {
const data = metadata[k];
return (
<tr key={k} className={c('meta-row')}>
{!data.shouldHideLabel && (
<td
className={`${c('meta-key')} ${
(data.label || k).toLocaleLowerCase().contains(searchQuery)
? 'is-search-match'
: ''
}`}
data-key={k}
>
<span>{data.label || k}</span>
</td>
)}
<td
colSpan={data.shouldHideLabel ? 2 : 1}
className={c('meta-value-wrapper')}
data-value={
Array.isArray(data.value)
? data.value.join(', ')
: `${data.value}`
}
<dl className={c('meta-table')}>
{order.map((k) => {
const data = metadata[k];
return (
<Preact.Fragment key={k}>
{!data.shouldHideLabel && (
<dt
className={`${c('meta-key')} ${
(data.label || k).toLocaleLowerCase().contains(searchQuery)
? 'is-search-match'
: ''
}`}
data-key={k}
>
{k === 'tags' ? (
(data.value as string[]).map((tag, i) => {
return (
<a
href={tag}
key={i}
className={`tag ${c('item-tag')} ${
tag.toLocaleLowerCase().contains(searchQuery)
? 'is-search-match'
: ''
}`}
>
<span>{tag[0]}</span>
{tag.slice(1)}
</a>
);
})
) : (
<MetadataValue data={data} searchQuery={searchQuery} />
)}
</td>
</tr>
);
})}
</tbody>
</table>
<span>{data.label || k}</span>
</dt>
)}
<dd
colSpan={data.shouldHideLabel ? 2 : 1}
className={c('meta-value-wrapper')}
data-value={
Array.isArray(data.value)
? data.value.join(', ')
: `${data.value}`
}
>
{k === 'tags' ? (
(data.value as string[]).map((tag, i) => {
return (
<a
href={tag}
key={i}
className={`tag ${c('item-tag')} ${
tag.toLocaleLowerCase().contains(searchQuery)
? 'is-search-match'
: ''
}`}
>
<span>{tag[0]}</span>
{tag.slice(1)}
</a>
);
})
) : (
<MetadataValue data={data} searchQuery={searchQuery} />
)}
</dd>
</Preact.Fragment>
);
})}
</dl>
);
});