Skip to content

feat: add support for mixed html/js content #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/components/Editor.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { useRef, useEffect } from 'react';
import 'codemirror/mode/javascript/javascript';
import 'codemirror/mode/xml/xml';
import 'codemirror/mode/css/css';
import 'codemirror/mode/htmlmixed/htmlmixed';
import 'codemirror/addon/edit/closetag';
import 'codemirror/addon/fold/xml-fold';
import 'codemirror/addon/scroll/simplescrollbars';
Expand All @@ -27,6 +29,11 @@ const options = {
mode: { name: 'text/html', multilineTagIndentPastTag: false },
},

htmlmixed: {
...baseOptions,
mode: { name: 'htmlmixed' },
},

javascript: {
...baseOptions,
mode: 'javascript',
Expand Down
2 changes: 1 addition & 1 deletion src/components/MarkupEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function MarkupEditor({ markup, dispatch }) {
<div className="h-full w-full flex flex-col">
<div className="markup-editor flex-auto relative overflow-hidden">
<Editor
mode="html"
mode="htmlmixed"
initialValue={markup}
onLoad={onLoad}
onChange={onChange}
Expand Down
62 changes: 60 additions & 2 deletions src/components/Preview.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect, useRef } from 'react';
import React, { useState, useEffect, useRef, useMemo } from 'react';
import Scrollable from './Scrollable';
import PreviewHint from './PreviewHint';
import AddHtml from './AddHtml';
Expand All @@ -25,6 +25,7 @@ function Preview({ markup, accessibleRoles, elements, dispatch }) {
// Indicating that the `parsed` element can be highlighted again.
const [highlighted, setHighlighted] = useState(false);
const [roles, setRoles] = useState([]);
const [scripts, setScripts] = useState([]);
const htmlRoot = useRef();

const { suggestion } = getQueryAdvise({
Expand All @@ -34,6 +35,61 @@ function Preview({ markup, accessibleRoles, elements, dispatch }) {

// TestingLibraryDom?.getSuggestedQuery(highlighted, 'get').toString() : null

useEffect(() => {
const container = document.createElement('div');
container.innerHTML = markup;
const scriptsCollections = container.getElementsByTagName('script');
const jsScripts = Array.from(scriptsCollections).filter(
(script) => script.type === 'text/javascript' || script.type === '',
);
setScripts((scripts) => [
...scripts.filter((script) =>
jsScripts
.map((jsScript) => jsScript.innerHTML)
.includes(script.innerHTML),
),
...jsScripts
.filter(
(jsScript) =>
!scripts
.map((script) => script.innerHTML)
.includes(jsScript.innerHTML),
)
.map((jsScript) => ({
scriptCode: jsScript.innerHTML,
toBeRemoved: jsScript.outerHTML,
evaluated: false,
})),
]);
}, [markup, setScripts]);

const actualMarkup = useMemo(
() =>
scripts.length
? scripts.reduce(
(html, script) => html.replace(script.toBeRemoved, ''),
markup,
)
: markup,
[scripts, markup],
);

useEffect(() => {
if (htmlRoot.current && highlighted) {
scripts
.filter((script) => !script.evaluated)
.forEach((script) => {
try {
script.evaluated = true;
const executeScript = new Function(script.scriptCode);
executeScript();
} catch (e) {
alert('Failing script inserted in markup!');
}
});
}
}, [highlighted, scripts, htmlRoot.current]);

useEffect(() => {
setRoles(Object.keys(accessibleRoles || {}).sort());
}, [accessibleRoles]);
Expand Down Expand Up @@ -98,7 +154,9 @@ function Preview({ markup, accessibleRoles, elements, dispatch }) {
onClick={handleClick}
onMouseMove={handleMove}
ref={htmlRoot}
dangerouslySetInnerHTML={{ __html: markup }}
dangerouslySetInnerHTML={{
__html: actualMarkup,
}}
/>
</Scrollable>
</div>
Expand Down