WIP filters
This commit is contained in:
parent
ab2709afd0
commit
75fdfffe35
2 changed files with 2 additions and 17 deletions
|
@ -204,21 +204,6 @@ const Status: React.FC<IStatus> = (props) => {
|
|||
);
|
||||
}
|
||||
|
||||
if (status.filtered || actualStatus.filtered) {
|
||||
const minHandlers = muted ? undefined : {
|
||||
moveUp: handleHotkeyMoveUp,
|
||||
moveDown: handleHotkeyMoveDown,
|
||||
};
|
||||
|
||||
return (
|
||||
<HotKeys handlers={minHandlers}>
|
||||
<div className={classNames('status__wrapper', 'status__wrapper--filtered', { focusable })} tabIndex={focusable ? 0 : undefined} ref={node}>
|
||||
<FormattedMessage id='status.filtered' defaultMessage='Filtered' />
|
||||
</div>
|
||||
</HotKeys>
|
||||
);
|
||||
}
|
||||
|
||||
let quote;
|
||||
|
||||
if (actualStatus.quote) {
|
||||
|
@ -343,7 +328,7 @@ const Status: React.FC<IStatus> = (props) => {
|
|||
<StatusContent
|
||||
status={actualStatus}
|
||||
onClick={handleClick}
|
||||
expanded={!actualStatus.hidden}
|
||||
expanded={!actualStatus.hidden && !actualStatus.filtered}
|
||||
onExpandedToggle={handleExpandedToggle}
|
||||
collapsable
|
||||
/>
|
||||
|
|
|
@ -227,7 +227,7 @@ const StatusContent: React.FC<IStatusContent> = ({ status, expanded = false, onE
|
|||
directionStyle.direction = 'rtl';
|
||||
}
|
||||
|
||||
if (status.spoiler_text.length > 0) {
|
||||
if (status.spoiler_text.length > 0 || status.filtered) {
|
||||
return (
|
||||
<div className={className} ref={node} tabIndex={0} style={directionStyle} onMouseDown={handleMouseDown} onMouseUp={handleMouseUp}>
|
||||
<p style={{ marginBottom: isHidden && status.mentions.isEmpty() ? 0 : undefined }}>
|
||||
|
|
Loading…
Reference in a new issue