diff --git a/main.ts b/main.ts index 89d87e8..8dacdc4 100644 --- a/main.ts +++ b/main.ts @@ -36,13 +36,12 @@ const sketch = (s: p5) => { s.mousePressed = () => { const { currentScene, companionState, infoMessageShown } = store.getState(); - if (companionState === CompanionState.ACTIVE) return; - if (infoMessageShown) return; - - if (currentScene === Scenes.OVERVIEW) { - overviewScene.onSceneClick(); - } else if (currentScene === Scenes.DETAIL) { - detailScene.onSceneClick(); + if (companionState !== CompanionState.ACTIVE || !infoMessageShown) { + if (currentScene === Scenes.OVERVIEW) { + overviewScene.onSceneClick(); + } else if (currentScene === Scenes.DETAIL) { + detailScene.onSceneClick(); + } } }; }; diff --git a/src/store.ts b/src/store.ts index 3c20ebf..d10ae4a 100644 --- a/src/store.ts +++ b/src/store.ts @@ -5,7 +5,6 @@ import { CompanionMessage, CompanionState } from './ui/companion'; import project from '../metadata/project.json'; import { InfoMessageType } from './ui/info'; import { RevealableInterface, RevealableTypes } from './sketchObjects/Revealable'; -import { SubProject } from './types'; import { getRevealablesforSubproject } from './helpers'; export interface State {