diff --git a/src/components/Author/AuthorCard/AuthorCard.tsx b/src/components/Author/AuthorCard/AuthorCard.tsx
index 432bc5ef..62c7856b 100644
--- a/src/components/Author/AuthorCard/AuthorCard.tsx
+++ b/src/components/Author/AuthorCard/AuthorCard.tsx
@@ -97,20 +97,22 @@ export const AuthorCard = (props: Props) => {
}
})
- const followButtonText = () => {
+ const followButtonText = createMemo(() => {
if (isSubscribing()) {
return t('subscribing...')
- } else if (subscribed()) {
+ }
+
+ if (subscribed()) {
return (
<>
{t('Following')}
{t('Unfollow')}
)
- } else {
- return t('Follow')
}
- }
+
+ return t('Follow')
+ })
return (
diff --git a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
index cae2606c..eca9335a 100644
--- a/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
+++ b/src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
@@ -1,9 +1,8 @@
import { createEffect, createSignal, Show } from 'solid-js'
-import type { Editor, JSONContent } from '@tiptap/core'
+import type { Editor } from '@tiptap/core'
import { Icon } from '../../_shared/Icon'
import { InlineForm } from '../InlineForm'
import styles from './EditorFloatingMenu.module.scss'
-import HTMLParser from 'html-to-json-parser'
import { useLocalize } from '../../../context/localize'
import { Modal } from '../../Nav/Modal'
import { Menu } from './Menu'
@@ -20,10 +19,17 @@ type FloatingMenuProps = {
}
const embedData = async (data) => {
- const result = (await HTMLParser(data, false)) as JSONContent
- if ('type' in result && result.type === 'iframe') {
- return result.attributes
+ const element = document.createRange().createContextualFragment(data)
+ const { attributes } = element.firstChild as HTMLIFrameElement
+
+ const result: { src: string } = { src: '' }
+
+ for (let i = 0; i < attributes.length; i++) {
+ const attribute = attributes[i]
+ result[attribute.name] = attribute.value
}
+
+ return result
}
export const EditorFloatingMenu = (props: FloatingMenuProps) => {
@@ -39,8 +45,8 @@ export const EditorFloatingMenu = (props: FloatingMenuProps) => {
}
const validateEmbed = async (value) => {
- const iframeData = (await HTMLParser(value, false)) as JSONContent
- if (iframeData.type !== 'iframe') {
+ const element = document.createRange().createContextualFragment(value)
+ if (element.firstChild?.nodeName !== 'IFRAME') {
return t('Error')
}
}
diff --git a/src/components/Nav/Header/Header.tsx b/src/components/Nav/Header/Header.tsx
index 7dbe5026..088441a6 100644
--- a/src/components/Nav/Header/Header.tsx
+++ b/src/components/Nav/Header/Header.tsx
@@ -24,6 +24,7 @@ import { apiClient } from '../../../utils/apiClient'
import { RANDOM_TOPICS_COUNT } from '../../Views/Home'
import { Link } from './Link'
import { Subscribe } from '../../_shared/Subscribe'
+import { ShowOnlyOnClient } from '../../_shared/ShowOnlyOnClient'
type Props = {
title?: string
@@ -527,8 +528,9 @@ export const Header = (props: Props) => {
-
-
+
+
+