Merge pull request #206 from Suwayomi/main

remove the jank right arrow stuff on quick menu

src/routes/QuickSearchModal.svelte

@@ -118,7 +118,7 @@
 	$: $category, $categories, value, doCategory();
 	$: $sources, value, doSource();
 
-	function doCategory() {
+	async function doCategory() {
 		if (value.startsWith('#')) {
 			const parsed = value.slice(1).split(/[/:]/);
 			const categorySearch: string | undefined = parsed[0];
@@ -132,16 +132,41 @@
 				| undefined = undefined;
 			let includeChapters: ResultOf<typeof ChapterTypeFragment>[] | undefined =
 				undefined;
-			if (mangaSearch && includeCategory?.[0]) {
+			if (mangaSearch !== undefined && includeCategory?.[0]) {
 				catId = includeCategory[0].id;
-				includeMangas = $category?.data?.category?.mangas.nodes.filter((e) =>
-					e.title.toLowerCase().includes(mangaSearch.toLowerCase())
-				);
-				if (chapterNameSearch && includeMangas?.[0]) {
+				includeMangas = await new Promise((resolve) => {
+					window.requestAnimationFrame(() => {
+						let unSub = () => {};
+						unSub = category.subscribe((ee) => {
+							if (ee?.data?.category?.mangas?.nodes) {
+								unSub();
+								resolve(
+									ee.data.category.mangas.nodes.filter((e) =>
+										e.title.toLowerCase().includes(mangaSearch.toLowerCase())
+									)
+								);
+							}
+						});
+					});
+				});
+
+				if (chapterNameSearch !== undefined && includeMangas?.[0]) {
 					mangaId = includeMangas[0].id;
-					includeChapters = $manga?.data?.manga?.chapters.nodes?.filter((e) =>
-						e.name.toLowerCase().includes(chapterNameSearch.toLowerCase())
-					);
+					includeChapters = await new Promise((resolve) => {
+						let unSub = () => {};
+						unSub = manga.subscribe((ee) => {
+							if (ee?.data?.manga?.chapters?.nodes) {
+								unSub();
+								resolve(
+									ee.data.manga.chapters.nodes.filter((e) =>
+										e.name
+											.toLowerCase()
+											.includes(chapterNameSearch.toLowerCase())
+									)
+								);
+							}
+						});
+					});
 				}
 			}
 
@@ -256,40 +281,6 @@
 			previous.focus();
 			return;
 		}
-		if (event.key === 'ArrowRight') {
-			let selectEnd = inputEl?.selectionEnd;
-			if (selectEnd === value.length) {
-				let SelectedItem: item;
-				if (inputElement) {
-					SelectedItem = items[0];
-				} else {
-					const tabElements = [...document.querySelectorAll('.tabindex')] as (
-						| HTMLInputElement
-						| HTMLAnchorElement
-					)[];
-					const index = tabElements.findIndex(
-						(e) => e === document.activeElement
-					);
-					SelectedItem = items[index];
-				}
-				if ('str' in SelectedItem) {
-					if (!value.includes(SelectedItem.str)) {
-						value += SelectedItem.str;
-					}
-				} else if ('firstLineBoldText' in SelectedItem) {
-					if (!value.includes(SelectedItem.firstLineBoldText)) {
-						value += SelectedItem.firstLineBoldText;
-					}
-				} else if (!value.includes(SelectedItem.firstLine)) {
-					value += SelectedItem.firstLine;
-				}
-				(
-					document.querySelector('.tabindex') as
-						| HTMLInputElement
-						| HTMLAnchorElement
-				).focus();
-			}
-		}
 	}
 
 	$: if (catId !== undefined)

svelte.config.js

@@ -15,7 +15,7 @@ const config = {
 		adapter: adapter({
 			pages: 'build',
 			assets: 'build',
-			fallback: '404.html',
+			fallback: 'index.html',
 			precompress: false
 		})
 	}

versionToServerVersionMapping.json

@@ -5,7 +5,7 @@
 	},
 	{
 		"tag": "v1.1.0",
-		"uiVersion": "r1042",
+		"uiVersion": "r1067",
 		"serverVersion": "r1502",
 		"comment": "the server version is between 1.0.0 and 1.1.0 release",
 		"comment2": "because its the preview version that implemented the breaking changes"