Merge 2.2.2

Author: lighttigerXIV

src/install-cli/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "install"
-version = "2.2.1"
+version = "2.2.2"
 edition = "2021"
 
 

src/install-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uninstall"
-version = "2.2.1"
+version = "2.2.2"
 edition = "2021"
 
 

src/install-cli/files/linux/binaries/whiskers-launcher

@@ -1,6 +1,6 @@
 {
   "name": "whiskers-launcher-companion",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "private": true,
   "scripts": {
     "dev": "vite dev",

src/install-cli/files/linux/binaries/whiskers-launcher-companion

@@ -1,6 +1,6 @@
 [package]
 name = "whiskers-launcher-companion"
-version = "2.2.1"
+version = "2.2.2"
 description = "Whiskers Launcher companion"
 authors = ["Whiskers-Apps", "lighttigerXIV"]
 license = "MIT"

src/install-cli/files/windows/binaries/whiskers-launcher-companion.exe

@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "whiskers-launcher-companion",
-    "version": "2.2.1"
+    "version": "2.2.2"
   },
   "tauri": {
     "allowlist": {

src/install-cli/files/windows/binaries/whiskers-launcher.exe

@@ -1,6 +1,6 @@
 {
   "name": "whiskers",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "private": true,
   "scripts": {
     "dev": "vite dev",

src/uninstall-cli/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "2.2.1"
+version = "2.2.2"
 description = "A Tauri App"
 authors = ["Whiskers Apps"]
 license = "MIT"

src/uninstall-cli/Cargo.toml

@@ -8,7 +8,7 @@
 	},
 	"package": {
 		"productName": "whiskers-launcher",
-		"version": "2.2.1"
+		"version": "2.2.2"
 	},
 	"tauri": {
 		"allowlist": {

src/whiskers-launcher-companion/package.json

@@ -3,9 +3,31 @@
 	import SearchIcon from '$lib/icons/search.svg?component';
 	import { convertFileSrc } from '@tauri-apps/api/tauri';
 	import { onMount } from 'svelte';
-	import { getColorFilter, getIconPath, init, onBlur, onOpenSettings, onRunAction, onSearchInput, onSetSelectedIndex, state } from './search-vm';
+	import {
+		displayedResults,
+		getColorFilter,
+		getIconPath,
+		init,
+		onBlur,
+		onOpenSettings,
+		onRunAction,
+		onSearchInput,
+		onSetSelectedIndex,
+		resultOffset,
+		results,
+		searchText,
+		selectedIndex,
+		showConfirmationBox,
+		state
+	} from './search-vm';
 
 	$: uiState = $state;
+	$: resultsState = $results;
+	$: displayedResultsState = $displayedResults;
+	$: resultsOffsetState = $resultOffset;
+	$: selectedIndexState = $selectedIndex;
+	$: searchTextState = $searchText;
+	$: showConfirmationBoxState = $showConfirmationBox;
 
 	onMount(async () => {
 		init();
@@ -36,7 +58,7 @@
 						class=" w-full outline-none flex-grow bg-transparent search-text"
 						type="text"
 						placeholder={uiState.settings.show_placeholder ? 'Search apps, extensions, web' : ''}
-						value={uiState.searchText}
+						value={searchTextState}
 						on:input={onSearchInput}
 						autofocus
 					/>
@@ -58,15 +80,15 @@
 				{/if}
 
 				<div
-					class={`overflow-hidden ${uiState.settings.split_results ? ` bg-background search-round  ${uiState.displayedResults.length > 0 ? 'search-border' : ''}` : ''}`}
+					class={`overflow-hidden ${uiState.settings.split_results ? ` bg-background search-round  ${displayedResultsState.length > 0 ? 'search-border' : ''}` : ''}`}
 				>
-					{#each uiState.displayedResults as result, index}
+					{#each displayedResultsState as result, index}
 						<!-- svelte-ignore a11y-no-static-element-interactions -->
 						<!-- svelte-ignore a11y-mouse-events-have-key-events -->
 						<button
-							class={`flex w-full items-center overflow-hidden cursor-pointer ${index === uiState.selectedIndex ? 'highlight-result' : ''}`}
-							on:mouseover={() => (onSetSelectedIndex(index))}
-							on:focus={() => (onSetSelectedIndex(index))}
+							class={`flex w-full items-center overflow-hidden cursor-pointer ${index === selectedIndexState ? 'highlight-result' : ''}`}
+							on:mouseover={() => onSetSelectedIndex(index)}
+							on:focus={() => onSetSelectedIndex(index)}
 							on:click={onRunAction}
 						>
 							{#if result.result_type === 'Text'}
@@ -80,13 +102,13 @@
 										/>
 									{/if}
 									<div
-										class={`flex-grow one-line text-start result-title ${uiState.selectedIndex === index ? 'text-accent' : ' text-text'}`}
+										class={`flex-grow one-line text-start result-title ${selectedIndexState === index ? 'text-accent' : ' text-text'}`}
 									>
 										{result.text?.text}
 									</div>
 									{#if uiState.settings.show_alt_hint}
 										<div
-											class={`result-alt ${uiState.selectedIndex === index ? 'text-accent' : ' text-sub-text'}`}
+											class={`result-alt ${selectedIndexState === index ? 'text-accent' : ' text-sub-text'}`}
 										>
 											Alt + {index + 1}
 										</div>
@@ -104,7 +126,7 @@
 										/>
 									{/if}
 									<div
-										class={`flex-grow one-line text-start result-title flex flex-col ${uiState.selectedIndex === index ? 'text-accent' : ' text-text'}`}
+										class={`flex-grow one-line text-start result-title flex flex-col ${selectedIndexState === index ? 'text-accent' : ' text-text'}`}
 									>
 										<p class="result-title one-line">{result.title_and_description?.title}</p>
 										<p class="result-description one-line">
@@ -113,7 +135,7 @@
 									</div>
 									{#if uiState.settings.show_alt_hint}
 										<div
-											class={`result-alt ${uiState.selectedIndex === index ? 'text-accent' : ' text-sub-text'}`}
+											class={`result-alt ${selectedIndexState === index ? 'text-accent' : ' text-sub-text'}`}
 										>
 											Alt + {index + 1}
 										</div>
@@ -123,11 +145,11 @@
 							{#if result.result_type === 'Divider'}
 								<div class="p-2 pt-4 pb-4 w-full">
 									<div
-										class={`result-divider rounded-full ${uiState.selectedIndex === index ? 'bg-accent' : 'bg-tertiary'}`}
+										class={`result-divider rounded-full ${selectedIndexState === index ? 'bg-accent' : 'bg-tertiary'}`}
 									></div>
 								</div>
 							{/if}
-							{#if uiState.showConfirmationBox && uiState.selectedIndex === index}
+							{#if showConfirmationBoxState && selectedIndexState === index}
 								<div
 									class="flex bg-accent result-confirm rounded-l-md text-on-accent w-fit items-center p-2"
 								>

src/whiskers-launcher-companion/src-tauri/Cargo.lock

@@ -13,11 +13,11 @@ export async function init() {
 	currentState.css = getThemeCss(currentState.settings);
 	currentState.loading = false;
 
-	state.update(() => currentState);
+	state.set(currentState);
 }
 
 export function setDialogFrameCSS(css: string){
 	let currentState = get(state);
 	currentState.css = css;
-	state.update(() => currentState);
+	state.set(currentState);
 }