Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

replace dangerously-set-html-content with local component

Blue Mousead84dbc92072
diff --git a/web/app/components/DangerouslySetInnerHTML.tsx b/web/app/components/DangerouslySetInnerHTML.tsx
new file mode 100644
index 000000000..0440b2e1c
--- /dev/null
+++ b/web/app/components/DangerouslySetInnerHTML.tsx
@@ -0,0 +1,30 @@
+import { useRef, useEffect, createElement } from 'react'
+
+interface DangerouslySetHtmlContentProps extends React.HTMLAttributes<HTMLDivElement> {
+ html: string
+ allowRerender?: boolean
+}
+
+export const DangerouslySetHtmlContent = ({
+ html,
+ // eslint-disable-next-line unused-imports/no-unused-vars
+ dangerouslySetInnerHTML,
+ allowRerender,
+ ...rest
+}: DangerouslySetHtmlContentProps) => {
+ // We remove 'dangerouslySetInnerHTML' from props passed to the div
+ const divRef = useRef<HTMLDivElement>(null)
+ const isFirstRender = useRef(true)
+
+ useEffect(() => {
+ if (!html || !divRef.current) throw new Error("html prop can't be null")
+ if (!isFirstRender.current) return
+ isFirstRender.current = Boolean(allowRerender)
+
+ const slotHtml = document.createRange().createContextualFragment(html) // Create a 'tiny' document and parse the html string
+ divRef.current.innerHTML = '' // Clear the container
+ divRef.current.appendChild(slotHtml) // Append the new content
+ }, [html, divRef, allowRerender])
+
+ return createElement('div', { ...rest, ref: divRef })
+}
diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsx
index 6be14c0b4..a2db804ba 100644
--- a/web/app/pages/Project/View/Panels.tsx
+++ b/web/app/pages/Project/View/Panels.tsx
@@ -3,7 +3,6 @@ import { ChevronRightIcon } from '@heroicons/react/24/outline'
import { ArrowLongRightIcon, ArrowLongLeftIcon } from '@heroicons/react/24/solid'
import { useVirtualizer, type VirtualItem } from '@tanstack/react-virtual'
import cx from 'clsx'
-import InnerHTML from 'dangerously-set-html-content'
import _ceil from 'lodash/ceil'
import _find from 'lodash/find'
import _floor from 'lodash/floor'
@@ -25,6 +24,7 @@ import React, { memo, useState, useEffect, useMemo, Fragment, useRef } from 'rea
import { useTranslation } from 'react-i18next'
import { Link, LinkProps, useNavigate } from 'react-router'
+import { DangerouslySetHtmlContent } from '~/components/DangerouslySetInnerHTML'
import { PROJECT_TABS } from '~/lib/constants'
import { Entry } from '~/lib/models/Entry'
import Button from '~/ui/Button'
@@ -152,7 +152,7 @@ const PanelContainer = ({
// Using this instead of dangerouslySetInnerHTML to support script tags
return (
<ExtensionErrorBoundary extensionID={extensionID}>
- <InnerHTML className='absolute overflow-auto' html={tabContent || ''} />
+ <DangerouslySetHtmlContent className='absolute overflow-auto' html={tabContent || ''} />
</ExtensionErrorBoundary>
)
}
diff --git a/web/package-lock.json b/web/package-lock.json
index d3c85e6fc..a0a01314f 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -25,7 +25,6 @@
"clsx": "^2.1.1",
"d3": "^7.9.0",
"d3-scale": "^4.0.2",
- "dangerously-set-html-content": "^1.1.0",
"dayjs": "^1.11.18",
"eslint-import-resolver-typescript": "^4.4.4",
"file-saver": "^2.0.5",
@@ -5580,17 +5579,6 @@
"integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
"dev": true
},
- "node_modules/dangerously-set-html-content": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/dangerously-set-html-content/-/dangerously-set-html-content-1.1.0.tgz",
- "integrity": "sha512-kUHpnYZ9EgT6BKUEgrgccg17Pa0YdI9MlWdDYeu49HIXYONCxZpKr6Tj24q+LwFmbmtL3IJ1Rvj+aaTTzFOepg==",
- "engines": {
- "node": ">=10"
- },
- "peerDependencies": {
- "react": "^18.2.0"
- }
- },
"node_modules/data-view-buffer": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
diff --git a/web/package.json b/web/package.json
index 2cda9db45..f4c8961c1 100644
--- a/web/package.json
+++ b/web/package.json
@@ -39,7 +39,6 @@
"clsx": "^2.1.1",
"d3": "^7.9.0",
"d3-scale": "^4.0.2",
- "dangerously-set-html-content": "^1.1.0",
"dayjs": "^1.11.18",
"eslint-import-resolver-typescript": "^4.4.4",
"file-saver": "^2.0.5",