mirror of
https://github.com/He4eT/elseifplayer.git
synced 2026-05-04 17:07: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 =
|
||||
rawMessages
|
||||
.map((x) => x.content)
|
||||
.map(([x]) => x)
|
||||
.map(({ text }) => text)
|
||||
.map((text) => text.trim())
|
||||
.flat()
|
||||
.map((message) => ({
|
||||
...message,
|
||||
text: message.text.trim(),
|
||||
}))
|
||||
|
||||
const isEmpty =
|
||||
rawMessagesContent
|
||||
.map((text) => text.length)
|
||||
.map(({text}) => text.length)
|
||||
.every((l) => l === 0)
|
||||
|
||||
const getGridStyle = ({style}) => {
|
||||
if (['alert', 'normal'].includes(style)) return 'grid'
|
||||
else return style || 'grid'
|
||||
}
|
||||
|
||||
const messages =
|
||||
rawMessagesContent
|
||||
.map((text) =>
|
||||
text.replace(' ', ' / '))
|
||||
.map((text) => ({
|
||||
style: 'grid',
|
||||
text,
|
||||
.map((message) => ({
|
||||
style: getGridStyle(message),
|
||||
text: message.text.replace(' ', ' / '),
|
||||
}))
|
||||
|
||||
setMessages(isEmpty ? [] : messages)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ export default function TextMessage ({ style, text }) {
|
|||
</span>)
|
||||
|
||||
return ({
|
||||
grid: (<div>{text} </div>),
|
||||
grid: (text?.length > 0 ? <div>{text}</div> : <br />),
|
||||
input: (<span className='message input'>> {text}</span>),
|
||||
subheader: (<strong className='message subheader'>{text}</strong>),
|
||||
emphasized: (<em className='message emphasized'>{text}</em>),
|
||||
|
|
|
|||
|
|
@ -84,8 +84,11 @@
|
|||
}
|
||||
|
||||
.ifplayer .output .textBuffer > br:first-child,
|
||||
.ifplayer .output .gridBuffer > br:first-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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue