From 6a13ca1c0d7e9e6cd110b06735e506288ce86526 Mon Sep 17 00:00:00 2001
From: metonym <ericyl.us@gmail.com>
Date: Mon, 21 Feb 2022 09:18:29 -0800
Subject: [PATCH 1/5] fix(file-uploader): correctly fire add/remove events
 (#1121)

Fixes #1119
---
 src/FileUploader/FileUploader.svelte | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/FileUploader/FileUploader.svelte b/src/FileUploader/FileUploader.svelte
index cfbbb84e..f1d5f415 100644
--- a/src/FileUploader/FileUploader.svelte
+++ b/src/FileUploader/FileUploader.svelte
@@ -61,15 +61,28 @@
 
   const dispatch = createEventDispatcher();
 
-  $: prevFiles = [];
+  let prevFiles = [];
+
+  /** @type {(file: File) => string} */
+  const getFileId = (file) => file.lastModified + file.name;
 
   afterUpdate(() => {
-    if (files.length > prevFiles.length) {
-      dispatch("add", files);
-    } else {
+    const fileIds = files.map(getFileId);
+    const prevFileIds = prevFiles.map(getFileId);
+    const addedIds = fileIds.filter((_) => !prevFileIds.includes(_));
+    const removedIds = prevFileIds.filter((_) => !fileIds.includes(_));
+
+    if (addedIds.length > 0) {
+      dispatch(
+        "add",
+        addedIds.map((id) => files.find((file) => id === getFileId(file)))
+      );
+    }
+
+    if (removedIds.length > 0) {
       dispatch(
         "remove",
-        prevFiles.filter((_) => !files.includes(_))
+        removedIds.map((id) => prevFiles.find((file) => id === getFileId(file)))
       );
     }
 

From cd687f0e1bd46958501a6ab0c5dc6d32185b8dce Mon Sep 17 00:00:00 2001
From: metonym <ericyl.us@gmail.com>
Date: Mon, 21 Feb 2022 09:24:37 -0800
Subject: [PATCH 2/5] refactor(types): remove unnecessary JSDoc default type
 [ci skip] (#1123)

---
 src/Search/Search.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Search/Search.svelte b/src/Search/Search.svelte
index 4c7e7727..5cdd7fe4 100644
--- a/src/Search/Search.svelte
+++ b/src/Search/Search.svelte
@@ -12,7 +12,7 @@
 
   /**
    * Specify the size of the search input
-   * @type {"sm" | "lg" | "xl"} [size="xl"]
+   * @type {"sm" | "lg" | "xl"}
    */
   export let size = "xl";
 

From 2f3cff294228d29788f59d5450fe9de5606b0734 Mon Sep 17 00:00:00 2001
From: metonym <ericyl.us@gmail.com>
Date: Mon, 21 Feb 2022 09:24:50 -0800
Subject: [PATCH 3/5] fix(file-uploader): update `clearFiles` accessor
 description (#1122)

The `clearFiles` prop description currently reads "Override the default behavior of clearing the array of uploaded files."

This is misleading as `clearFiles` is a component accessor, not a `let` prop.
---
 COMPONENT_INDEX.md                          | 26 ++++++++++-----------
 docs/src/COMPONENT_API.json                 |  2 +-
 src/FileUploader/FileUploader.svelte        |  2 +-
 tests/FileUploader.test.svelte              |  5 ++++
 types/FileUploader/FileUploader.svelte.d.ts |  2 +-
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/COMPONENT_INDEX.md b/COMPONENT_INDEX.md
index 49d2ea44..552489bb 100644
--- a/COMPONENT_INDEX.md
+++ b/COMPONENT_INDEX.md
@@ -1261,19 +1261,19 @@ None.
 
 ### Props
 
-| Prop name        | Kind               | Reactive | Type                                                                                       | Default value                           | Description                                                           |
-| :--------------- | :----------------- | :------- | :----------------------------------------------------------------------------------------- | --------------------------------------- | --------------------------------------------------------------------- |
-| files            | <code>let</code>   | Yes      | <code>File[]</code>                                                                        | <code>[]</code>                         | Obtain the uploaded file names                                        |
-| status           | <code>let</code>   | No       | <code>"uploading" &#124; "edit" &#124; "complete"</code>                                   | <code>"uploading"</code>                | Specify the file uploader status                                      |
-| accept           | <code>let</code>   | No       | <code>string[]</code>                                                                      | <code>[]</code>                         | Specify the accepted file types                                       |
-| multiple         | <code>let</code>   | No       | <code>boolean</code>                                                                       | <code>false</code>                      | Set to `true` to allow multiple files                                 |
-| clearFiles       | <code>const</code> | No       | <code>() => void</code>                                                                    | <code>() => { files = []; }</code>      | Override the default behavior of clearing the array of uploaded files |
-| labelDescription | <code>let</code>   | No       | <code>string</code>                                                                        | <code>""</code>                         | Specify the label description                                         |
-| labelTitle       | <code>let</code>   | No       | <code>string</code>                                                                        | <code>""</code>                         | Specify the label title                                               |
-| kind             | <code>let</code>   | No       | <code>"primary" &#124; "secondary" &#124; "tertiary" &#124; "ghost" &#124; "danger"</code> | <code>"primary"</code>                  | Specify the kind of file uploader button                              |
-| buttonLabel      | <code>let</code>   | No       | <code>string</code>                                                                        | <code>""</code>                         | Specify the button label                                              |
-| iconDescription  | <code>let</code>   | No       | <code>string</code>                                                                        | <code>"Provide icon description"</code> | Specify the ARIA label used for the status icons                      |
-| name             | <code>let</code>   | No       | <code>string</code>                                                                        | <code>""</code>                         | Specify a name attribute for the file button uploader input           |
+| Prop name        | Kind               | Reactive | Type                                                                                       | Default value                           | Description                                                 |
+| :--------------- | :----------------- | :------- | :----------------------------------------------------------------------------------------- | --------------------------------------- | ----------------------------------------------------------- |
+| files            | <code>let</code>   | Yes      | <code>File[]</code>                                                                        | <code>[]</code>                         | Obtain the uploaded file names                              |
+| status           | <code>let</code>   | No       | <code>"uploading" &#124; "edit" &#124; "complete"</code>                                   | <code>"uploading"</code>                | Specify the file uploader status                            |
+| accept           | <code>let</code>   | No       | <code>string[]</code>                                                                      | <code>[]</code>                         | Specify the accepted file types                             |
+| multiple         | <code>let</code>   | No       | <code>boolean</code>                                                                       | <code>false</code>                      | Set to `true` to allow multiple files                       |
+| clearFiles       | <code>const</code> | No       | <code>() => void</code>                                                                    | <code>() => { files = []; }</code>      | Programmatically clear the uploaded files                   |
+| labelDescription | <code>let</code>   | No       | <code>string</code>                                                                        | <code>""</code>                         | Specify the label description                               |
+| labelTitle       | <code>let</code>   | No       | <code>string</code>                                                                        | <code>""</code>                         | Specify the label title                                     |
+| kind             | <code>let</code>   | No       | <code>"primary" &#124; "secondary" &#124; "tertiary" &#124; "ghost" &#124; "danger"</code> | <code>"primary"</code>                  | Specify the kind of file uploader button                    |
+| buttonLabel      | <code>let</code>   | No       | <code>string</code>                                                                        | <code>""</code>                         | Specify the button label                                    |
+| iconDescription  | <code>let</code>   | No       | <code>string</code>                                                                        | <code>"Provide icon description"</code> | Specify the ARIA label used for the status icons            |
+| name             | <code>let</code>   | No       | <code>string</code>                                                                        | <code>""</code>                         | Specify a name attribute for the file button uploader input |
 
 ### Slots
 
diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index d908e0c6..f4b8198c 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -3503,7 +3503,7 @@
         {
           "name": "clearFiles",
           "kind": "const",
-          "description": "Override the default behavior of clearing the array of uploaded files",
+          "description": "Programmatically clear the uploaded files",
           "type": "() => void",
           "value": "() => {     files = [];   }",
           "isFunction": true,
diff --git a/src/FileUploader/FileUploader.svelte b/src/FileUploader/FileUploader.svelte
index f1d5f415..fcb9c98a 100644
--- a/src/FileUploader/FileUploader.svelte
+++ b/src/FileUploader/FileUploader.svelte
@@ -27,7 +27,7 @@
   export let multiple = false;
 
   /**
-   * Override the default behavior of clearing the array of uploaded files
+   * Programmatically clear the uploaded files
    * @type {() => void}
    */
   export const clearFiles = () => {
diff --git a/tests/FileUploader.test.svelte b/tests/FileUploader.test.svelte
index a2eb96c5..e658fed8 100644
--- a/tests/FileUploader.test.svelte
+++ b/tests/FileUploader.test.svelte
@@ -6,6 +6,10 @@
     FileUploaderItem,
     FileUploaderSkeleton,
   } from "../types";
+
+  let fileUploader: FileUploader;
+
+  $: fileUploader?.clearFiles();
 </script>
 
 <FileUploaderButton
@@ -16,6 +20,7 @@
 />
 
 <FileUploader
+  bind:this="{fileUploader}"
   multiple
   labelTitle="Upload files"
   buttonLabel="Add files"
diff --git a/types/FileUploader/FileUploader.svelte.d.ts b/types/FileUploader/FileUploader.svelte.d.ts
index 15d7768b..d4fda031 100644
--- a/types/FileUploader/FileUploader.svelte.d.ts
+++ b/types/FileUploader/FileUploader.svelte.d.ts
@@ -79,7 +79,7 @@ export default class FileUploader extends SvelteComponentTyped<
   {}
 > {
   /**
-   * Override the default behavior of clearing the array of uploaded files
+   * Programmatically clear the uploaded files
    */
   clearFiles: () => void;
 }

From 714f47a635654af4e3e496ec24a152ad0104b2cf Mon Sep 17 00:00:00 2001
From: metonym <ericyl.us@gmail.com>
Date: Mon, 21 Feb 2022 09:42:42 -0800
Subject: [PATCH 4/5] fix(types): dispatched events without a detail value
 should be `null` (#1124)

Currently, dispatched events without `e.detail` have a type of `any`.

We can be more specific as a `CustomEvent` detail value is `null`.
---
 COMPONENT_INDEX.md                            | 88 +++++++++----------
 docs/src/COMPONENT_API.json                   | 32 +++----
 src/ImageLoader/ImageLoader.svelte            |  4 +-
 src/LocalStorage/LocalStorage.svelte          |  2 +-
 src/MultiSelect/MultiSelect.svelte            |  2 +-
 src/Search/Search.svelte                      |  4 +-
 src/Tooltip/Tooltip.svelte                    |  4 +-
 .../TooltipDefinition.svelte                  |  4 +-
 src/UIShell/HeaderSearch.svelte               |  6 +-
 src/UIShell/SideNav/SideNav.svelte            |  6 +-
 tests/ImageLoader.test.svelte                 |  8 +-
 types/ImageLoader/ImageLoader.svelte.d.ts     |  2 +-
 types/LocalStorage/LocalStorage.svelte.d.ts   |  2 +-
 types/MultiSelect/MultiSelect.svelte.d.ts     |  2 +-
 types/Search/Search.svelte.d.ts               |  4 +-
 types/Tooltip/Tooltip.svelte.d.ts             |  4 +-
 .../TooltipDefinition.svelte.d.ts             |  4 +-
 types/UIShell/HeaderSearch.svelte.d.ts        |  6 +-
 types/UIShell/SideNav/SideNav.svelte.d.ts     |  6 +-
 19 files changed, 97 insertions(+), 93 deletions(-)

diff --git a/COMPONENT_INDEX.md b/COMPONENT_INDEX.md
index 552489bb..e084be00 100644
--- a/COMPONENT_INDEX.md
+++ b/COMPONENT_INDEX.md
@@ -1863,9 +1863,9 @@ export interface HeaderSearchResult {
 
 | Event name | Type       | Detail                                                                                          |
 | :--------- | :--------- | :---------------------------------------------------------------------------------------------- |
-| active     | dispatched | <code>any</code>                                                                                |
-| inactive   | dispatched | <code>any</code>                                                                                |
-| clear      | dispatched | <code>any</code>                                                                                |
+| active     | dispatched | <code>null</code>                                                                               |
+| inactive   | dispatched | <code>null</code>                                                                               |
+| clear      | dispatched | <code>null</code>                                                                               |
 | select     | dispatched | <code>{ value: string; selectedResultIndex: number; selectedResult: HeaderSearchResult }</code> |
 | change     | forwarded  | --                                                                                              |
 | input      | forwarded  | --                                                                                              |
@@ -1956,10 +1956,10 @@ None.
 
 ### Events
 
-| Event name | Type       | Detail           |
-| :--------- | :--------- | :--------------- |
-| load       | dispatched | <code>any</code> |
-| error      | dispatched | <code>any</code> |
+| Event name | Type       | Detail            |
+| :--------- | :--------- | :---------------- |
+| load       | dispatched | <code>null</code> |
+| error      | dispatched | <code>null</code> |
 
 ## `InlineLoading`
 
@@ -2274,7 +2274,7 @@ None.
 
 | Event name | Type       | Detail                                       |
 | :--------- | :--------- | :------------------------------------------- |
-| save       | dispatched | <code>any</code>                             |
+| save       | dispatched | <code>null</code>                            |
 | update     | dispatched | <code>{ prevValue: any; value: any; }</code> |
 
 ## `Modal`
@@ -2464,7 +2464,7 @@ None.
 | :--------- | :--------- | :------------------------------------------------------------------------------------------------------------- |
 | blur       | dispatched | <code>FocusEvent &#124; CustomEvent<FocusEvent></code>                                                         |
 | select     | dispatched | <code>{ selectedIds: MultiSelectItemId[]; selected: MultiSelectItem[]; unselected: MultiSelectItem[]; }</code> |
-| clear      | dispatched | <code>any</code>                                                                                               |
+| clear      | dispatched | <code>null</code>                                                                                              |
 | keydown    | forwarded  | --                                                                                                             |
 | keyup      | forwarded  | --                                                                                                             |
 | focus      | forwarded  | --                                                                                                             |
@@ -3193,21 +3193,21 @@ None.
 
 ### Events
 
-| Event name | Type       | Detail           |
-| :--------- | :--------- | :--------------- |
-| expand     | dispatched | <code>any</code> |
-| collapse   | dispatched | <code>any</code> |
-| click      | forwarded  | --               |
-| mouseover  | forwarded  | --               |
-| mouseenter | forwarded  | --               |
-| mouseleave | forwarded  | --               |
-| change     | forwarded  | --               |
-| input      | forwarded  | --               |
-| focus      | forwarded  | --               |
-| blur       | forwarded  | --               |
-| keydown    | forwarded  | --               |
-| keyup      | forwarded  | --               |
-| clear      | dispatched | --               |
+| Event name | Type       | Detail            |
+| :--------- | :--------- | :---------------- |
+| expand     | dispatched | <code>null</code> |
+| collapse   | dispatched | <code>null</code> |
+| click      | forwarded  | --                |
+| mouseover  | forwarded  | --                |
+| mouseenter | forwarded  | --                |
+| mouseleave | forwarded  | --                |
+| change     | forwarded  | --                |
+| input      | forwarded  | --                |
+| focus      | forwarded  | --                |
+| blur       | forwarded  | --                |
+| keydown    | forwarded  | --                |
+| keyup      | forwarded  | --                |
+| clear      | dispatched | --                |
 
 ## `SearchSkeleton`
 
@@ -3383,11 +3383,11 @@ None.
 
 ### Events
 
-| Event name    | Type       | Detail           |
-| :------------ | :--------- | :--------------- |
-| open          | dispatched | <code>any</code> |
-| close         | dispatched | <code>any</code> |
-| click:overlay | dispatched | <code>any</code> |
+| Event name    | Type       | Detail            |
+| :------------ | :--------- | :---------------- |
+| open          | dispatched | <code>null</code> |
+| close         | dispatched | <code>null</code> |
+| click:overlay | dispatched | <code>null</code> |
 
 ## `SideNavDivider`
 
@@ -4679,12 +4679,12 @@ None.
 
 ### Events
 
-| Event name | Type       | Detail           |
-| :--------- | :--------- | :--------------- |
-| open       | dispatched | <code>any</code> |
-| close      | dispatched | <code>any</code> |
-| click      | forwarded  | --               |
-| mousedown  | forwarded  | --               |
+| Event name | Type       | Detail            |
+| :--------- | :--------- | :---------------- |
+| open       | dispatched | <code>null</code> |
+| close      | dispatched | <code>null</code> |
+| click      | forwarded  | --                |
+| mousedown  | forwarded  | --                |
 
 ## `TooltipDefinition`
 
@@ -4708,15 +4708,15 @@ None.
 
 ### Events
 
-| Event name | Type       | Detail           |
-| :--------- | :--------- | :--------------- |
-| open       | dispatched | <code>any</code> |
-| close      | dispatched | <code>any</code> |
-| click      | forwarded  | --               |
-| mouseover  | forwarded  | --               |
-| mouseenter | forwarded  | --               |
-| mouseleave | forwarded  | --               |
-| focus      | forwarded  | --               |
+| Event name | Type       | Detail            |
+| :--------- | :--------- | :---------------- |
+| open       | dispatched | <code>null</code> |
+| close      | dispatched | <code>null</code> |
+| click      | forwarded  | --                |
+| mouseover  | forwarded  | --                |
+| mouseenter | forwarded  | --                |
+| mouseleave | forwarded  | --                |
+| focus      | forwarded  | --                |
 
 ## `TooltipFooter`
 
diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index f4b8198c..7e30bf03 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -4915,9 +4915,9 @@
         }
       ],
       "events": [
-        { "type": "dispatched", "name": "active", "detail": "any" },
-        { "type": "dispatched", "name": "inactive", "detail": "any" },
-        { "type": "dispatched", "name": "clear", "detail": "any" },
+        { "type": "dispatched", "name": "active", "detail": "null" },
+        { "type": "dispatched", "name": "inactive", "detail": "null" },
+        { "type": "dispatched", "name": "clear", "detail": "null" },
         {
           "type": "dispatched",
           "name": "select",
@@ -5115,8 +5115,8 @@
         { "name": "loading", "default": false, "slot_props": "{}" }
       ],
       "events": [
-        { "type": "dispatched", "name": "load", "detail": "any" },
-        { "type": "dispatched", "name": "error", "detail": "any" }
+        { "type": "dispatched", "name": "load", "detail": "null" },
+        { "type": "dispatched", "name": "error", "detail": "null" }
       ],
       "typedefs": [],
       "rest_props": { "type": "Element", "name": "img" }
@@ -5920,7 +5920,7 @@
       ],
       "slots": [],
       "events": [
-        { "type": "dispatched", "name": "save", "detail": "any" },
+        { "type": "dispatched", "name": "save", "detail": "null" },
         {
           "type": "dispatched",
           "name": "update",
@@ -6796,7 +6796,7 @@
           "name": "select",
           "detail": "{ selectedIds: MultiSelectItemId[]; selected: MultiSelectItem[]; unselected: MultiSelectItem[]; }"
         },
-        { "type": "dispatched", "name": "clear", "detail": "any" },
+        { "type": "dispatched", "name": "clear", "detail": "null" },
         { "type": "forwarded", "name": "keydown", "element": "input" },
         { "type": "forwarded", "name": "keyup", "element": "input" },
         { "type": "forwarded", "name": "focus", "element": "input" }
@@ -9261,8 +9261,8 @@
         }
       ],
       "events": [
-        { "type": "dispatched", "name": "expand", "detail": "any" },
-        { "type": "dispatched", "name": "collapse", "detail": "any" },
+        { "type": "dispatched", "name": "expand", "detail": "null" },
+        { "type": "dispatched", "name": "collapse", "detail": "null" },
         { "type": "forwarded", "name": "click", "element": "SearchSkeleton" },
         {
           "type": "forwarded",
@@ -9831,9 +9831,9 @@
       ],
       "slots": [{ "name": "__default__", "default": true, "slot_props": "{}" }],
       "events": [
-        { "type": "dispatched", "name": "open", "detail": "any" },
-        { "type": "dispatched", "name": "close", "detail": "any" },
-        { "type": "dispatched", "name": "click:overlay", "detail": "any" }
+        { "type": "dispatched", "name": "open", "detail": "null" },
+        { "type": "dispatched", "name": "close", "detail": "null" },
+        { "type": "dispatched", "name": "click:overlay", "detail": "null" }
       ],
       "typedefs": [],
       "rest_props": { "type": "Element", "name": "nav" }
@@ -13104,8 +13104,8 @@
         }
       ],
       "events": [
-        { "type": "dispatched", "name": "open", "detail": "any" },
-        { "type": "dispatched", "name": "close", "detail": "any" },
+        { "type": "dispatched", "name": "open", "detail": "null" },
+        { "type": "dispatched", "name": "close", "detail": "null" },
         { "type": "forwarded", "name": "click", "element": "div" },
         { "type": "forwarded", "name": "mousedown", "element": "div" }
       ],
@@ -13193,8 +13193,8 @@
         }
       ],
       "events": [
-        { "type": "dispatched", "name": "open", "detail": "any" },
-        { "type": "dispatched", "name": "close", "detail": "any" },
+        { "type": "dispatched", "name": "open", "detail": "null" },
+        { "type": "dispatched", "name": "close", "detail": "null" },
         { "type": "forwarded", "name": "click", "element": "button" },
         { "type": "forwarded", "name": "mouseover", "element": "button" },
         { "type": "forwarded", "name": "mouseenter", "element": "button" },
diff --git a/src/ImageLoader/ImageLoader.svelte b/src/ImageLoader/ImageLoader.svelte
index 5835fd8a..a91d3f13 100644
--- a/src/ImageLoader/ImageLoader.svelte
+++ b/src/ImageLoader/ImageLoader.svelte
@@ -1,7 +1,7 @@
 <script>
   /**
-   * @event {any} load
-   * @event {any} error
+   * @event {null} load
+   * @event {null} error
    */
 
   /**
diff --git a/src/LocalStorage/LocalStorage.svelte b/src/LocalStorage/LocalStorage.svelte
index 6e46c277..823d8894 100644
--- a/src/LocalStorage/LocalStorage.svelte
+++ b/src/LocalStorage/LocalStorage.svelte
@@ -1,6 +1,6 @@
 <script>
   /**
-   * @event {any} save
+   * @event {null} save
    * @event {{ prevValue: any; value: any; }} update
    */
 
diff --git a/src/MultiSelect/MultiSelect.svelte b/src/MultiSelect/MultiSelect.svelte
index 81d50f84..fbcae562 100644
--- a/src/MultiSelect/MultiSelect.svelte
+++ b/src/MultiSelect/MultiSelect.svelte
@@ -8,7 +8,7 @@
    * @typedef {string} MultiSelectItemText
    * @typedef {{ id: MultiSelectItemId; text: MultiSelectItemText; }} MultiSelectItem
    * @event {{ selectedIds: MultiSelectItemId[]; selected: MultiSelectItem[]; unselected: MultiSelectItem[]; }} select
-   * @event {any} clear
+   * @event {null} clear
    */
 
   /**
diff --git a/src/Search/Search.svelte b/src/Search/Search.svelte
index 5cdd7fe4..0658f266 100644
--- a/src/Search/Search.svelte
+++ b/src/Search/Search.svelte
@@ -1,7 +1,7 @@
 <script>
   /**
-   * @event {any} expand
-   * @event {any} collapse
+   * @event {null} expand
+   * @event {null} collapse
    */
 
   /**
diff --git a/src/Tooltip/Tooltip.svelte b/src/Tooltip/Tooltip.svelte
index d1f88fb0..37ed9b83 100644
--- a/src/Tooltip/Tooltip.svelte
+++ b/src/Tooltip/Tooltip.svelte
@@ -1,7 +1,7 @@
 <script>
   /**
-   * @event {any} open
-   * @event {any} close
+   * @event {null} open
+   * @event {null} close
    */
 
   /**
diff --git a/src/TooltipDefinition/TooltipDefinition.svelte b/src/TooltipDefinition/TooltipDefinition.svelte
index 0cea292e..8ef2358a 100644
--- a/src/TooltipDefinition/TooltipDefinition.svelte
+++ b/src/TooltipDefinition/TooltipDefinition.svelte
@@ -1,7 +1,7 @@
 <script>
   /**
-   * @event {any} open
-   * @event {any} close
+   * @event {null} open
+   * @event {null} close
    */
 
   /** Specify the tooltip text */
diff --git a/src/UIShell/HeaderSearch.svelte b/src/UIShell/HeaderSearch.svelte
index 79c8be49..e7d7a26c 100644
--- a/src/UIShell/HeaderSearch.svelte
+++ b/src/UIShell/HeaderSearch.svelte
@@ -1,9 +1,9 @@
 <script>
   /**
    * @typedef {{ href: string; text: string; description?: string; }} HeaderSearchResult
-   * @event {any} active
-   * @event {any} inactive
-   * @event {any} clear
+   * @event {null} active
+   * @event {null} inactive
+   * @event {null} clear
    * @event {{ value: string; selectedResultIndex: number; selectedResult: HeaderSearchResult }} select
    * @slot {{ result: HeaderSearchResult; index: number }}
    */
diff --git a/src/UIShell/SideNav/SideNav.svelte b/src/UIShell/SideNav/SideNav.svelte
index ae08e832..929aa0f0 100644
--- a/src/UIShell/SideNav/SideNav.svelte
+++ b/src/UIShell/SideNav/SideNav.svelte
@@ -1,8 +1,8 @@
 <script>
   /**
-   * @event {any} open
-   * @event {any} close
-   * @event {any} click:overlay
+   * @event {null} open
+   * @event {null} close
+   * @event {null} click:overlay
    */
 
   /** Set to `true` to use the fixed variant */
diff --git a/tests/ImageLoader.test.svelte b/tests/ImageLoader.test.svelte
index 8af6d330..209f3c2c 100644
--- a/tests/ImageLoader.test.svelte
+++ b/tests/ImageLoader.test.svelte
@@ -13,6 +13,10 @@
   fadeIn
   ratio="16x9"
   src=""
-  on:load="{() => {}}"
-  on:error="{() => {}}"
+  on:load="{(e) => {
+    console.log(e.detail); // null
+  }}"
+  on:error="{(e) => {
+    console.log(e.detail); // null
+  }}"
 />
diff --git a/types/ImageLoader/ImageLoader.svelte.d.ts b/types/ImageLoader/ImageLoader.svelte.d.ts
index 03d01b24..5c774e40 100644
--- a/types/ImageLoader/ImageLoader.svelte.d.ts
+++ b/types/ImageLoader/ImageLoader.svelte.d.ts
@@ -49,7 +49,7 @@ export interface ImageLoaderProps
 
 export default class ImageLoader extends SvelteComponentTyped<
   ImageLoaderProps,
-  { load: CustomEvent<any>; error: CustomEvent<any> },
+  { load: CustomEvent<null>; error: CustomEvent<null> },
   { error: {}; loading: {} }
 > {
   /**
diff --git a/types/LocalStorage/LocalStorage.svelte.d.ts b/types/LocalStorage/LocalStorage.svelte.d.ts
index ec734e15..03fdb83b 100644
--- a/types/LocalStorage/LocalStorage.svelte.d.ts
+++ b/types/LocalStorage/LocalStorage.svelte.d.ts
@@ -18,7 +18,7 @@ export interface LocalStorageProps {
 export default class LocalStorage extends SvelteComponentTyped<
   LocalStorageProps,
   {
-    save: CustomEvent<any>;
+    save: CustomEvent<null>;
     update: CustomEvent<{ prevValue: any; value: any }>;
   },
   {}
diff --git a/types/MultiSelect/MultiSelect.svelte.d.ts b/types/MultiSelect/MultiSelect.svelte.d.ts
index c15df2c1..fee3cc7d 100644
--- a/types/MultiSelect/MultiSelect.svelte.d.ts
+++ b/types/MultiSelect/MultiSelect.svelte.d.ts
@@ -228,7 +228,7 @@ export default class MultiSelect extends SvelteComponentTyped<
       selected: MultiSelectItem[];
       unselected: MultiSelectItem[];
     }>;
-    clear: CustomEvent<any>;
+    clear: CustomEvent<null>;
     keydown: WindowEventMap["keydown"];
     keyup: WindowEventMap["keyup"];
     focus: WindowEventMap["focus"];
diff --git a/types/Search/Search.svelte.d.ts b/types/Search/Search.svelte.d.ts
index ade7a549..c340ae05 100644
--- a/types/Search/Search.svelte.d.ts
+++ b/types/Search/Search.svelte.d.ts
@@ -113,8 +113,8 @@ export interface SearchProps {
 export default class Search extends SvelteComponentTyped<
   SearchProps,
   {
-    expand: CustomEvent<any>;
-    collapse: CustomEvent<any>;
+    expand: CustomEvent<null>;
+    collapse: CustomEvent<null>;
     click: WindowEventMap["click"];
     mouseover: WindowEventMap["mouseover"];
     mouseenter: WindowEventMap["mouseenter"];
diff --git a/types/Tooltip/Tooltip.svelte.d.ts b/types/Tooltip/Tooltip.svelte.d.ts
index 0e1fe782..7baf7cb0 100644
--- a/types/Tooltip/Tooltip.svelte.d.ts
+++ b/types/Tooltip/Tooltip.svelte.d.ts
@@ -92,8 +92,8 @@ export interface TooltipProps
 export default class Tooltip extends SvelteComponentTyped<
   TooltipProps,
   {
-    open: CustomEvent<any>;
-    close: CustomEvent<any>;
+    open: CustomEvent<null>;
+    close: CustomEvent<null>;
     click: WindowEventMap["click"];
     mousedown: WindowEventMap["mousedown"];
   },
diff --git a/types/TooltipDefinition/TooltipDefinition.svelte.d.ts b/types/TooltipDefinition/TooltipDefinition.svelte.d.ts
index e90112a2..f28fc677 100644
--- a/types/TooltipDefinition/TooltipDefinition.svelte.d.ts
+++ b/types/TooltipDefinition/TooltipDefinition.svelte.d.ts
@@ -43,8 +43,8 @@ export interface TooltipDefinitionProps
 export default class TooltipDefinition extends SvelteComponentTyped<
   TooltipDefinitionProps,
   {
-    open: CustomEvent<any>;
-    close: CustomEvent<any>;
+    open: CustomEvent<null>;
+    close: CustomEvent<null>;
     click: WindowEventMap["click"];
     mouseover: WindowEventMap["mouseover"];
     mouseenter: WindowEventMap["mouseenter"];
diff --git a/types/UIShell/HeaderSearch.svelte.d.ts b/types/UIShell/HeaderSearch.svelte.d.ts
index a0759a45..21f1e9b3 100644
--- a/types/UIShell/HeaderSearch.svelte.d.ts
+++ b/types/UIShell/HeaderSearch.svelte.d.ts
@@ -43,9 +43,9 @@ export interface HeaderSearchProps
 export default class HeaderSearch extends SvelteComponentTyped<
   HeaderSearchProps,
   {
-    active: CustomEvent<any>;
-    inactive: CustomEvent<any>;
-    clear: CustomEvent<any>;
+    active: CustomEvent<null>;
+    inactive: CustomEvent<null>;
+    clear: CustomEvent<null>;
     select: CustomEvent<{
       value: string;
       selectedResultIndex: number;
diff --git a/types/UIShell/SideNav/SideNav.svelte.d.ts b/types/UIShell/SideNav/SideNav.svelte.d.ts
index 39a5716c..6e27c28e 100644
--- a/types/UIShell/SideNav/SideNav.svelte.d.ts
+++ b/types/UIShell/SideNav/SideNav.svelte.d.ts
@@ -43,9 +43,9 @@ export interface SideNavProps
 export default class SideNav extends SvelteComponentTyped<
   SideNavProps,
   {
-    open: CustomEvent<any>;
-    close: CustomEvent<any>;
-    ["click:overlay"]: CustomEvent<any>;
+    open: CustomEvent<null>;
+    close: CustomEvent<null>;
+    ["click:overlay"]: CustomEvent<null>;
   },
   { default: {} }
 > {}

From 826b7096c80ea5401786c2e702031c9ad2dda5a5 Mon Sep 17 00:00:00 2001
From: Eric Liu <ericyl.us@gmail.com>
Date: Mon, 21 Feb 2022 09:53:17 -0800
Subject: [PATCH 5/5] v0.58.4

---
 CHANGELOG.md        | 15 +++++++++++++++
 COMPONENT_INDEX.md  |  2 +-
 package.json        |  2 +-
 preprocess/api.json |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c2b7131..7757f004 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- ## Unreleased -->
 
+## [0.58.4](https://github.com/carbon-design-system/carbon-components-svelte/releases/tag/v0.58.4) - 2022-02-21
+
+**Fixes**
+
+- dispatched events without a `detail` type should be `null` instead of `any`
+- `FileUploader` `clearFiles` description should reflect that it's an accessor, not a prop
+- `FileUploader` should correctly fire `add` and `remove` events
+- `FileUploader` files should not be keyed by file name
+- `FileUploader` change event detail signature should be `File[]`
+- fix `DataTable` regression where sort icon indicators don't update
+
+**Refactor**
+
+- remove unnecessary JSDoc default type notation
+
 ## [0.58.3](https://github.com/carbon-design-system/carbon-components-svelte/releases/tag/v0.58.3) - 2022-02-20
 
 **Fixes**
diff --git a/COMPONENT_INDEX.md b/COMPONENT_INDEX.md
index e084be00..2e7595ed 100644
--- a/COMPONENT_INDEX.md
+++ b/COMPONENT_INDEX.md
@@ -1,6 +1,6 @@
 # Component Index
 
-> 172 components exported from carbon-components-svelte@0.58.3.
+> 172 components exported from carbon-components-svelte@0.58.4.
 
 ## Components
 
diff --git a/package.json b/package.json
index b708bff8..ee444890 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "carbon-components-svelte",
-  "version": "0.58.3",
+  "version": "0.58.4",
   "license": "Apache-2.0",
   "description": "Svelte implementation of the Carbon Design System",
   "svelte": "./src/index.js",
diff --git a/preprocess/api.json b/preprocess/api.json
index 3b7e7b1c..8c65fff1 100644
--- a/preprocess/api.json
+++ b/preprocess/api.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.58.3",
+  "version": "0.58.4",
   "components": {
     "Accordion": {
       "path": "carbon-components-svelte/src/Accordion/Accordion.svelte"