mirror of
https://github.com/He4eT/elseifplayer.git
synced 2026-05-05 01:17:22 +00:00
GridBuffer: deduplicate empty lines
This commit is contained in:
parent
a3fdb236d2
commit
ae4bdf5983
3 changed files with 19 additions and 11 deletions
|
|
@ -44,22 +44,27 @@ export default function GridBuffer ({ inbox, currentWindow }) {
|
||||||
const rawMessagesContent =
|
const rawMessagesContent =
|
||||||
rawMessages
|
rawMessages
|
||||||
.map((x) => x.content)
|
.map((x) => x.content)
|
||||||
.map(([x]) => x)
|
.flat()
|
||||||
.map(({ text }) => text)
|
.map((message) => ({
|
||||||
.map((text) => text.trim())
|
...message,
|
||||||
|
text: message.text.trim(),
|
||||||
|
}))
|
||||||
|
|
||||||
const isEmpty =
|
const isEmpty =
|
||||||
rawMessagesContent
|
rawMessagesContent
|
||||||
.map((text) => text.length)
|
.map(({text}) => text.length)
|
||||||
.every((l) => l === 0)
|
.every((l) => l === 0)
|
||||||
|
|
||||||
|
const getGridStyle = ({style}) => {
|
||||||
|
if (['alert', 'normal'].includes(style)) return 'grid'
|
||||||
|
else return style || 'grid'
|
||||||
|
}
|
||||||
|
|
||||||
const messages =
|
const messages =
|
||||||
rawMessagesContent
|
rawMessagesContent
|
||||||
.map((text) =>
|
.map((message) => ({
|
||||||
text.replace(' ', ' / '))
|
style: getGridStyle(message),
|
||||||
.map((text) => ({
|
text: message.text.replace(' ', ' / '),
|
||||||
style: 'grid',
|
|
||||||
text,
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
setMessages(isEmpty ? [] : messages)
|
setMessages(isEmpty ? [] : messages)
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ export default function TextMessage ({ style, text }) {
|
||||||
</span>)
|
</span>)
|
||||||
|
|
||||||
return ({
|
return ({
|
||||||
grid: (<div>{text} </div>),
|
grid: (text?.length > 0 ? <div>{text}</div> : <br />),
|
||||||
input: (<span className='message input'>> {text}</span>),
|
input: (<span className='message input'>> {text}</span>),
|
||||||
subheader: (<strong className='message subheader'>{text}</strong>),
|
subheader: (<strong className='message subheader'>{text}</strong>),
|
||||||
emphasized: (<em className='message emphasized'>{text}</em>),
|
emphasized: (<em className='message emphasized'>{text}</em>),
|
||||||
|
|
|
||||||
|
|
@ -84,8 +84,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.ifplayer .output .textBuffer > br:first-child,
|
.ifplayer .output .textBuffer > br:first-child,
|
||||||
|
.ifplayer .output .gridBuffer > br:first-child,
|
||||||
.ifplayer .output .textBuffer > br:last-child,
|
.ifplayer .output .textBuffer > br:last-child,
|
||||||
.ifplayer .output .textBuffer > br + br + br {
|
.ifplayer .output .gridBuffer > br:last-child,
|
||||||
|
.ifplayer .output .textBuffer > br + br + br,
|
||||||
|
.ifplayer .output .gridBuffer > br + br + br {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue