fixed issues handling clicks on components

This commit is contained in:
adan.ulloa 2020-01-10 12:15:11 -06:00 committed by Adan Ulloa
commit 00bb031bf4
2 changed files with 30 additions and 54 deletions

View file

@ -24,75 +24,51 @@
function checkForClicksTypeComponent(target, component) {
if (component && target) {
try {
if (
!isChildOf(target, 'right-panel-action-component') ||
!isChildOf(target, 'right-panel-action-component-form')
) {
if (component.contains(target) || target === component) {
componentIsActive = !componentIsActive;
} else {
if (componentIsActive) {
componentIsActive = false;
}
if (
!isChildOf(target, 'right-panel-action-component') ||
!isChildOf(target, 'right-panel-action-component-form')
) {
if (component.contains(target) || target === component) {
componentIsActive = !componentIsActive;
} else {
if (componentIsActive) {
componentIsActive = false;
}
}
} catch (error) {
if (componentIsActive) {
componentIsActive = false;
}
}
}
}
function checkForClicksTypeSearch(target, component, actionString) {
function checkForClicksTypeSearch(target, component) {
if (component && target) {
try {
if (!isChildOf(target, 'right-panel-action-search')) {
if (component.contains(target) || target === component) {
searchIsActive = !searchIsActive;
} else {
if (searchIsActive) {
searchIsActive = false;
}
}
if (!isChildOf(target, 'right-panel-action-search')) {
if (component.contains(target) || target === component) {
searchIsActive = !searchIsActive;
} else {
if (!searchIsActive && target.id !== 'right-panel-close-search') {
searchIsActive = true;
} else if (searchIsActive && isChildOf(target, 'right-panel-close-search')) {
if (searchIsActive) {
searchIsActive = false;
}
}
} catch (error) {
if (searchIsActive) {
} else {
if (!searchIsActive && target.id !== 'right-panel-close-search') {
searchIsActive = true;
} else if (searchIsActive && isChildOf(target, 'right-panel-close-search')) {
searchIsActive = false;
}
}
}
}
function checkForClicksTypeLink(target, component, actionString) {
try {
if (component && target) {
if (component.contains(target) || target === component) {
if (actionString === leftPanelTypes.component) {
componentIsActive = !componentIsActive;
} else if (actionString === leftPanelTypes.link) {
linkIsActive = !linkIsActive;
}
} else {
if (actionString === leftPanelTypes.component) {
if (componentIsActive) {
componentIsActive = false;
}
} else if (actionString === leftPanelTypes.link) {
if (linkIsActive) {
linkIsActive = false;
}
}
function checkForClicksTypeLink(target, component) {
if (component && target) {
if (component.contains(target) || target === component) {
linkIsActive = !linkIsActive;
} else {
if (linkIsActive) {
linkIsActive = false;
}
}
} catch (error) {}
}
}
</script>

View file

@ -8,7 +8,7 @@
import Icon from '../../Icon/Icon.svelte';
import { leftPanelActions, closeIcon } from '../constants';
import searchStore from '../searchStore';
import ActionSearchResult from './ActionSearchResult.svelte'
import ActionSearchResult from './ActionSearchResult.svelte';
let searchTabIndex = 0;
let closeTabIndex = -1;
@ -39,10 +39,10 @@
}
$: if (!searchIsActive) {
try {
inputSearchField.value = '';
if (inputSearchField) {
inputSearchField.value = '';
}
searchStore.clear();
} catch {}
}
$: if (searchIsActive) {