mirror of
https://github.com/open-webui/open-webui
synced 2025-06-22 18:07:17 +00:00
refactor: clean up ChatSearch component code
- Remove unused variables (currentSearchTerm) - Simplify redundant logic and conditions - Extract CSS constants to eliminate duplication - Consolidate navigation functions (navigateToResult → navigateToIndex) - Remove duplicate keyboard shortcuts (Cmd+Arrow keys) - Streamline lifecycle methods and event handlers - Clean up excessive comments while preserving functionality - Maintain all existing features: Ctrl+F, real-time search, yellow highlighting, chronological ordering, Enter/Shift+Enter navigation, blue flash, fixed-width Code is now clean, professional, and simple without duplication of effort.
This commit is contained in:
PVBLIC Foundation
parent
b411560787
commit
20a7a584f7
@ -18,38 +18,25 @@
|
||||
let searchQuery = '';
|
||||
let matchingMessageIds: string[] = [];
|
||||
let currentIndex = 0;
|
||||
let isNavigating = false; // Visual feedback for navigation
|
||||
let currentSearchTerm = ''; // Track current highlighted term
|
||||
let isNavigating = false;
|
||||
|
||||
// Computed values
|
||||
$: totalResults = matchingMessageIds.length;
|
||||
$: currentResult = totalResults > 0 ? currentIndex + 1 : 0;
|
||||
$: if (show && searchInput) searchInput.focus();
|
||||
|
||||
// Auto-focus when search opens
|
||||
$: if (show && searchInput) {
|
||||
searchInput.focus();
|
||||
}
|
||||
const HIGHLIGHT_CLASS = 'search-highlight bg-yellow-200 dark:bg-yellow-600 px-0.5 rounded underline';
|
||||
const HIGHLIGHT_BLUE_CLASS = 'search-highlight bg-blue-200 dark:bg-blue-600 px-0.5 rounded underline';
|
||||
|
||||
const handleKeydown = (e: KeyboardEvent) => {
|
||||
if (e.key === 'Escape') {
|
||||
closeSearch();
|
||||
} else if (e.key === 'Enter') {
|
||||
} else if (e.key === 'Enter' && totalResults > 0) {
|
||||
e.preventDefault();
|
||||
if (totalResults === 0) return; // No results to navigate
|
||||
|
||||
if (e.shiftKey) {
|
||||
navigateToPrevious();
|
||||
} else {
|
||||
navigateToNext();
|
||||
}
|
||||
} else if (e.key === 'ArrowUp' && (e.metaKey || e.ctrlKey)) {
|
||||
// Cmd/Ctrl + Arrow Up for previous (alternative shortcut)
|
||||
e.preventDefault();
|
||||
if (totalResults > 0) navigateToPrevious();
|
||||
} else if (e.key === 'ArrowDown' && (e.metaKey || e.ctrlKey)) {
|
||||
// Cmd/Ctrl + Arrow Down for next (alternative shortcut)
|
||||
e.preventDefault();
|
||||
if (totalResults > 0) navigateToNext();
|
||||
}
|
||||
};
|
||||
|
||||
@ -59,47 +46,43 @@
|
||||
matchingMessageIds = [];
|
||||
currentIndex = 0;
|
||||
isNavigating = false;
|
||||
currentSearchTerm = '';
|
||||
dispatch('close');
|
||||
};
|
||||
|
||||
const performSearch = (query: string) => {
|
||||
// Clear previous highlights
|
||||
clearHighlights();
|
||||
|
||||
if (!query.trim() || !history?.messages) {
|
||||
matchingMessageIds = [];
|
||||
currentIndex = 0;
|
||||
currentSearchTerm = '';
|
||||
return;
|
||||
}
|
||||
|
||||
const searchTerm = query.toLowerCase().trim();
|
||||
const messageIds: string[] = [];
|
||||
const messageResults: Array<{id: string, timestamp: number}> = [];
|
||||
|
||||
// Search through all messages
|
||||
Object.values(history.messages).forEach((message: any) => {
|
||||
if (message?.content && typeof message.content === 'string') {
|
||||
if (message.content.toLowerCase().includes(searchTerm)) {
|
||||
messageIds.push(message.id);
|
||||
messageResults.push({
|
||||
id: message.id,
|
||||
timestamp: message.timestamp || 0
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
matchingMessageIds = messageIds;
|
||||
currentIndex = messageIds.length > 0 ? 0 : 0;
|
||||
currentSearchTerm = searchTerm;
|
||||
messageResults.sort((a, b) => a.timestamp - b.timestamp);
|
||||
matchingMessageIds = messageResults.map(result => result.id);
|
||||
currentIndex = 0;
|
||||
|
||||
// Apply highlights and auto-navigate to first result
|
||||
if (messageIds.length > 0) {
|
||||
if (matchingMessageIds.length > 0) {
|
||||
highlightMatches(searchTerm);
|
||||
scrollToCurrentResult();
|
||||
}
|
||||
};
|
||||
|
||||
const highlightMatches = (searchTerm: string) => {
|
||||
if (!searchTerm.trim()) return;
|
||||
|
||||
matchingMessageIds.forEach(messageId => {
|
||||
const messageElement = document.getElementById(`message-${messageId}`);
|
||||
if (messageElement) {
|
||||
@ -114,7 +97,6 @@
|
||||
NodeFilter.SHOW_TEXT,
|
||||
{
|
||||
acceptNode: (node) => {
|
||||
// Skip if parent already has highlight class or is a script/style tag
|
||||
const parent = node.parentElement;
|
||||
if (!parent || parent.classList.contains('search-highlight') ||
|
||||
parent.tagName === 'SCRIPT' || parent.tagName === 'STYLE') {
|
||||
@ -140,74 +122,59 @@
|
||||
const parent = textNode.parentNode;
|
||||
if (!parent) return;
|
||||
|
||||
// Create document fragment with highlighted content
|
||||
const fragment = document.createDocumentFragment();
|
||||
let lastIndex = 0;
|
||||
let match;
|
||||
|
||||
while ((match = lowerText.indexOf(lowerSearchTerm, lastIndex)) !== -1) {
|
||||
// Add text before match
|
||||
if (match > lastIndex) {
|
||||
fragment.appendChild(document.createTextNode(text.slice(lastIndex, match)));
|
||||
}
|
||||
|
||||
// Add highlighted match
|
||||
const highlight = document.createElement('span');
|
||||
highlight.className = 'search-highlight bg-yellow-200 dark:bg-yellow-600 px-0.5 rounded';
|
||||
highlight.className = HIGHLIGHT_CLASS;
|
||||
highlight.textContent = text.slice(match, match + searchTerm.length);
|
||||
fragment.appendChild(highlight);
|
||||
|
||||
lastIndex = match + searchTerm.length;
|
||||
}
|
||||
|
||||
// Add remaining text
|
||||
if (lastIndex < text.length) {
|
||||
fragment.appendChild(document.createTextNode(text.slice(lastIndex)));
|
||||
}
|
||||
|
||||
// Replace the text node with highlighted content
|
||||
parent.replaceChild(fragment, textNode);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const clearHighlights = () => {
|
||||
// Remove all existing highlights
|
||||
const highlights = document.querySelectorAll('.search-highlight');
|
||||
highlights.forEach(highlight => {
|
||||
const parent = highlight.parentNode;
|
||||
if (parent) {
|
||||
parent.replaceChild(document.createTextNode(highlight.textContent || ''), highlight);
|
||||
parent.normalize(); // Merge adjacent text nodes
|
||||
parent.normalize();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const handleInput = () => {
|
||||
performSearch(searchQuery);
|
||||
};
|
||||
|
||||
const navigateToNext = () => {
|
||||
if (totalResults === 0) return;
|
||||
|
||||
const nextIndex = (currentIndex + 1) % totalResults;
|
||||
navigateToResult(nextIndex);
|
||||
navigateToIndex(nextIndex);
|
||||
};
|
||||
|
||||
const navigateToPrevious = () => {
|
||||
if (totalResults === 0) return;
|
||||
|
||||
const prevIndex = currentIndex === 0 ? totalResults - 1 : currentIndex - 1;
|
||||
navigateToResult(prevIndex);
|
||||
navigateToIndex(prevIndex);
|
||||
};
|
||||
|
||||
const navigateToResult = (newIndex: number) => {
|
||||
if (newIndex < 0 || newIndex >= matchingMessageIds.length) return;
|
||||
|
||||
const navigateToIndex = (newIndex: number) => {
|
||||
currentIndex = newIndex;
|
||||
scrollToCurrentResult();
|
||||
|
||||
// Visual feedback for navigation
|
||||
isNavigating = true;
|
||||
setTimeout(() => {
|
||||
isNavigating = false;
|
||||
@ -215,55 +182,48 @@
|
||||
};
|
||||
|
||||
const scrollToCurrentResult = () => {
|
||||
if (matchingMessageIds.length > 0 && currentIndex < matchingMessageIds.length) {
|
||||
const messageId = matchingMessageIds[currentIndex];
|
||||
const messageElement = document.getElementById(`message-${messageId}`);
|
||||
if (messageElement) {
|
||||
// Enhanced scroll with better positioning
|
||||
messageElement.scrollIntoView({
|
||||
behavior: 'smooth',
|
||||
block: 'center',
|
||||
inline: 'nearest'
|
||||
});
|
||||
|
||||
// Turn all highlights blue during navigation
|
||||
setHighlightColor('blue');
|
||||
|
||||
// Add message background flash
|
||||
messageElement.style.transition = 'background-color 0.3s ease';
|
||||
messageElement.style.backgroundColor = 'rgba(59, 130, 246, 0.1)'; // More visible blue
|
||||
|
||||
setTimeout(() => {
|
||||
messageElement.style.backgroundColor = '';
|
||||
}, 1000);
|
||||
}
|
||||
}
|
||||
const messageId = matchingMessageIds[currentIndex];
|
||||
const messageElement = document.getElementById(`message-${messageId}`);
|
||||
if (!messageElement) return;
|
||||
|
||||
messageElement.scrollIntoView({
|
||||
behavior: 'smooth',
|
||||
block: 'center',
|
||||
inline: 'nearest'
|
||||
});
|
||||
|
||||
setHighlightColor('blue');
|
||||
|
||||
messageElement.style.transition = 'background-color 0.3s ease';
|
||||
messageElement.style.backgroundColor = 'rgba(59, 130, 246, 0.1)';
|
||||
|
||||
setTimeout(() => {
|
||||
messageElement.style.backgroundColor = '';
|
||||
}, 1000);
|
||||
};
|
||||
|
||||
const setHighlightColor = (color: 'yellow' | 'blue') => {
|
||||
const allHighlights = document.querySelectorAll('.search-highlight');
|
||||
const colorClass = color === 'blue'
|
||||
? 'search-highlight bg-blue-200 dark:bg-blue-600 px-0.5 rounded'
|
||||
: 'search-highlight bg-yellow-200 dark:bg-yellow-600 px-0.5 rounded';
|
||||
const colorClass = color === 'blue' ? HIGHLIGHT_BLUE_CLASS : HIGHLIGHT_CLASS;
|
||||
|
||||
allHighlights.forEach(highlight => {
|
||||
highlight.className = colorClass;
|
||||
});
|
||||
};
|
||||
|
||||
// Click outside handler
|
||||
const handleInput = () => {
|
||||
performSearch(searchQuery);
|
||||
};
|
||||
|
||||
const handleClickOutside = (e: MouseEvent) => {
|
||||
if (show && searchContainer && !searchContainer.contains(e.target as Node)) {
|
||||
closeSearch();
|
||||
}
|
||||
};
|
||||
|
||||
onMount(() => {
|
||||
document.addEventListener('click', handleClickOutside);
|
||||
});
|
||||
|
||||
onMount(() => document.addEventListener('click', handleClickOutside));
|
||||
onDestroy(() => {
|
||||
clearHighlights(); // Clean up highlights when component is destroyed
|
||||
clearHighlights();
|
||||
document.removeEventListener('click', handleClickOutside);
|
||||
});
|
||||
</script>
|
||||
@ -271,15 +231,15 @@
|
||||
{#if show}
|
||||
<div
|
||||
bind:this={searchContainer}
|
||||
class="fixed top-4 right-4 z-50 bg-white dark:bg-gray-800 rounded-lg shadow-lg border border-gray-200 dark:border-gray-700 p-3 min-w-80"
|
||||
class="fixed top-4 right-4 z-50 bg-white dark:bg-gray-800 rounded-lg shadow-lg border border-gray-200 dark:border-gray-700 p-3 w-80"
|
||||
class:animate-pulse={isNavigating}
|
||||
transition:fly={{ y: -20, duration: 200 }}
|
||||
on:keydown={handleKeydown}
|
||||
role="dialog"
|
||||
aria-label="Chat search"
|
||||
>
|
||||
<div class="flex items-center gap-2">
|
||||
<Search className="w-4 h-4 text-gray-500 dark:text-gray-400" />
|
||||
<div class="flex items-center gap-1">
|
||||
<Search className="w-4 h-4 text-gray-500 dark:text-gray-400 flex-shrink-0" />
|
||||
|
||||
<input
|
||||
bind:this={searchInput}
|
||||
@ -287,22 +247,22 @@
|
||||
on:input={handleInput}
|
||||
type="text"
|
||||
placeholder="Search in chat..."
|
||||
class="flex-1 bg-transparent border-none outline-none text-sm text-gray-900 dark:text-gray-100 placeholder-gray-500 dark:placeholder-gray-400"
|
||||
class="flex-1 min-w-0 bg-transparent border-none outline-none text-sm text-gray-900 dark:text-gray-100 placeholder-gray-500 dark:placeholder-gray-400"
|
||||
/>
|
||||
|
||||
<!-- Results Counter with enhanced styling -->
|
||||
{#if totalResults > 0}
|
||||
<div class="text-xs font-medium text-blue-600 dark:text-blue-400 whitespace-nowrap">
|
||||
<div class="text-xs font-medium text-blue-600 dark:text-blue-400 whitespace-nowrap flex-shrink-0">
|
||||
{currentResult} of {totalResults} {totalResults === 1 ? 'message' : 'messages'}
|
||||
</div>
|
||||
{:else if searchQuery.trim()}
|
||||
<div class="text-xs text-gray-500 dark:text-gray-400 whitespace-nowrap">
|
||||
<div class="text-xs text-gray-500 dark:text-gray-400 whitespace-nowrap flex-shrink-0">
|
||||
No results
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Navigation Buttons with enhanced states -->
|
||||
<div class="flex items-center gap-1">
|
||||
<div class="flex items-center gap-0.5 flex-shrink-0">
|
||||
<button
|
||||
class="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded transition-colors disabled:opacity-30 disabled:cursor-not-allowed"
|
||||
class:bg-blue-50={isNavigating}
|
||||
@ -328,7 +288,7 @@
|
||||
|
||||
<button
|
||||
on:click={closeSearch}
|
||||
class="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded transition-colors"
|
||||
class="p-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded transition-colors flex-shrink-0"
|
||||
title="Close (Esc)"
|
||||
aria-label="Close search"
|
||||
>
|
||||
@ -344,7 +304,7 @@
|
||||
</div>
|
||||
{:else if totalResults > 1}
|
||||
<div class="mt-2 text-xs text-gray-400 dark:text-gray-500">
|
||||
Navigate between messages with <kbd class="px-1 py-0.5 bg-gray-100 dark:bg-gray-700 rounded text-xs">Enter</kbd> /
|
||||
Navigate with <kbd class="px-1 py-0.5 bg-gray-100 dark:bg-gray-700 rounded text-xs">Enter</kbd> /
|
||||
<kbd class="px-1 py-0.5 bg-gray-100 dark:bg-gray-700 rounded text-xs">Shift+Enter</kbd>
|
||||
</div>
|
||||
{:else if totalResults === 1}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user