Backport improved suggestions & scroll into view

Kenny-Hui · Aug 10, 2024 · 78d1e75 · 78d1e75
1 parent f3b9891
commit 78d1e75
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/src/components/layout/FileEntry.svelte b/src/components/layout/FileEntry.svelte
@@ -6,6 +6,7 @@
     import { projects, selectedFile, selectedUnit } from '../../stores/data';
     import { forEachBlocking, getUnit } from '../../../lib/util';
     import Tooltip from '../shared/Tooltip.svelte';
+    import { onMount } from 'svelte';
 
     export let file: TranslationFile;
     $: canShowSource = $preferences.langSelect.displayMode == 'src' || $preferences.langSelect.displayMode == 'both';
@@ -62,9 +63,15 @@
     $: if($selectedFile && file) checkTranslatedUnits();
 
     $: percentage = totalUnit == 0 ? 1 : (translatedUnit / totalUnit);
+
+    let btn;
+
+    onMount(() => {
+        if($selectedFile === file) btn.scrollIntoView(false);  // Ensure visible
+    });
 </script>
 
-<button on:click={() => select()} on:keydown={() => select()} class:selected={$selectedFile === file}>
+<button bind:this={btn} on:click={() => select()} on:keydown={() => select()} class:selected={$selectedFile === file}>
     <div>
         {#if canShowSource}
             {getLangName(displayFileName, file.sourceLanguage)}

diff --git a/src/components/layout/editor/listing/UnitRow.svelte b/src/components/layout/editor/listing/UnitRow.svelte
@@ -8,6 +8,7 @@
     import { DialogProperty } from "../../../../utils/types";
     import MoveUnitDialog from "../../../overlay/dialogs/MoveUnitDialog.svelte";
     import { findGroup } from "../../../../../lib/util";
+    import { onMount } from "svelte";
     export let unit: Unit;
 
     function openMoveDialog() {
@@ -29,9 +30,15 @@
         }
         $selectedFile = $selectedFile;
     }
+
+    let btn;
+
+    onMount(() => {
+        if($selectedUnit === unit) btn.scrollIntoView(false);  // Ensure visible
+    });
 </script>
 
-<button class="container" class:active={$selectedUnit == unit} on:click={() => $selectedUnit = unit}>
+<button bind:this={btn} class="container" class:active={$selectedUnit == unit} on:click={() => $selectedUnit = unit}>
     <div class="translate-status">
         <Tooltip tooltip="{unit.target == "" ? "Not " : ""}Translated">
             <span class="status" class:translated={unit.target != ""}></span>

diff --git a/src/components/layout/editor/subpane/SuggestionPane.svelte b/src/components/layout/editor/subpane/SuggestionPane.svelte
@@ -60,23 +60,15 @@
     }
 
     function sortSuggestions(arr: any[]) {
-        // Speghetti code, don't ask me why this works, I tried reworking it but it no work.
+        let targetLanguage = selectedFile.targetLanguage ?? selectedFile.sourceLanguage;
         arr.sort((a, b) => {
-            let targetLanguage = selectedFile.targetLanguage ?? selectedFile.sourceLanguage;
-            let point = 0;
-            let aMatchedPath = a.unit.getFullPathStr() == $selectedUnit.getFullPathStr() ? -1 : 0;
-            let bMatchedPath = b.unit.getFullPathStr() == $selectedUnit.getFullPathStr() ? 1 : 0;
-            let aMatchedId = a.unit.id == $selectedUnit.id ? -1 : 0;
-            let bMatchedId = b.unit.id == $selectedUnit.id ? 1 : 0;
-
-            let aSameLangGroup = a.lang.targetLanguage == null ? 0 : a.lang.targetLanguage.split("-")[0] == targetLanguage.split("-")[0] ? -1 : 0;
+            let aSamePath = a.unit.getFullPathStr() == $selectedUnit.getFullPathStr() ? 1 : 0;
+            let bSamePath = b.unit.getFullPathStr() == $selectedUnit.getFullPathStr() ? 1 : 0;
+            let aSameLang = a.lang?.targetLanguage == targetLanguage ? 1 : 0;
+            let bSameLang = b.lang?.targetLanguage == targetLanguage ? 1 : 0;
+            let aSameLangGroup = a.lang.targetLanguage == null ? 0 : a.lang.targetLanguage.split("-")[0] == targetLanguage.split("-")[0] ? 1 : 0;
             let bSameLangGroup = b.lang.targetLanguage == null ? 0 : b.lang.targetLanguage.split("-")[0] == targetLanguage.split("-")[0] ? 1 : 0;
-
-            point += b.match > a.match ? 1 : b.match == a.match ? 0 : -1;
-            point += aSameLangGroup + bSameLangGroup + aMatchedId + bMatchedId + aMatchedPath + bMatchedPath;
-            point += ((a.lang.targetLanguage != null && b.lang.targetLanguage != null) && a.lang.targetLanguage.split("-")[0] == b.lang.targetLanguage.split("-")[0]) ? 1 : 0; // Match primary subtag
-
-            return point;
+            return (bSameLang - aSameLang) || (bSameLangGroup - aSameLangGroup) || (bSamePath - aSamePath) || (b.match - a.match);
         });
     }
 

diff --git a/src/stores/constants.ts b/src/stores/constants.ts
@@ -1,4 +1,4 @@
-const VERSION = "0.4.1";
+const VERSION = "0.4.2";
 
 export default {
     VERSION: VERSION