Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add spinner and sidebar toggle #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add spinner and sidebar toggle #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0919691
add spinner and sidebar toggle
d-rk Jan 24, 2022
be0a00a
revert opening links in new tab
d-rk Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/ui/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
--primary-text-color: #3c3c3c;
--secondary-text-color: #888;
--sidebar-hover-color: var(--bluish-white);
--spinner-color: black;

// @media-dependent variables
--padding-standard: 30px;
Expand Down Expand Up @@ -52,6 +53,7 @@
--primary-text-color: var(--bluish-white);
--secondary-text-color: #7f91aa;
--sidebar-hover-color: var(--border-color);
--spinner-color: white;
}

@font-face {
Expand Down Expand Up @@ -235,6 +237,32 @@ mark {
}
}

.is-hidden {
filter: grayscale(100%);
cursor: pointer;
}

.spinner-color {
fill: var(--spinner-color)
}

.spinner {
width: 20px;
height: 20px;
animation: spin 1s linear infinite;
background: none;
padding: 0;
}

@keyframes spin {
from {
transform:rotate(0deg);
}
to {
transform:rotate(360deg);
}
}

span {
background: var(--no-results-color);
border-radius: 15px;
Expand Down
132 changes: 88 additions & 44 deletions src/ui/ui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,60 +96,93 @@ const Settings = ({
);

const Sidebar = ({
visible,
hiddenEngines,
onToggle,
resultGroups,
}: {
visible: boolean;
hiddenEngines: string[];
onToggle: (engineId: string) => void;
resultGroups: ResultGroup[];
}) => (
<div className="sidebar">
<ul>
{Object.values(ENGINES)
.sort((a, b) => (a.name > b.name ? 1 : -1))
.map(engine => {
const numResults = resultGroups.find(rg => rg.engineId === engine.id)
?.results.length;
return (
<li
className={
numResults && !hiddenEngines.includes(engine.id)
? "has-results"
: undefined
}
key={engine.id}
onClick={() => {
if (!numResults) {
return;
{visible &&
Object.values(ENGINES)
.sort((a, b) => (a.name > b.name ? 1 : -1))
.map((engine) => {
const numResults = resultGroups.find(
(rg) => rg.engineId === engine.id
)?.results.length;
return (
<li
className={
numResults && !hiddenEngines.includes(engine.id)
? "has-results"
: "is-hidden"
}
const $results = document.querySelector(".results");
const $resultGroup: HTMLDivElement | null = document.querySelector(
`[data-engine-results=${engine.id}]`,
);
if (!($results && $resultGroup)) {
return;
key={engine.id}
onClick={() => {
if (!numResults) {
return;
}
const $results = document.querySelector(".results");
const $resultGroup: HTMLDivElement | null =
document.querySelector(
`[data-engine-results=${engine.id}]`
);
if (!($results && $resultGroup)) {
return;
}

const engineHidden = hiddenEngines.includes(engine.id);
const needsScroll =
$results.scrollTop != $resultGroup.offsetTop;

if (engineHidden || !needsScroll) {
onToggle(engine.id);
}

if (needsScroll) {
$results.scrollTo({
behavior: "smooth",
top: $resultGroup.offsetTop,
});
}
}}
title={
numResults === undefined
? "Searching..."
: numResults
? "Jump to results"
: "No results found"
}
$results.scrollTo({
behavior: "smooth",
top: $resultGroup.offsetTop,
});
}}
title={
numResults === undefined
? "Searching..."
: numResults
? "Jump to results"
: "No results found"
}
>
<div className="engine-wrap">
{engine.name}
{numResults === undefined ? null : (
<span className="num-results">{numResults}</span>
)}
</div>
</li>
);
})}
>
<div className="engine-wrap">
{engine.name}
{numResults === undefined ? (
<span className="spinner">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 16 16"
>
<g className="spinner-color">
<path
d="M8 15c-3.86 0-7-3.141-7-7 0-3.86 3.14-7 7-7 3.859 0 7 3.14 7 7 0 3.859-3.141 7-7 7zM8 3C5.243 3 3 5.243 3 8s2.243 5 5 5 5-2.243 5-5-2.243-5-5-5z"
opacity=".3"
/>
<path d="M14 9a1 1 0 0 1-1-1c0-2.757-2.243-5-5-5a1 1 0 0 1 0-2c3.859 0 7 3.14 7 7a1 1 0 0 1-1 1z" />
</g>
</svg>
</span>
) : (
<span className="num-results">{numResults}</span>
)}
</div>
</li>
);
})}
</ul>
</div>
);
Expand Down Expand Up @@ -217,6 +250,7 @@ const Results = ({
className="title"
dangerouslySetInnerHTML={{ __html: result.title }}
href={result.url}
target="_blank"
/>
{result.modified ? (
<span
Expand Down Expand Up @@ -400,7 +434,17 @@ const App = () => {
sortMode={sortMode}
/>
<Sidebar
visible={resultGroups.length > 0}
hiddenEngines={localData.hiddenEngines || []}
onToggle={engineId => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the onToggle method here is the same like below in <Results. this needs to be refactored, but I gonna need help for this.

const hiddenEngines = localData.hiddenEngines || [];
setLocalData({
...localData,
hiddenEngines: hiddenEngines.includes(engineId)
? hiddenEngines.filter(id => id !== engineId)
: [...hiddenEngines, engineId].sort(),
});
}}
resultGroups={resultGroups}
/>
<Results
Expand Down