From 57bc0b70321d86bd674f7dc8af277d87872acc4f Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Fri, 29 Dec 2023 01:07:11 +0100 Subject: [PATCH] cleanup --- website/src/repl/Repl.jsx | 56 +++++++++----------------- website/src/repl/panel/Panel.jsx | 2 +- website/src/repl/panel/SettingsTab.jsx | 18 --------- 3 files changed, 20 insertions(+), 56 deletions(-) diff --git a/website/src/repl/Repl.jsx b/website/src/repl/Repl.jsx index 0ab201a1..44903267 100644 --- a/website/src/repl/Repl.jsx +++ b/website/src/repl/Repl.jsx @@ -9,8 +9,6 @@ import cx from '@src/cx.mjs'; import { transpiler } from '@strudel.cycles/transpiler'; import { getAudioContext, initAudioOnFirstClick, webaudioOutput } from '@strudel.cycles/webaudio'; import { StrudelMirror, defaultSettings } from '@strudel/codemirror'; -/* import { writeText } from '@tauri-apps/api/clipboard'; -import { nanoid } from 'nanoid'; */ import { createContext, useCallback, useEffect, useRef, useState } from 'react'; import { initUserCode, @@ -24,10 +22,10 @@ import { Header } from './Header'; import Loader from './Loader'; import './Repl.css'; import { Panel } from './panel/Panel'; -// import { prebake } from '@strudel/repl'; import { useStore } from '@nanostores/react'; -import { prebake /* , resetSounds */ } from './prebake.mjs'; +import { prebake } from './prebake.mjs'; import { getRandomTune, initCode, loadModules, shareCode } from './util.mjs'; +import PlayCircleIcon from '@heroicons/react/20/solid/PlayCircleIcon'; import './Repl.css'; const { code: randomTune, name } = getRandomTune(); @@ -35,36 +33,30 @@ export const ReplContext = createContext(null); const { latestCode } = settingsMap.get(); -let modulesLoading, presets, drawContext, clearCanvas; +let modulesLoading, presets, drawContext, clearCanvas, isIframe; if (typeof window !== 'undefined') { initAudioOnFirstClick(); modulesLoading = loadModules(); presets = prebake(); drawContext = getDrawContext(); clearCanvas = () => drawContext.clearRect(0, 0, drawContext.canvas.height, drawContext.canvas.width); + isIframe = window.location !== window.parent.location; } export function Repl({ embedded = false }) { - //const isEmbedded = embedded || window.location !== window.parent.location; - const isEmbedded = false; + const isEmbedded = embedded || isIframe; const { panelPosition, isZen } = useSettings(); - /* const replState = useStore($replstate); - const isDirty = useStore($repldirty); */ - const shouldDraw = true; - const init = useCallback(({ shouldDraw }) => { + const init = useCallback(() => { const drawTime = [-2, 2]; - const drawContext = shouldDraw ? getDrawContext() : null; - let onDraw; - if (shouldDraw) { - onDraw = (haps, time, frame, painters) => { - painters.length && drawContext.clearRect(0, 0, drawContext.canvas.width * 2, drawContext.canvas.height * 2); - painters?.forEach((painter) => { - // ctx time haps drawTime paintOptions - painter(drawContext, time, haps, drawTime, { clear: false }); - }); - }; - } + const drawContext = getDrawContext(); + const onDraw = (haps, time, frame, painters) => { + painters.length && drawContext.clearRect(0, 0, drawContext.canvas.width * 2, drawContext.canvas.height * 2); + painters?.forEach((painter) => { + // ctx time haps drawTime paintOptions + painter(drawContext, time, haps, drawTime, { clear: false }); + }); + }; const editor = new StrudelMirror({ defaultOutput: webaudioOutput, getTime: () => getAudioContext().currentTime, @@ -97,7 +89,7 @@ export function Repl({ embedded = false }) { } else if (latestCode) { editor.setCode(latestCode); msg = `Your last session has been loaded!`; - } /* if(randomTune) */ else { + } else { editor.setCode(randomTune); msg = `A random code snippet named "${name}" has been loaded!`; } @@ -159,11 +151,8 @@ export function Repl({ embedded = false }) { const handleShare = async () => shareCode(activeCode); const pending = false; - //const error = undefined; - // const { started, activeCode } = replState; const context = { - // scheduler, embedded, started, pending, @@ -176,18 +165,11 @@ export function Repl({ embedded = false }) { }; return ( - // bg-gradient-to-t from-blue-900 to-slate-900 - // bg-gradient-to-t from-green-900 to-slate-900 -
+
- {/* isEmbedded && !started && ( + {isEmbedded && !started && ( - ) */} + )}
{ containerRef.current = el; if (!editorRef.current) { - init({ shouldDraw }); + init(); } }} >
diff --git a/website/src/repl/panel/Panel.jsx b/website/src/repl/panel/Panel.jsx index 8d824d26..eac31720 100644 --- a/website/src/repl/panel/Panel.jsx +++ b/website/src/repl/panel/Panel.jsx @@ -114,7 +114,7 @@ export function Panel({ context }) { {activeFooter === 'console' && } {activeFooter === 'sounds' && } {activeFooter === 'reference' && } - {activeFooter === 'settings' && } + {activeFooter === 'settings' && } {activeFooter === 'files' && }
diff --git a/website/src/repl/panel/SettingsTab.jsx b/website/src/repl/panel/SettingsTab.jsx index 3f66e2ae..4807e70a 100644 --- a/website/src/repl/panel/SettingsTab.jsx +++ b/website/src/repl/panel/SettingsTab.jsx @@ -89,24 +89,6 @@ export function SettingsTab() { return (
- {/* -
- - -
-
*/} settingsMap.setKey('theme', theme)} />