swipe planets with selector closed

minutelabsio · Mar 5, 2024 · e57e5ca · e57e5ca
1 parent 1b024a8
commit e57e5ca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/components/PlanetSelector.svelte b/src/components/PlanetSelector.svelte
@@ -63,6 +63,9 @@
     if (Math.abs(v) > MIN_FLICK_VEL) {
       ds = Math.max(ds, dangle * scale)
     }
+    if (!selectorOpen) {
+      ds = Math.min(ds, dangle * scale)
+    }
     // get the closest planet to end position
     const x = pos + ds * Math.sign(v)
     let i = Math.round(x / dangle / scale)
@@ -81,9 +84,16 @@
       })
 
     clearTimeout(timer)
-    timer = setTimeout(() => {
+    if (selectorOpen) {
+      timer = setTimeout(() => {
+        changePlanet(planetIndex)
+      }, time + 500)
+    } else {
       changePlanet(planetIndex)
-    }, time + 500)
+      timer = setTimeout(() => {
+        selectPlanet()
+      }, time)
+    }
   }
 
   const moveToPlanet = (name, done) => {
@@ -115,7 +125,9 @@
           clearTimeout(timer)
         },
         move(e){
-          pos += e.dx
+          if (selectorOpen) {
+            pos += e.dx
+          }
         },
         end(e){
           flick(e.velocity.x / 1000)

diff --git a/src/components/PlanetSelectorScene.svelte b/src/components/PlanetSelectorScene.svelte
@@ -53,7 +53,7 @@
       if (showAll) {
         return { scale: 1 }
       } else {
-        return { scale: 1e-10 }
+        return { scale: 1e-2 }
       }
     }),
     smoothen({ duration: '0.5s', easing: 'quadOut' })