Skip to content

Don't show search modal when input/textarea are focused #843

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

Merged
merged 3 commits into from
Mar 20, 2022
Merged

Don't show search modal when input/textarea are focused #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b990ab0
dont show search modal when input/textarea are focused
geowrgetudor Mar 19, 2022
2f8d861
fix CI issues
geowrgetudor Mar 19, 2022
3b768fe
fix CI issues
geowrgetudor Mar 19, 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
1 change: 1 addition & 0 deletions resources/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Choices from 'choices.js';
import 'choices.js/public/assets/styles/choices.css';

require('./bootstrap');
require('./nav');
require('./search');
require('./editor');

Expand Down
23 changes: 23 additions & 0 deletions resources/js/nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
window.navConfig = () => {
return {
nav: false,
searchVisible: false,
searchQuery: '',
community: false,
chat: false,
settings: false,

// Show search modal
showSearch: function (event) {
// Abort if trying to open while the following elements are focused
if (
event instanceof KeyboardEvent &&
(event.target.tagName === 'INPUT' || event.target.tagName === 'TEXTAREA')
) {
return false;
}

this.searchVisible = true;
},
};
};
10 changes: 5 additions & 5 deletions resources/views/layouts/_nav.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<nav class="{{ isset($hasShadow) ? 'shadow mb-1' : '' }}">
<div class="container mx-auto text-gray-800 lg:block lg:py-8" x-data="{ nav: false, searchVisible: false, searchQuery: '', community: false, chat: false, settings: false }" @click.outside="nav = false">
<div class="container mx-auto text-gray-800 lg:block lg:py-8" x-data="navConfig()" @click.outside="nav = false">
<div class="block bg-white 2xl:-mx-10">
<div class="lg:px-4 lg:flex">
<div class="block lg:flex lg:items-center lg:shrink-0">
Expand All @@ -9,7 +9,7 @@
</a>

<div class="flex lg:hidden">
<button @click="searchVisible = true">
<button @click="showSearch($event)">
<x-heroicon-o-search class="w-6 h-6 mr-4" />
</button>

Expand Down Expand Up @@ -71,7 +71,7 @@
</li>

<li class="rounded lg:mb-0 lg:hover:bg-gray-100">
<div @click.outside="community = false" class="relative" x-data="{ community: false }">
<div @click.outside="community = false" class="relative">
<button @click="community = !community" class="flex items-center lg:mb-0 py-1 px-2">
Community
<x-heroicon-s-chevron-down x-show="!community" class="w-4 h-4 ml-1"/>
Expand Down Expand Up @@ -121,7 +121,7 @@

<div class="w-full block gap-x-4 lg:flex lg:items-center lg:justify-end">
<div class="flex items-center">
<button @click="searchVisible = true" @keyup.window.slash="searchVisible = true" class="hover:text-lio-500">
<button @click="showSearch($event)" @keyup.window.slash="showSearch($event)" class="hover:text-lio-500">
<x-heroicon-o-search class="h-5 w-5 hidden lg:block" />
</button>
@include('_partials._search')
Expand Down Expand Up @@ -150,7 +150,7 @@
</a>
</li>
@else
<li class="relative p-4 lg:p-0" x-data="{ settings: false }">
<li class="relative p-4 lg:p-0">
<div class="flex items-center justify-center gap-3">
<a href="{{ route('notifications') }}" class="hidden shrink-0 rounded-full lg:block">
<span class="block relative">
Expand Down