From f73e8f395995336efcd720d450c936dfe85d09da Mon Sep 17 00:00:00 2001
From: Robert Kossessa <github@kosro.de>
Date: Wed, 24 Jan 2024 03:32:30 +0100
Subject: [PATCH] =?UTF-8?q?FIX:=20ScrambleText=20bug=20IT=20IS=20SO=20SATI?=
 =?UTF-8?q?SFYING=20=F0=9F=98=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ConfigPane.vue               |  7 +--
 src/components/ConfigSelect.vue             |  3 +-
 src/components/Navbar.vue                   | 13 +++-
 src/components/ProfileManager.vue           |  6 +-
 src/components/device-gui/DevicePreview.vue |  5 +-
 src/components/effects/ScrambleText.vue     | 68 +++++++++++++--------
 6 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/src/components/ConfigPane.vue b/src/components/ConfigPane.vue
index 7a825d6..64cc030 100644
--- a/src/components/ConfigPane.vue
+++ b/src/components/ConfigPane.vue
@@ -1,14 +1,13 @@
 <template>
   <div>
     <div
-      class="px-6 h-20 flex items-center bg-zinc-900 bg-opacity-40"
-      @mouseenter="$refs.configPaneTitle.scramble(0.15, 100)">
+      class="px-6 h-20 flex items-center bg-zinc-900 bg-opacity-40">
       <div>
         <h1 class="text-lg">
-          <ScrambleText ref="configPaneTitle" class="align-middle" :text="$t(`config_options.${page}.title`)" />
+          <ScrambleText class="align-middle" :text="$t(`config_options.${page}.title`)" />
         </h1>
         <p class="text-xs text-muted-foreground">
-          {{ $t(`config_options.${page}.subtitle`) }}
+          <ScrambleText class="align-middle" :text="$t(`config_options.${page}.subtitle`)" :replace-interval="5" />
         </p>
       </div>
     </div>
diff --git a/src/components/ConfigSelect.vue b/src/components/ConfigSelect.vue
index d1c876d..78ccf5f 100644
--- a/src/components/ConfigSelect.vue
+++ b/src/components/ConfigSelect.vue
@@ -6,8 +6,7 @@
       :data-selected="current_tab===config.id"
       class="px-4 h-20 flex items-center hover:bg-zinc-900 data-[selected=true]:bg-zinc-200 data-[selected=true]:text-black border-solid border-0 border-b"
       :class="config.disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
-      @click="current_tab=config.disabled ? current_tab : config.id; $refs.configSelect[index].scramble()"
-      @mouseenter="$refs.configSelect[index].scramble(0.15, 100)">
+      @click="current_tab=config.disabled ? current_tab : config.id; $refs.configSelect[index].scramble()">
       <div>
         <h1 class="text-lg" :class="{'text-muted-foreground': config.disabled}">
           <ScrambleText ref="configSelect" class="align-middle" :text="$t(`config_options.${config.id}.title`)" />
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 43aa600..57d8f9f 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -1,9 +1,15 @@
 <template>
   <div class="flex">
     <Menubar class="w-full h-20 rounded-none bg-zinc-950 border-l-0">
-      <div class="p-2">
-        <h1 class="text-3xl">ZERO/ONE</h1>
-        <p class="text-xs text-muted-foreground">Haptic Configuration Tool</p>
+      <div class="p-2 min-w-48">
+        <h1 class="text-3xl">
+          <ScrambleText
+            text="ZERO/ONE" scramble-on-mount :scramble-amount="1" :fill-interval="100"
+            :replace-interval="100" />
+        </h1>
+        <p class="text-xs text-muted-foreground">
+          <ScrambleText  text="Haptic Configuration Tool" scramble-on-mount scramble-amount="1" fill-interval="35" replace-interval="40" />
+        </p>
       </div>
       <MenubarMenu>
         <MenubarTrigger v-t="'navbar.device.title'" />
@@ -42,4 +48,5 @@ import {
   MenubarTrigger,
   MenubarContent,
 } from '@/components/ui/menubar/index.js'
+import ScrambleText from '@/components/effects/ScrambleText.vue'
 </script>
\ No newline at end of file
diff --git a/src/components/ProfileManager.vue b/src/components/ProfileManager.vue
index d3178eb..83fa605 100644
--- a/src/components/ProfileManager.vue
+++ b/src/components/ProfileManager.vue
@@ -1,11 +1,10 @@
 <template>
   <div>
     <div
-      class="px-4 h-20 flex items-center"
-      @mouseenter="$refs.configPaneTitle.scramble(0.15, 100)">
+      class="px-4 h-20 flex items-center">
       <div>
         <h1 class="text-lg">
-          <ScrambleText ref="configPaneTitle" class="align-middle" :text="$t(`profiles.title`)" />
+          {{ $t(`profiles.title`) }}
         </h1>
         <p class="text-xs text-muted-foreground">
           {{ $t(`profiles.subtitle`) }}
@@ -36,7 +35,6 @@
 <script setup>
 import SchemaTest from '@/components/SchemaTest.vue'
 import { Separator } from '@/components/ui/separator/index.js'
-import ScrambleText from '@/components/effects/ScrambleText.vue'
 import {
   Command,
   CommandEmpty,
diff --git a/src/components/device-gui/DevicePreview.vue b/src/components/device-gui/DevicePreview.vue
index 32888f1..8f89233 100644
--- a/src/components/device-gui/DevicePreview.vue
+++ b/src/components/device-gui/DevicePreview.vue
@@ -3,7 +3,7 @@
     <div>
       <div class="px-4 py-5">
         <h1 class="text-lg">
-          <ScrambleReveal :text="$t('preview.title')" />
+          {{ $t('preview.title')}}
         </h1>
       </div>
       <div class="flex justify-center">
@@ -37,13 +37,12 @@
   </div>
 </template>
 <script>
-import ScrambleReveal from '@/components/effects/ScrambleText.vue'
 import axios from 'axios'
 import DeviceBar from '@/components/device-gui/DeviceBar.vue'
 
 export default {
   name: 'DevicePreview',
-  components: { DeviceBar, ScrambleReveal },
+  components: { DeviceBar },
   data() {
     return {
       profiles: [],
diff --git a/src/components/effects/ScrambleText.vue b/src/components/effects/ScrambleText.vue
index 485e53a..7d31c01 100644
--- a/src/components/effects/ScrambleText.vue
+++ b/src/components/effects/ScrambleText.vue
@@ -26,24 +26,52 @@ const props = defineProps({
     type: Number,
     default: 15,
   },
+  scrambleOnMount: {
+    type: Boolean,
+    default: false,
+  },
 })
 
-let scrambling = false
-
 const content = ref('')
 
 function randomCharacter(characterSet = props.characterSet) {
   return props.characterSet.charAt(Math.floor(Math.random() * characterSet.length))
 }
 
-function scramble(scrambleAmount = props.scrambleAmount, replaceInterval = props.replaceInterval, fillInterval = props.fillInterval, characterSet = props.characterSet, text = props.text) {
-  if (scrambling) return
-  scrambling = true
+function replaceContent(text = props.text, replaceInterval = props.replaceInterval, steps = 0) {
+  if (steps > text.length + 16) {
+    content.value = text
+  }
+  console.log('hey')
+  if (content.value !== text) {
+    // get all the indices of characters that don't match text
+    const indices = []
+    for (let i = 0; i < text.length; i++) {
+      if (content.value.charAt(i) !== text.charAt(i)) {
+        indices.push(i)
+      }
+    }
+    if (indices.length > 0) {
+      const index = indices[Math.floor(Math.random() * indices.length)]
+      content.value = content.value.substring(0, index) + text.charAt(index) + content.value.substring(index + 1)
+    } else if (content.value.length < text.length) {
+      content.value += text.charAt(content.value.length)
+    } else {
+      content.value = content.value.substring(0, content.value.length - 1)
+    }
+    setTimeout(() => {
+      replaceContent(text, replaceInterval, steps + 1)
+    }, replaceInterval * (1 + Math.random()))
+  }
+}
+
+function scramble(scrambleAmount = props.scrambleAmount, replaceInterval = props.replaceInterval, fillInterval = props.fillInterval, characterSet = props.characterSet, text = props.text, fillText = props.text) {
   content.value = ''
   const fillContent = function() {
     if (content.value.length < text.length) {
-      if (Math.random() > scrambleAmount) {
-        content.value += text.charAt(content.value.length)
+      const char = fillText.charAt(content.value.length) || ''
+      if (char === ' ' || Math.random() > scrambleAmount) {
+        content.value += char
       } else {
         content.value += randomCharacter(characterSet)
       }
@@ -51,23 +79,7 @@ function scramble(scrambleAmount = props.scrambleAmount, replaceInterval = props
         setTimeout(fillContent, fillInterval)
       else fillContent()
     } else {
-      const replaceContent = function() {
-        if (content.value !== text) {
-          // get all the indices of characters that don't match text
-          const indices = []
-          for (let i = 0; i < content.value.length; i++) {
-            if (content.value.charAt(i) !== text.charAt(i)) {
-              indices.push(i)
-            }
-          }
-          const index = indices[Math.floor(Math.random() * indices.length)]
-          content.value = content.value.substring(0, index) + text.charAt(index) + content.value.substring(index + 1)
-          setTimeout(replaceContent, replaceInterval * (1 + Math.random()))
-        } else {
-          scrambling = false
-        }
-      }
-      replaceContent()
+      replaceContent(text, replaceInterval, 0)
     }
   }
   fillContent()
@@ -76,11 +88,15 @@ function scramble(scrambleAmount = props.scrambleAmount, replaceInterval = props
 defineExpose({ scramble })
 
 onMounted(() => {
-  scramble()
+  if (props.scrambleOnMount) {
+    scramble()
+  } else {
+    content.value = props.text
+  }
 })
 
 watch(() => props.text, () => {
-  scramble()
+  replaceContent()
 })
 </script>