Skip to content

Commit

Permalink
Merge pull request #555 from fairDataSociety/fix/449
Browse files Browse the repository at this point in the history
fix: searchbar appearing (#549)
  • Loading branch information
tfius authored Oct 23, 2023
2 parents c615a79 + 9e764b6 commit 30e3640
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import { useDialogs } from '@context/DialogsContext';
import NavigationMenuLight from '@media/UI/drive-view-list-light.svg';
import NavigationMenuDark from '@media/UI/drive-view-list-dark.svg';
import ThemeContext from '@context/ThemeContext';
import PodContext from '@context/PodContext';
import { Transition } from '@headlessui/react';

// import ActivityDropdown from './ActivityDropdown/ActivityDropdown';

Expand All @@ -23,6 +25,7 @@ const MainNavigationBar: FC<Record<string, never>> = () => {
const { wallet } = useFdpStorage();
const { metamaskMigrationNotification } = useContext(UserContext);
const { setMobileNavigationOpen } = useDialogs();
const { activePod } = useContext(PodContext);

return (
<nav>
Expand All @@ -45,7 +48,17 @@ const MainNavigationBar: FC<Record<string, never>> = () => {

<div className="flex justify-between items-center">
<div className="hidden sm:block mr-16">
<SearchBar />
<Transition
show={Boolean(activePod)}
enter="transition ease duration-700 transform"
enterFrom="opacity-0 -translate-y-full"
enterTo="opacity-100 translate-y-0"
leave="transition ease duration-1000 transform"
leaveFrom="opacity-100 translate-y-0"
leaveTo="opacity-0 -translate-y-full"
>
<SearchBar />
</Transition>
</div>
<div className="flex flex-nowrap space-x-5">
<UserDropdownToggle
Expand Down
3 changes: 3 additions & 0 deletions src/pages/drive/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,9 @@ const Drive: FC = () => {
};

const onBackToDrive = () => {
if (loading) {
return;
}
setError(null);
setActivePod('');
setDirectoryName('');
Expand Down

0 comments on commit 30e3640

Please sign in to comment.