all working

This commit is contained in:
Jade (Rose) Rowland 2024-01-08 00:15:07 -05:00
parent 1ff7548b52
commit 51dd408733
5 changed files with 50 additions and 61 deletions

View file

@ -19,7 +19,7 @@ export function Header({ context }) {
isDirty,
activeCode,
handleTogglePlay,
handleUpdate,
handleEvaluate,
handleShuffle,
handleShare,
} = context;
@ -85,7 +85,7 @@ export function Header({ context }) {
)}
</button>
<button
onClick={() => handleUpdate({})}
onClick={handleEvaluate}
title="update"
className={cx(
'flex items-center space-x-1',

View file

@ -160,38 +160,25 @@ export function Repl({ embedded = false }) {
// UI Actions
//
const handleTogglePlay = async () => editorRef.current?.toggle();
const handleTogglePlay = async () => {
editorRef.current?.toggle();
};
// payload = {reset?: boolean, code?: string, evaluate?: boolean, pattern?: string }
const handleUpdate = async (payload) => {
const { id, code } = payload;
const handleUpdate = (id, code) => {
setViewingPattern(id);
editorRef.current.setCode(code);
};
// const { reset = false, code = null, evaluate = true, pattern = null } = payload;
// if (reset) {
// clearCanvas();
// resetLoadedSounds();
// editorRef.current.repl.setCps(1);
// await prebake(); // declare default samples
// }
// if (code != null && pattern != null) {
// setViewingPattern(pattern);
// editorRef.current.setCode(code);
// }
// if (evaluate) {
// editorRef.current.evaluate();
// }
const handleEvaluate = () => {
editorRef.current.evaluate();
};
const handleShuffle = async () => {
// window.postMessage('strudel-shuffle');
const { code, name } = getRandomTune();
logger(`[repl] ✨ loading random tune "${name}"`);
setActivePattern(name);
setViewingPattern(name);
clearCanvas();
resetLoadedSounds();
editorRef.current.repl.setCps(1);
await prebake(); // declare default samples
editorRef.current.setCode(code);
editorRef.current.repl.evaluate(code);
@ -208,6 +195,7 @@ export function Repl({ embedded = false }) {
handleUpdate,
handleShuffle,
handleShare,
handleEvaluate,
};
return (

View file

@ -30,7 +30,7 @@ function PatternButton({ showOutline, onClick, label, showHiglight }) {
);
}
function PatternButtons({ patterns, activePattern, onClick, viewingPattern, isExample = false }) {
function PatternButtons({ patterns, activePattern, onClick, viewingPattern, started }) {
return (
<div className="font-mono text-sm">
{Object.entries(patterns).map(([id]) => (
@ -38,8 +38,8 @@ function PatternButtons({ patterns, activePattern, onClick, viewingPattern, isEx
key={id}
label={id}
showHiglight={id === viewingPattern}
showOutline={id === activePattern}
onClick={() => onClick(id, isExample)}
showOutline={id === activePattern && started}
onClick={() => onClick(id)}
/>
))}
</div>
@ -51,11 +51,10 @@ export function PatternsTab({ context }) {
const examplePatterns = useMemo(() => examplePattern.getAll(), []);
const activePattern = useActivePattern();
const viewingPattern = useViewingPattern();
const updateCodeWindow = (id, code) => {
context.handleUpdate({ code, id, evaluate: false });
context.handleUpdate(id, code);
};
const onPatternBtnClick = (id, isExample) => {
const onPatternBtnClick = (id, isExample = false) => {
const code = isExample ? examplePatterns[id].code : userPatterns[id].code;
// display selected pattern code in the window
@ -80,16 +79,12 @@ export function PatternsTab({ context }) {
title="Rename"
>
<PencilSquareIcon className="w-5 h-5" />
{/* <PencilIcon className="w-5 h-5" /> */}
</button>
)}
<button
className="hover:opacity-50"
onClick={() => {
const { id, data } = userPattern.duplicate(
viewingPattern,
userPatterns[viewingPattern]?.code ?? examplePatterns[viewingPattern]?.code,
);
const { id, data } = userPattern.duplicate(viewingPattern);
updateCodeWindow(id, data.code);
}}
title="Duplicate"
@ -101,7 +96,6 @@ export function PatternsTab({ context }) {
className="hover:opacity-50"
onClick={() => {
const { id, data } = userPattern.delete(viewingPattern);
console.log({ id, data });
updateCodeWindow(id, data.code);
}}
title="Delete"
@ -115,6 +109,7 @@ export function PatternsTab({ context }) {
<PatternButtons
onClick={onPatternBtnClick}
patterns={userPatterns}
started={context.started}
activePattern={activePattern}
viewingPattern={viewingPattern}
/>
@ -155,8 +150,8 @@ export function PatternsTab({ context }) {
<section>
<h2 className="text-xl mb-2">Examples</h2>
<PatternButtons
isExample={true}
onClick={onPatternBtnClick}
onClick={(id) => onPatternBtnClick(id, true)}
started={context.started}
patterns={examplePatterns}
activePattern={activePattern}
viewingPattern={viewingPattern}