Clear active emotes on reset

SevenTV · Jun 20, 2024 · 5223965 · 5223965
1 parent 0865e60
commit 5223965
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/src/composable/chat/useChatEmotes.ts b/src/composable/chat/useChatEmotes.ts
@@ -32,7 +32,7 @@ export function useChatEmotes(ctx: ChannelContext) {
 		m.set(ctx, x);
 	}
 
-	function resetProviders() {
+	function reset() {
 		if (!x) return;
 
 		for (const k in x.providers) {
@@ -42,6 +42,12 @@ export function useChatEmotes(ctx: ChannelContext) {
 				delete x.providers[k as SevenTV.Provider][k2];
 			}
 		}
+
+		for (const k in x.active) {
+			const ae = x.active[k];
+			if (ae.provider === "EMOJI") continue;
+			delete x.active[k];
+		}
 	}
 
 	function byProvider(provider: SevenTV.Provider) {
@@ -75,7 +81,7 @@ export function useChatEmotes(ctx: ChannelContext) {
 		sets: x.sets,
 		emojis: x.emojis,
 		providers: x.providers,
-		resetProviders,
+		reset,
 		byProvider,
 		find,
 	});

diff --git a/src/site/twitch.tv/modules/chat/ChatController.vue b/src/site/twitch.tv/modules/chat/ChatController.vue
@@ -328,7 +328,7 @@ watch(
 		messages.clear();
 		scroller.unpause();
 
-		nextTick(() => emotes.resetProviders());
+		nextTick(emotes.reset);
 	},
 	{ immediate: true },
 );

diff --git a/src/site/twitch.tv/modules/chat/components/tray/ChatTray.ts b/src/site/twitch.tv/modules/chat/components/tray/ChatTray.ts
@@ -181,7 +181,7 @@ export function useTrayRef(options: Twitch.CustomTrayOptions, modifier: boolean
 		$$typeof: REACT_ELEMENT_SYMBOL,
 		key: "body",
 		ref: (e: TrayRef) => (bodyRef.value = e),
-		type: "seventv-vue-component",
+		type: "seventv-tray-container-body",
 		props: {},
 	};
 

diff --git a/src/site/twitch.tv/modules/chat/components/tray/Tray.vue b/src/site/twitch.tv/modules/chat/components/tray/Tray.vue
@@ -19,6 +19,7 @@ const props = withDefaults(
 		messageHandler?: (v: string) => void;
 		placeholder?: string;
 		modifier?: boolean;
+		floating?: boolean;
 	}>(),
 	{
 		modifier: false,

diff --git a/src/site/twitch.tv/modules/custom-commands/Commands/Dashboard.vue b/src/site/twitch.tv/modules/custom-commands/Commands/Dashboard.vue
@@ -4,6 +4,7 @@
 		placeholder="Search again..."
 		:input-value-override="search"
 		disable-commands
+		floating
 		:message-handler="(m) => (search = m)"
 	>
 		<EnableTray :search="search" :mut="mut" name="body" @close="showTray = false" />

diff --git a/src/types/twitch.d.ts b/src/types/twitch.d.ts
@@ -480,6 +480,7 @@ declare module Twitch {
 		sendMessageHandler?: ChatTray.SendMessageHandler<H>;
 		messageHandler?: (v: string) => void;
 		placeholder?: string;
+		floating?: boolean;
 	}
 
 	export namespace ChatTray {