Skip to content

Fixing deprecated zustand imports & implementation, subsequently storing events in props.events #10

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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
22 changes: 11 additions & 11 deletions dsp/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Renderer, el} from '@elemaudio/core';
import {RefMap} from './RefMap';
import { Renderer, el } from '@elemaudio/core';
import { RefMap } from './RefMap';
import srvb from './srvb';


Expand Down Expand Up @@ -36,19 +36,19 @@ globalThis.__receiveStateChange__ = (serializedState) => {
let stats = core.render(...srvb({
key: 'srvb',
sampleRate: state.sampleRate,
size: refs.getOrCreate('size', 'const', {value: state.size}, []),
decay: refs.getOrCreate('decay', 'const', {value: state.decay}, []),
mod: refs.getOrCreate('mod', 'const', {value: state.mod}, []),
mix: refs.getOrCreate('mix', 'const', {value: state.mix}, []),
}, el.in({channel: 0}), el.in({channel: 1})));
size: refs.getOrCreate('size', 'const', { value: state.size }, []),
decay: refs.getOrCreate('decay', 'const', { value: state.decay }, []),
mod: refs.getOrCreate('mod', 'const', { value: state.mod }, []),
mix: refs.getOrCreate('mix', 'const', { value: state.mix }, []),
}, el.in({ channel: 0 }), el.in({ channel: 1 })));

console.log(stats);
} else {
console.log('Updating refs');
refs.update('size', {value: state.size});
refs.update('decay', {value: state.decay});
refs.update('mod', {value: state.mod});
refs.update('mix', {value: state.mix});
refs.update('size', { value: state.size });
refs.update('decay', { value: state.decay });
refs.update('mod', { value: state.mod });
refs.update('mix', { value: state.mix });
}

prevState = state;
Expand Down
26 changes: 15 additions & 11 deletions src/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@ import React from 'react'
import ReactDOM from 'react-dom/client'
import Interface from './Interface.jsx'

import createHooks from 'zustand'
import createStore from 'zustand/vanilla'
import { useStore } from 'zustand'
import { createStore } from 'zustand/vanilla'

import './index.css'


// Initial state management
const store = createStore(() => {});
const useStore = createHooks(store);

const store = createStore(() => { });
const eventStore = createStore(() => { });
const errorStore = createStore(() => ({ error: null }));
const useErrorStore = createHooks(errorStore);

// Interop bindings
function requestParamValueUpdate(paramId, value) {
Expand All @@ -35,12 +33,16 @@ if (process.env.NODE_ENV !== 'production') {
});
}

globalThis.__receiveStateChange__ = function(state) {
globalThis.__receiveStateChange__ = function (state) {
store.setState(JSON.parse(state));
};

globalThis.__receiveGraphEvents__ = function(eventBatch) {
console.log(JSON.parse(eventBatch));
globalThis.__receiveGraphEvents__ = function (eventBatch) {
const batch = JSON.parse(eventBatch);
if (batch.length > 0) {
const map = batch.reduce((acc, event) => { acc[event.event.source] = event; return acc; }, {});
eventStore.setState(map);
}
};

globalThis.__receiveError__ = (err) => {
Expand All @@ -49,12 +51,14 @@ globalThis.__receiveError__ = (err) => {

// Mount the interface
function App(props) {
let state = useStore();
let {error} = useErrorStore();
let state = useStore(store);
let events = useStore(eventStore);
let { error } = useStore(errorStore);

return (
<Interface
{...state}
events={events}
error={error}
requestParamValueUpdate={requestParamValueUpdate}
resetErrorState={() => errorStore.setState({ error: null })} />
Expand Down