diff --git a/client/src/components/Popper/Popper.test.js b/client/src/components/Popper/Popper.test.js index ff7139ea232a..f9115cde2139 100644 --- a/client/src/components/Popper/Popper.test.js +++ b/client/src/components/Popper/Popper.test.js @@ -1,6 +1,7 @@ +import { createPopper } from "@popperjs/core"; import { mount } from "@vue/test-utils"; + import PopperComponent from "./Popper.vue"; -import { createPopper } from "@popperjs/core"; jest.mock("@popperjs/core", () => ({ createPopper: jest.fn(() => ({ diff --git a/client/src/components/Popper/Popper.vue b/client/src/components/Popper/Popper.vue index c6c886128ba0..4a6c870918da 100644 --- a/client/src/components/Popper/Popper.vue +++ b/client/src/components/Popper/Popper.vue @@ -20,10 +20,11 @@ import { library } from "@fortawesome/fontawesome-svg-core"; import { faTimesCircle } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; +import { type Placement } from "@popperjs/core"; import type { PropType } from "vue"; import { ref, watch } from "vue"; -import { type Placement } from "@popperjs/core"; -import { usePopper, type Trigger } from "./usePopper"; + +import { type Trigger, usePopper } from "./usePopper"; library.add(faTimesCircle); diff --git a/client/src/components/Popper/usePopper.test.js b/client/src/components/Popper/usePopper.test.js index 8da301ee7bc9..662138e88f3d 100644 --- a/client/src/components/Popper/usePopper.test.js +++ b/client/src/components/Popper/usePopper.test.js @@ -1,6 +1,7 @@ -import { mount } from "@vue/test-utils"; -import { ref, nextTick } from "vue"; import { createPopper } from "@popperjs/core"; +import { mount } from "@vue/test-utils"; +import { nextTick, ref } from "vue"; + import { usePopper } from "./usePopper"; jest.mock("@popperjs/core", () => ({ diff --git a/client/src/components/Popper/usePopper.ts b/client/src/components/Popper/usePopper.ts index adac4ed5c3b3..c5c06acdd740 100644 --- a/client/src/components/Popper/usePopper.ts +++ b/client/src/components/Popper/usePopper.ts @@ -17,8 +17,9 @@ export function usePopper( const doOpen = () => (visible.value = true); const doClose = () => (visible.value = false); const doCloseForDocument = (e: Event) => { - if (!reference.value?.contains(e.target as Node) && !popper.value?.contains(e.target as Node)) + if (!reference.value?.contains(e.target as Node) && !popper.value?.contains(e.target as Node)) { visible.value = false; + } }; const addEventListener = (target: EventTarget, event: string, handler: EventListener) => {