Skip to content
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
1 change: 1 addition & 0 deletions components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ ${error.stack}
}}
generatedCodeConfig={settings.generatedCodeConfig}
history={history}
fixBug={fixBug}
/>
{/* <Preview code={generatedCode} device="desktop" appState={appState} fixBug={fixBug}/> */}
</TabsContent>
Expand Down
4 changes: 2 additions & 2 deletions components/components/OutputSettingsSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function generateDisplayComponent(config: GeneratedCodeConfig) {
return (
<div>
<span className="font-semibold">HTML</span> +{" "}
<span className="font-semibold">Tailwind</span>
<span className="font-semibold">Tailwind 🔥</span>
</div>
);
case GeneratedCodeConfig.REACT_NATIVE:
Expand All @@ -27,7 +27,7 @@ function generateDisplayComponent(config: GeneratedCodeConfig) {
return (
<div>
<span className="font-semibold">React</span> +{" "}
<span className="font-semibold">Tailwind</span>
<span className="font-semibold">Tailwind 🔥</span>
</div>
);
case GeneratedCodeConfig.BOOTSTRAP:
Expand Down
62 changes: 59 additions & 3 deletions engine/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import useThrottle from "../components/hooks/useThrottle";
import {setHtmlCodeUid} from '../components/compiler';
import html2canvas from "html2canvas";
import {HistoryContext} from '../components/contexts/HistoryContext';
import {
FaBug
} from "react-icons/fa";

const editor = new Editor();
globalContext.register(editor, Editor);
Expand Down Expand Up @@ -39,12 +42,21 @@ interface Props {
appState: AppState;
sendMessageChange: (e: any) => void;
history: any;
generatedCodeConfig: GeneratedCodeConfig
generatedCodeConfig: GeneratedCodeConfig,
fixBug: (error: {
message: string;
stack: string;
}) => void;
}

export default function PreviewBox({ code, appState, sendMessageChange, history, generatedCodeConfig }: Props) {
export default function PreviewBox({ code, appState, sendMessageChange, history, generatedCodeConfig, fixBug }: Props) {
const throttledCode = useThrottle(code, 500);
const {updateHistoryScreenshot} = useContext(HistoryContext);
const [showDebug, setShowDebug] = useState<boolean>(false);
const [errorObj, setErrorObj] = useState({
message: '',
stack: ''
});

const onIframeLoad = async () => {
const img = await takeScreenshot();
Expand All @@ -66,12 +78,45 @@ export default function PreviewBox({ code, appState, sendMessageChange, history,
useEffect(() => {
if (appState === AppState.CODE_READY) {
const codeUid = setHtmlCodeUid(generatedCodeConfig, code);
designer.project.simulator?.writeIframeDocument(codeUid);
const errorIframe = `
<script>
window.addEventListener('error', (event) => {
window.parent.postMessage({
message: event.message,
error: event.error
}, '*')
})
</script>
`;
let content = '';
var patternHead = /<title[^>]*>((.|[\n\r])*)<\/title>/im; //匹配header
const headMatch = codeUid.match(patternHead);
if (headMatch) {
const headContent = headMatch[0] + errorIframe;
content = codeUid.replace(patternHead, headContent);
}
designer.project.simulator?.writeIframeDocument(content || codeUid);
} else {
// designer.project.simulator?.writeIframeDocument(throttledCode);
}
}, [code, appState]);

useEffect(() => {
const messageHandler = (e: any) => {
if (e.data && e.data.error) {
setErrorObj({
message: e.data.error.message,
stack: e.data.error.stack
});
setShowDebug(true);
}
}
window.addEventListener('message', messageHandler);
return () => {
window.removeEventListener('message', messageHandler);
}
}, [])

const takeScreenshot = async (): Promise<string> => {
const body = designer.project.simulator?.contentWindow?.document.body;
if (!body) {
Expand All @@ -85,6 +130,17 @@ export default function PreviewBox({ code, appState, sendMessageChange, history,

return (
<div className="border-[4px] border-black rounded-[20px] shadow-lg w-full h-full">
{
showDebug && (
<span
onClick={() => {
fixBug(errorObj);
}}
className='text-red-600 absolute right-14 top-16 z-[50] hover:bg-slate-200 rounded-sm p-2'>
<FaBug />
</span>
)
}
<DesignerView
editor={editor}
designer={editor.get('designer')}
Expand Down