Merge pull request #478 from upfluence/oc/DRA-2301

Added fix for captureClickOutside

Author: OwenCoogan

addon/components/o-s-s/power-select.hbs

@@ -37,7 +37,7 @@
           class={{concat "margin-top-px-0 upf-power-select__dropdown " this.dropdownAddressableClass}}
           id={{this.portalId}}
           {{on "click" this.noop}}
-          {{on-click-outside this.onClickOutside}}
+          {{on-click-outside this.onClickOutside useCapture=@captureClickOutside}}
         >
           <:option as |item|>
             {{yield item to="option-item"}}
@@ -61,7 +61,7 @@
           class={{concat "margin-top-px-0 upf-power-select__dropdown " this.dropdownAddressableClass}}
           id={{this.portalId}}
           {{on "click" this.noop}}
-          {{on-click-outside this.onClickOutside}}
+          {{on-click-outside this.onClickOutside useCapture=@captureClickOutside}}
         >
           <:option as |item|>
             {{yield item to="option-item"}}

addon/components/o-s-s/private/base-dropdown.ts

@@ -6,6 +6,7 @@ import { isTesting } from '@embroider/macros';
 
 export interface BaseDropdownArgs {
   focusOnOpen?: boolean;
+  captureClickOutside?: boolean;
 }
 
 export default class OSSBaseDropdown<T extends BaseDropdownArgs> extends Component<T> {
@@ -40,7 +41,9 @@ export default class OSSBaseDropdown<T extends BaseDropdownArgs> extends Compone
 
   @action
   onClickOutside(_: HTMLElement, event: MouseEvent): void {
-    event.stopPropagation();
+    if (!this.args.captureClickOutside || this.container.contains(event.target as HTMLElement)) {
+      event.stopPropagation();
+    }
     this.closeDropdown();
   }
 

addon/components/o-s-s/select.hbs

@@ -32,7 +32,7 @@
         @enableKeyboard={{true}}
         id={{this.portalId}}
         class={{concat "margin-top-px-0 oss-select-container__dropdown " this.dropdownAddressableClass}}
-        {{on-click-outside this.onClickOutside}}
+        {{on-click-outside this.onClickOutside useCapture=@captureClickOutside}}
         {{on "click" this.noop}}
       >
         <:option as |item|>