Apply filter context in compact status too
This commit is contained in:
parent
5c9a47c31e
commit
3e1b9ff53d
|
@ -569,8 +569,15 @@
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|
||||||
|
&.horizontal {
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
.status-filtered-badge.badge-meta {
|
}
|
||||||
|
.status-filtered-badge:not(.horizontal).badge-meta {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -584,10 +591,10 @@
|
||||||
border-color: var(--text-color);
|
border-color: var(--text-color);
|
||||||
background: var(--bg-color);
|
background: var(--bg-color);
|
||||||
}
|
}
|
||||||
.status-filtered-badge.badge-meta > span:first-child {
|
.status-filtered-badge:not(.horizontal).badge-meta > span:first-child {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.status-filtered-badge.badge-meta > span + span {
|
.status-filtered-badge:not(.horizontal).badge-meta > span + span {
|
||||||
display: block;
|
display: block;
|
||||||
font-size: 9px;
|
font-size: 9px;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
@ -601,6 +608,10 @@
|
||||||
left: 0;
|
left: 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
.status-filtered-badge.horizontal.badge-meta > span + span {
|
||||||
|
font-weight: normal;
|
||||||
|
text-transform: none;
|
||||||
|
}
|
||||||
|
|
||||||
.status.large > .container > .content-container {
|
.status.large > .container > .content-container {
|
||||||
margin-left: calc(-50px - 16px);
|
margin-left: calc(-50px - 16px);
|
||||||
|
|
|
@ -646,7 +646,11 @@ const TimelineItem = memo(
|
||||||
>
|
>
|
||||||
<Link class="status-link timeline-item" to={url}>
|
<Link class="status-link timeline-item" to={url}>
|
||||||
{showCompact ? (
|
{showCompact ? (
|
||||||
<TimelineStatusCompact status={item} instance={instance} />
|
<TimelineStatusCompact
|
||||||
|
status={item}
|
||||||
|
instance={instance}
|
||||||
|
filterContext={filterContext}
|
||||||
|
/>
|
||||||
) : useItemID ? (
|
) : useItemID ? (
|
||||||
<Status
|
<Status
|
||||||
statusID={statusID}
|
statusID={statusID}
|
||||||
|
@ -820,11 +824,12 @@ function StatusCarousel({ title, class: className, children }) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function TimelineStatusCompact({ status, instance }) {
|
function TimelineStatusCompact({ status, instance, filterContext }) {
|
||||||
const snapStates = useSnapshot(states);
|
const snapStates = useSnapshot(states);
|
||||||
const { id, visibility, language } = status;
|
const { id, visibility, language } = status;
|
||||||
const statusPeekText = statusPeek(status);
|
const statusPeekText = statusPeek(status);
|
||||||
const sKey = statusKey(id, instance);
|
const sKey = statusKey(id, instance);
|
||||||
|
const filterInfo = isFiltered(status.filtered, filterContext);
|
||||||
return (
|
return (
|
||||||
<article
|
<article
|
||||||
class={`status compact-thread ${
|
class={`status compact-thread ${
|
||||||
|
@ -850,6 +855,15 @@ function TimelineStatusCompact({ status, instance }) {
|
||||||
lang={language}
|
lang={language}
|
||||||
dir="auto"
|
dir="auto"
|
||||||
>
|
>
|
||||||
|
{!!filterInfo ? (
|
||||||
|
<b
|
||||||
|
class="status-filtered-badge badge-meta horizontal"
|
||||||
|
title={filterInfo?.titlesStr || ''}
|
||||||
|
>
|
||||||
|
<span>Filtered</span>: <span>{filterInfo?.titlesStr || ''}</span>
|
||||||
|
</b>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
{statusPeekText}
|
{statusPeekText}
|
||||||
{status.sensitive && status.spoilerText && (
|
{status.sensitive && status.spoilerText && (
|
||||||
<>
|
<>
|
||||||
|
@ -859,6 +873,8 @@ function TimelineStatusCompact({ status, instance }) {
|
||||||
</span>
|
</span>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue