Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix search input placeholder regression (#5988)

Sanne de Vries97665e5e0418
diff --git a/assets/css/loader.css b/assets/css/loader.css
index 2c041f35e1..2f658fb3ee 100644
--- a/assets/css/loader.css
+++ b/assets/css/loader.css
@@ -5,8 +5,8 @@
}
.loading.sm {
- width: 25px;
- height: 25px;
+ width: 20px;
+ height: 20px;
}
.loading div {
@@ -25,8 +25,8 @@
}
.loading.sm div {
- width: 25px;
- height: 25px;
+ width: 20px;
+ height: 20px;
}
@keyframes spin {
diff --git a/assets/js/dashboard/components/search-input.tsx b/assets/js/dashboard/components/search-input.tsx
index 648918b472..92f32a1982 100644
--- a/assets/js/dashboard/components/search-input.tsx
+++ b/assets/js/dashboard/components/search-input.tsx
@@ -22,6 +22,7 @@ export const SearchInput = ({
placeholderUnfocusedOnlyDesktop?: string
}) => {
const [isFocused, setIsFocused] = useState(false)
+ const [hasValue, setHasValue] = useState(false)
const onSearchInputChange: ChangeEventHandler<HTMLInputElement> = useCallback(
(event) => {
@@ -31,6 +32,15 @@ export const SearchInput = ({
)
const debouncedOnSearchInputChange = useDebounce(onSearchInputChange)
+ const handleInputChange: ChangeEventHandler<HTMLInputElement> = useCallback(
+ (event) => {
+ const value = event.target.value
+ setHasValue(value.length > 0)
+ debouncedOnSearchInputChange(event)
+ },
+ [debouncedOnSearchInputChange]
+ )
+
const blurSearchBox = useCallback(() => {
searchRef.current?.blur()
}, [searchRef])
@@ -67,14 +77,18 @@ export const SearchInput = ({
type="text"
placeholder=" "
className="peer w-full text-sm dark:text-gray-100 block border-gray-300 dark:border-gray-750 rounded-md dark:bg-gray-750 dark:placeholder:text-gray-400 focus:outline-none focus:ring-3 focus:ring-indigo-500/20 dark:focus:ring-indigo-500/25 focus:border-indigo-500"
- onChange={debouncedOnSearchInputChange}
+ onChange={handleInputChange}
/>
- <span className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 text-sm text-gray-400 dark:text-gray-400 peer-[:not(:placeholder-shown)]:hidden md:peer-[:not(:focus)]:hidden">
- {placeholderFocusedOrMobile}
- </span>
- <span className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 text-sm text-gray-400 dark:text-gray-400 peer-[:not(:placeholder-shown)]:hidden hidden md:peer-[:not(:focus)]:block peer-focus:hidden">
- {placeholderUnfocusedOnlyDesktop}
- </span>
+ {!hasValue && (
+ <>
+ <span className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 text-sm text-gray-400 dark:text-gray-400 md:peer-[:not(:focus)]:hidden">
+ {placeholderFocusedOrMobile}
+ </span>
+ <span className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 text-sm text-gray-400 dark:text-gray-400 hidden md:peer-[:not(:focus)]:block peer-focus:hidden">
+ {placeholderUnfocusedOnlyDesktop}
+ </span>
+ </>
+ )}
</div>
</>
)
diff --git a/assets/js/dashboard/stats/modals/breakdown-table.tsx b/assets/js/dashboard/stats/modals/breakdown-table.tsx
index 9248d8438e..954a29991b 100644
--- a/assets/js/dashboard/stats/modals/breakdown-table.tsx
+++ b/assets/js/dashboard/stats/modals/breakdown-table.tsx
@@ -50,7 +50,6 @@ export const BreakdownTable = <TListItem extends { name: string }>({
<h1 className="shrink-0 mb-0.5 text-base md:text-lg font-bold dark:text-gray-100">
{title}
</h1>
- {!isPending && isFetching && <SmallLoadingSpinner />}
{!!onSearch && (
<SearchInput
searchRef={searchRef}
@@ -62,6 +61,7 @@ export const BreakdownTable = <TListItem extends { name: string }>({
}
/>
)}
+ {!isPending && isFetching && <SmallLoadingSpinner />}
</div>
<button
type="button"