sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix infinite loop

Browse source
This commit is contained in:
Henry Jameson 2021-06-11 11:05:28 +03:00 committed by Sam Therapy
parent 2b41b8f6f5
commit 1c657b86b8
Signed by: sam
GPG key ID: 4D8B07C18F31ACBD
2 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/rich_content/rich_content.jsx
View file

@ -42,7 +42,7 @@ export default Vue.component('RichContent', {
// NEVER EVER TOUCH DATA INSIDE RENDER
render (h) {
// Pre-process HTML
const { newHtml: html, lastMentions } = preProcessPerLine(this.html, this.greentext, this.hideLastMentions)
const { newHtml: html, lastMentions } = preProcessPerLine(this.html, this.greentext, this.hideMentions)
const firstMentions = [] // Mentions that appear in the beginning of post body
const lastTags = [] // Tags that appear at the end of post body
const writtenMentions = [] // All mentions that appear in post body
@ -187,6 +187,13 @@ export default Vue.component('RichContent', {
return item
}
// DO NOT USE SLOTS they cause a re-render feedback loop here.
// slots updated -> rerender -> emit -> update up the tree -> rerender -> ...
// at least until vue3?
const result = <span class="RichContent">
{ convertHtmlToTree(html).map(processItem).reverse().map(processItemReverse).reverse() }
</span>
const event = {
firstMentions,
lastMentions,
@ -195,12 +202,6 @@ export default Vue.component('RichContent', {
writtenTags
}
const result = <span class="RichContent">
{ this.$slots.prefix }
{ convertHtmlToTree(html).map(processItem).reverse().map(processItemReverse).reverse() }
{ this.$slots.suffix }
</span>
// DO NOT MOVE TO UPDATE. BAD IDEA.
this.$emit('parseReady', event)

25
src/components/status_body/status_body.vue
View file

@ -38,10 +38,11 @@
>
{{ $t("general.show_more") }}
</button>
<span
class="text-wrapper"
v-if="!hideSubjectStatus && !(singleLine && status.summary_html)"
>
<span v-if="!hideSubjectStatus && !(singleLine && status.summary_html)">
<MentionsLine
v-if="!hideMentions && firstMentions && firstMentions.length > 0"
:mentions="firstMentions"
/>
<RichContent
:class="{ '-single-line': singleLine }"
class="text media-body"
@ -53,19 +54,11 @@
@parseReady="setHeadTailLinks"
ref="text"
>
<template v-slot:prefix>
<MentionsLine
v-if="!hideMentions && firstMentions && firstMentions.length > 0"
:mentions="firstMentions"
/>
</template>
<template v-slot:suffix>
<MentionsLine
v-if="!hideMentions && lastMentions.length > 0 && firstMentions.length === 0"
:mentions="lastMentions"
/>
</template>
</RichContent>
<MentionsLine
v-if="!hideMentions && lastMentions.length > 0 && firstMentions.length === 0"
:mentions="lastMentions"
/>
</span>
<button