Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 29 additions & 8 deletions components/src/widgets/menu/widget.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Menu from './widget';
describe('Menu component', () => {
describe('methods', () => {
describe('#toggle', () => {

it('toggles menu to true when clicking', () => {
const wrapper = mount(Menu);
wrapper.vm.showMenu = false;
Expand All @@ -23,26 +24,46 @@ describe('Menu component', () => {

describe('#handleClickOutside', () => {

it('hides menu content when clicked outside menu', () => {
const event = { target: 'another value'};
it('closes menu when clicked outside menu bounds', async () => {
const event = { composedPath: jest.fn().mockReturnValue(['slot', 'button']) };
const wrapper = mount(Menu);
wrapper.vm.menu = { contains: jest.fn().mockReturnValue(false) };
wrapper.vm.menu = 'div';
wrapper.vm.showMenu = true;
wrapper.vm.handleClickOutside(event);
await wrapper.vm.handleClickOutside(event);

expect(wrapper.vm.showMenu).toBe(false);
});

it('does not hide menu content when clicked inside menu', () => {
const event = { target: 'some value'};
it('does not close menu when clicked inside menu bounds', async () => {
const event = { composedPath: jest.fn().mockReturnValue(['slot', 'button']) };
const wrapper = mount(Menu);
wrapper.vm.menu = { contains: jest.fn().mockReturnValue(true) };
wrapper.vm.menu = 'button';
wrapper.vm.showMenu = true;
wrapper.vm.handleClickOutside(event);
await wrapper.vm.handleClickOutside(event);

expect(wrapper.vm.showMenu).toBe(true);
});
});

describe('#onClickInside', () => {
it.each([
// expected, closeOnClickInside
[false, true],
[true, false],
])(
'should set showMenu.value=%s when closeOnClickInside=%s',
(expected, closeOnClickInside) => {
const wrapper = mount(Menu, {
props: {
closeOnClickInside,
},
});
wrapper.vm.showMenu = true;
wrapper.vm.onClickInside();

expect(wrapper.vm.showMenu).toEqual(expected);
});
});
});

describe('onMounted', () => {
Expand Down
15 changes: 12 additions & 3 deletions components/src/widgets/menu/widget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
>
<div
class="menu-trigger"
@click.stop="toggle"
@click="toggle"
>
<slot name="trigger" />
</div>
Expand All @@ -15,7 +15,7 @@
v-if="showMenu"
class="menu-content"
:class="alignmentClass"
@click.stop
@click.stop="onClickInside"
>
<slot name="content" />
</div>
Expand All @@ -34,6 +34,10 @@ const props = defineProps({
return ['left', 'right'].includes(value);
},
},
closeOnClickInside: {
type: Boolean,
default: true,
},
});

const showMenu = ref(false);
Expand All @@ -49,11 +53,16 @@ const toggle = () => {
};

const handleClickOutside = (event) => {
if (menu.value && !menu.value.contains(event.target)) {
const isClickWithinMenuBounds = event.composedPath().some(el => el === menu.value);
Copy link
Member

Choose a reason for hiding this comment

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

❤️

if (!isClickWithinMenuBounds) {
showMenu.value = false;
}
};

const onClickInside = () => {
if (props.closeOnClickInside) showMenu.value = false;
};

onMounted(() => {
document.addEventListener("click", handleClickOutside);
});
Expand Down