Skip to content

Commit

Permalink
[frontend] UI components not working as expected
Browse files Browse the repository at this point in the history
- Fix usage of slots in Dropdown, DateRangePicker & FacetSelector
- Fix value emit in SearchInput
  • Loading branch information
sreenaths committed Feb 25, 2021
1 parent 3923611 commit d691efc
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion desktop/core/src/desktop/js/components/DateRangePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<template>
<dropdown-panel :text="selectedRange.title" :inline="inline">
<template #contents="{ closePanel }">
<template #default="{ closePanel }">
<div class="date-range-picker-panel">
<div class="date-range-picker-body">
<div class="date-range-picker-preset">
Expand Down
6 changes: 3 additions & 3 deletions desktop/core/src/desktop/js/components/FacetSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<template>
<dropdown-panel :text="label" :disabled="disabled">
<template #contents="{ closePanel }">
<template #default="slotProps">
<div class="facet-selector">
<div v-if="facet.values.length > 1" class="facet-select-all">
<div class="facet-list-entry">
Expand All @@ -39,12 +39,12 @@
</div>
</div>
<div class="facet-selector-actions">
<hue-link @click="cancel(closePanel)">{{ I18n('Cancel') }}</hue-link>
<hue-link @click="cancel(slotProps.closePanel)">{{ I18n('Cancel') }}</hue-link>
<hue-button
:small="true"
:primary="true"
:disabled="applyDisabled"
@click="apply(closePanel)"
@click="apply(slotProps.closePanel)"
>
{{ I18n('Apply') }}
</hue-button>
Expand Down
2 changes: 1 addition & 1 deletion desktop/core/src/desktop/js/components/SearchInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
@input="$emit('input', $event.target.value)"
@focusin="hasFocus = true"
@focusout="hasFocus = false"
@keyup.enter="$emit('search', value)"
@keyup.enter="$emit('search', $event.target.value)"
/>
<input
v-model="autocomplete"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,16 @@
this.position.left = '';
this.position.right = `${rightOffset}px`;
}
defer(() => {
addClickOutsideHandler(this.$el, event => {
if (this.triggerElement !== event.target) {
this.$emit('close');
}
});
});
this.$forceUpdate();
}
},
methods: {
Expand All @@ -123,7 +126,7 @@
.hue-dropdown-drawer {
position: fixed;
z-index: 1061;
z-index: 10610;
&.open {
.hue-dropdown-drawer-inner {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,13 @@
<hue-button v-else ref="triggerButtonElement" :disabled="disabled" @click="toggleDrawer">
{{ text }} <i class="fa fa-caret-down" />
</hue-button>
<DropdownDrawer :open="open" :trigger-element="triggerElement" @close="closeDrawer">
<slot />
<DropdownDrawer
:open="open"
:trigger-element="triggerElement"
:close-on-click="false"
@close="closeDrawer"
>
<slot :close-panel="closeDrawer" />
</DropdownDrawer>
</div>
</template>
Expand Down

0 comments on commit d691efc

Please sign in to comment.