Fix context menu popping up when right-clicking ADSR ramp handles

* Swap out all ramp curve types to be bezier curve for the default composition
Ameobea · Jan 12, 2025 · 3d8d6df · 3d8d6df
1 parent 5e82fe8
commit 3d8d6df
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/src/controls/adsr2/ConfigureRampControlPanel.svelte b/src/controls/adsr2/ConfigureRampControlPanel.svelte
@@ -35,7 +35,12 @@
   const handleChange = (key: string, val: any) => state.update(s => ({ ...s, [key]: val }));
 </script>
 
-<div class="adsr2-configure-ramp-control-panel" style="top:{top}px; left:{left}px;">
+<!-- svelte-ignore a11y-no-static-element-interactions -->
+<div
+  class="adsr2-configure-ramp-control-panel"
+  style="top:{top}px; left:{left}px;"
+  on:contextmenu={e => e.preventDefault()}
+>
   <SvelteControlPanel
     {settings}
     state={$state}

diff --git a/src/controls/adsr2/ConfigureStepControlPanel.svelte b/src/controls/adsr2/ConfigureStepControlPanel.svelte
@@ -83,7 +83,12 @@
   };
 </script>
 
-<div class="adsr2-configure-step-control-panel" style="top:{top}px; left:{left}px;">
+<!-- svelte-ignore a11y-no-static-element-interactions -->
+<div
+  class="adsr2-configure-step-control-panel"
+  style="top:{top}px; left:{left}px;"
+  on:contextmenu={e => e.preventDefault()}
+>
   <SvelteControlPanel
     {settings}
     {state}

diff --git a/src/controls/adsr2/adsr2.tsx b/src/controls/adsr2/adsr2.tsx
@@ -377,6 +377,7 @@ class RampHandle {
 
       if (evt.nativeEvent.button !== 0 || isDoubleClick) {
         this.toggleConfigurator(evt.x, evt.y);
+        return;
       }
 
       this.dragData = evt;

diff --git a/src/fmSynth/FMSynthUI.tsx b/src/fmSynth/FMSynthUI.tsx
@@ -688,7 +688,7 @@ const ConnectedFMSynthUIInner: React.FC<ConnectedFMSynthUIProps> = ({
         },
         [synth]
       )}
-      adsrs={synth.getAdsrs()}
+      adsrs={dbg(synth.getAdsrs())}
       onAdsrChange={useCallback(
         (adsrIx: number, newAdsr: AdsrParams) => synth.handleAdsrChange(adsrIx, newAdsr),
         [synth]

diff --git a/src/index.tsx b/src/index.tsx
@@ -66,7 +66,7 @@ const createGlobalUI = (engine: typeof import('./engine')) => {
   }
 };
 
-if (typeof AudioWorkletNode === 'undefined') {
+if (typeof WebAssembly === 'undefined' || typeof AudioWorkletNode === 'undefined') {
   createBrowserNotSupportedMessage();
 } else {
   initSentry();

diff --git a/src/init-composition.json b/src/init-composition.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -377,6 +377,7 @@ class RampHandle { @@
           if (evt.nativeEvent.button !== 0 || isDoubleClick) {
             this.toggleConfigurator(evt.x, evt.y);
+            return;
           }
           this.dragData = evt;
@@ Expand Down @@