From 4967d49b03901aec5edd1b24df321455dcec1066 Mon Sep 17 00:00:00 2001
From: Eric Liu <ericyl.us@gmail.com>
Date: Sat, 5 Dec 2020 17:00:29 -0800
Subject: [PATCH] fix(overflow-menu): type dispatched close event

---
 COMPONENT_INDEX.md                   | 16 ++++++++--------
 docs/src/COMPONENT_API.json          |  8 ++++++--
 src/OverflowMenu/OverflowMenu.svelte |  6 +++++-
 tests/OverflowMenu.test.svelte       |  6 +++++-
 types/OverflowMenu/OverflowMenu.d.ts |  2 +-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/COMPONENT_INDEX.md b/COMPONENT_INDEX.md
index b26de2bf..4613ec99 100644
--- a/COMPONENT_INDEX.md
+++ b/COMPONENT_INDEX.md
@@ -2377,14 +2377,14 @@ None.
 
 ### Events
 
-| Event name | Type       | Detail |
-| :--------- | :--------- | :----- |
-| click      | forwarded  | --     |
-| mouseover  | forwarded  | --     |
-| mouseenter | forwarded  | --     |
-| mouseleave | forwarded  | --     |
-| keydown    | forwarded  | --     |
-| close      | dispatched | --     |
+| Event name | Type       | Detail                                        |
+| :--------- | :--------- | :-------------------------------------------- |
+| close      | dispatched | <code>{ index: number; text: string; }</code> |
+| click      | forwarded  | --                                            |
+| mouseover  | forwarded  | --                                            |
+| mouseenter | forwarded  | --                                            |
+| mouseleave | forwarded  | --                                            |
+| keydown    | forwarded  | --                                            |
 
 ## `OverflowMenuItem`
 
diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index 33b6772a..2a188bac 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -3127,12 +3127,16 @@
         }
       ],
       "events": [
+        {
+          "type": "dispatched",
+          "name": "close",
+          "detail": "{ index: number; text: string; }"
+        },
         { "type": "forwarded", "name": "click", "element": "button" },
         { "type": "forwarded", "name": "mouseover", "element": "button" },
         { "type": "forwarded", "name": "mouseenter", "element": "button" },
         { "type": "forwarded", "name": "mouseleave", "element": "button" },
-        { "type": "forwarded", "name": "keydown", "element": "button" },
-        { "type": "dispatched", "name": "close" }
+        { "type": "forwarded", "name": "keydown", "element": "button" }
       ],
       "typedefs": [],
       "rest_props": { "type": "Element", "name": "button" }
diff --git a/src/OverflowMenu/OverflowMenu.svelte b/src/OverflowMenu/OverflowMenu.svelte
index 4d2b4080..3f897da0 100644
--- a/src/OverflowMenu/OverflowMenu.svelte
+++ b/src/OverflowMenu/OverflowMenu.svelte
@@ -1,4 +1,8 @@
 <script>
+  /**
+   * @event {{ index: number; text: string; }} close
+   */
+
   /**
    * Specify the size of the overflow menu
    * @type {"sm" | "xl"}
@@ -52,7 +56,7 @@
 
   import { createEventDispatcher, setContext, afterUpdate } from "svelte";
   import { writable } from "svelte/store";
-  import OverflowMenuVertical16 from "carbon-icons-svelte/lib/OverflowMenuVertical16";
+  import OverflowMenuVertical16 from "carbon-icons-svelte/lib/OverflowMenuVertical16/OverflowMenuVertical16.svelte";
   import { formatStyle } from "./formatStyle";
 
   const dispatch = createEventDispatcher();
diff --git a/tests/OverflowMenu.test.svelte b/tests/OverflowMenu.test.svelte
index b728fb23..f23f19ea 100644
--- a/tests/OverflowMenu.test.svelte
+++ b/tests/OverflowMenu.test.svelte
@@ -3,7 +3,11 @@
   import Add16 from "carbon-icons-svelte/lib/Add16";
 </script>
 
-<OverflowMenu>
+<OverflowMenu
+  on:close="{(e) => {
+    console.log(e.detail); // { index: number; text: string; }
+  }}"
+>
   <OverflowMenuItem text="Manage credentials" />
   <OverflowMenuItem
     href="https://cloud.ibm.com/docs/api-gateway/"
diff --git a/types/OverflowMenu/OverflowMenu.d.ts b/types/OverflowMenu/OverflowMenu.d.ts
index 6c6fa72f..9a75274a 100644
--- a/types/OverflowMenu/OverflowMenu.d.ts
+++ b/types/OverflowMenu/OverflowMenu.d.ts
@@ -77,11 +77,11 @@ export default class OverflowMenu {
     menu: {};
   };
 
+  $on(eventname: "close", cb: (event: CustomEvent<{ index: number; text: string }>) => void): () => void;
   $on(eventname: "click", cb: (event: WindowEventMap["click"]) => void): () => void;
   $on(eventname: "mouseover", cb: (event: WindowEventMap["mouseover"]) => void): () => void;
   $on(eventname: "mouseenter", cb: (event: WindowEventMap["mouseenter"]) => void): () => void;
   $on(eventname: "mouseleave", cb: (event: WindowEventMap["mouseleave"]) => void): () => void;
   $on(eventname: "keydown", cb: (event: WindowEventMap["keydown"]) => void): () => void;
-  $on(eventname: "close", cb: (event: CustomEvent<any>) => void): () => void;
   $on(eventname: string, cb: (event: Event) => void): () => void;
 }