@salesforcedevs/dx-components 0.10.0 → 0.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -29,5 +29,5 @@
         "@types/debounce": "^1.2.0",
         "@types/lodash.get": "^4.4.6"
     },
-    "gitHead": "f91a2edc71e7a19cbc26ccfd6396637d3a706f56"
+    "gitHead": "84ec3fe64f80f136723f84c0222afe7f34c7b2a2"
 }

package/src/modules/dx/headerSearch/headerSearch.html

@@ -8,7 +8,6 @@
                 open={isDropdownOpen}
                 options={suggestions}
                 onrequestclose={onDropdownRequestClose}
-                onrequestopen={openPopover}
                 full-width
                 page-padding="0"
             >
@@ -20,6 +19,7 @@
                     onchange={onInputChange}
                     onclear={onInputEscape}
                     onsubmit={onInputSubmit}
+                    onfocus={openDropdown}
                     placeholder="Search"
                     size="override"
                     type="search"
@@ -43,10 +43,8 @@
                 open={isDropdownOpen}
                 placement="bottom-end"
                 onrequestclose={onDropdownRequestClose}
-                onrequestopen={openPopover}
                 offset="small"
                 full-width
-                temp-id="banana"
             >
                 <dx-input
                     aria-label="Record Search Term"
@@ -54,7 +52,7 @@
                     onchange={onInputChange}
                     onclear={onInputEscape}
                     onsubmit={onInputSubmit}
-                    onfocus={openPopover}
+                    onfocus={openDropdown}
                     placeholder="Search"
                     shortcut-key="k"
                     size="small"

package/src/modules/dx/headerSearch/headerSearch.ts

@@ -70,7 +70,7 @@ export default class HeaderSearch extends LightningElement {
         switch (e.detail as PopoverRequestCloseType) {
             case "interact-outside":
             case "keypress-escape":
-                this.closePopover();
+                this.closeDropdown();
                 break;
             default:
                 break;
@@ -124,29 +124,29 @@ export default class HeaderSearch extends LightningElement {
         const input = this.template.querySelector("dx-input");
         if (this.isMobileSearchOpen && input) {
             input.focus();
-            this.openPopover();
+            this.openDropdown();
         } else {
-            this.closePopover();
+            this.closeDropdown();
         }
         if (!this.isMobileSearchOpen && this.searchBox) {
             this.searchBox.updateText("");
         }
     }
 
-    private openPopover() {
+    private openDropdown() {
         this.isDropdownOpen = true;
         this.isMobileSearchOpen = true;
         this.reportState<boolean>(true);
     }
 
-    private closePopover() {
+    private closeDropdown() {
         this.isDropdownOpen = false;
         this.isMobileSearchOpen = false;
         this.reportState<boolean>(false);
     }
 
     private onInputEscape() {
-        this.closePopover();
+        this.closeDropdown();
     }
 
     private reportState<T>(state: T) {

package/src/modules/dx/popover/popover.ts

@@ -212,23 +212,27 @@ export default class Popover extends LightningElement {
     };
 
     private onControlClick = () => {
-        if (this.controlled) {
+        if (this.controlled && this.open) {
             this.dispatchRequestCloseEvent("click-control");
             return;
         }
 
+        if (this.controlled && !this.open) {
+            this.dispatchEvent(
+                new CustomEvent("requestopen", {
+                    bubbles: true,
+                    composed: true
+                })
+            );
+            return;
+        }
+
         if (this.open) {
             this.closePopover();
             return;
         }
 
         this.openPopover();
-        this.dispatchEvent(
-            new CustomEvent("requestopen", {
-                bubbles: true,
-                composed: true
-            })
-        );
     };
 
     private onSlotChange(e: LightningSlotElement) {