diff --git a/COMPONENT_INDEX.md b/COMPONENT_INDEX.md
index 0fe94caf..7bb499c9 100644
--- a/COMPONENT_INDEX.md
+++ b/COMPONENT_INDEX.md
@@ -658,7 +658,7 @@ export interface ComboBoxItem {
 
 | Prop name        | Kind                  | Reactive | Type                                                        | Default value                                                                                                                                                                               | Description                                                              |
 | :--------------- | :-------------------- | :------- | :---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------ |
-| listRef          | <code>let</code>      | Yes      | <code>null &#124; HTMLDivElement</code>                     | <code>null</code>                                                                                                                                                                           | Obtain a reference to the list HTML element                              |
+| listRef          | <code>let</code>      | Yes      | <code>HTMLDivElement</code>                                 | <code>null</code>                                                                                                                                                                           | Obtain a reference to the list HTML element                              |
 | ref              | <code>let</code>      | Yes      | <code>null &#124; HTMLInputElement</code>                   | <code>null</code>                                                                                                                                                                           | Obtain a reference to the input HTML element                             |
 | open             | <code>let</code>      | Yes      | <code>boolean</code>                                        | <code>false</code>                                                                                                                                                                          | Set to `true` to open the combobox menu dropdown                         |
 | value            | <code>let</code>      | Yes      | <code>string</code>                                         | <code>""</code>                                                                                                                                                                             | Specify the selected combobox value                                      |
@@ -781,13 +781,13 @@ None.
 
 ### Props
 
-| Prop name | Kind             | Reactive | Type                                                      | Default value      | Description                                                                                                                                        |
-| :-------- | :--------------- | :------- | :-------------------------------------------------------- | ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------- |
-| ref       | <code>let</code> | Yes      | <code>null &#124; HTMLUListElement</code>                 | <code>null</code>  | Obtain a reference to the unordered list HTML element                                                                                              |
-| y         | <code>let</code> | Yes      | <code>number</code>                                       | <code>0</code>     | Specify the vertical offset of the menu position                                                                                                   |
-| x         | <code>let</code> | Yes      | <code>number</code>                                       | <code>0</code>     | Specify the horizontal offset of the menu position                                                                                                 |
-| open      | <code>let</code> | Yes      | <code>boolean</code>                                      | <code>false</code> | Set to `true` to open the menu<br />Either `x` and `y` must be greater than zero                                                                   |
-| target    | <code>let</code> | No       | <code>null &#124; HTMLElement &#124; HTMLElement[]</code> | <code>null</code>  | Specify an element or list of elements to trigger the context menu.<br />If no element is specified, the context menu applies to the entire window |
+| Prop name | Kind             | Reactive | Type                                          | Default value      | Description                                                                                                                                        |
+| :-------- | :--------------- | :------- | :-------------------------------------------- | ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ref       | <code>let</code> | Yes      | <code>null &#124; HTMLUListElement</code>     | <code>null</code>  | Obtain a reference to the unordered list HTML element                                                                                              |
+| y         | <code>let</code> | Yes      | <code>number</code>                           | <code>0</code>     | Specify the vertical offset of the menu position                                                                                                   |
+| x         | <code>let</code> | Yes      | <code>number</code>                           | <code>0</code>     | Specify the horizontal offset of the menu position                                                                                                 |
+| open      | <code>let</code> | Yes      | <code>boolean</code>                          | <code>false</code> | Set to `true` to open the menu<br />Either `x` and `y` must be greater than zero                                                                   |
+| target    | <code>let</code> | No       | <code>HTMLElement &#124; HTMLElement[]</code> | <code>null</code>  | Specify an element or list of elements to trigger the context menu.<br />If no element is specified, the context menu applies to the entire window |
 
 ### Slots
 
@@ -2413,8 +2413,8 @@ export interface MultiSelectItem {
 
 | Prop name         | Kind             | Reactive | Type                                                                                           | Default value                                                                              | Description                                                                           |
 | :---------------- | :--------------- | :------- | :--------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------- |
-| selectionRef      | <code>let</code> | Yes      | <code>null &#124; HTMLDivElement</code>                                                        | <code>null</code>                                                                          | Obtain a reference to the selection element                                           |
-| fieldRef          | <code>let</code> | Yes      | <code>null &#124; HTMLDivElement</code>                                                        | <code>null</code>                                                                          | Obtain a reference to the field box element                                           |
+| selectionRef      | <code>let</code> | Yes      | <code>HTMLDivElement</code>                                                                    | <code>null</code>                                                                          | Obtain a reference to the selection element                                           |
+| fieldRef          | <code>let</code> | Yes      | <code>HTMLDivElement</code>                                                                    | <code>null</code>                                                                          | Obtain a reference to the field box element                                           |
 | multiSelectRef    | <code>let</code> | Yes      | <code>null &#124; HTMLDivElement</code>                                                        | <code>null</code>                                                                          | Obtain a reference to the outer div element                                           |
 | inputRef          | <code>let</code> | Yes      | <code>null &#124; HTMLInputElement</code>                                                      | <code>null</code>                                                                          | Obtain a reference to the input HTML element                                          |
 | open              | <code>let</code> | Yes      | <code>boolean</code>                                                                           | <code>false</code>                                                                         | Set to `true` to open the dropdown                                                    |
@@ -4612,14 +4612,14 @@ None.
 
 ### Props
 
-| Prop name  | Kind             | Reactive | Type                                      | Default value      | Description                                   |
-| :--------- | :--------------- | :------- | :---------------------------------------- | ------------------ | --------------------------------------------- |
-| ref        | <code>let</code> | Yes      | <code>null &#124; HTMLInputElement</code> | <code>null</code>  | Obtain a reference to the input HTML element  |
-| expanded   | <code>let</code> | Yes      | <code>boolean</code>                      | <code>false</code> | Set to `true` to expand the search bar        |
-| value      | <code>let</code> | Yes      | <code>number &#124; string</code>         | <code>""</code>    | Specify the value of the search input         |
-| persistent | <code>let</code> | No       | <code>boolean</code>                      | <code>false</code> | Set to `true` to keep the search bar expanded |
-| disabled   | <code>let</code> | No       | <code>boolean</code>                      | <code>false</code> | Set to `true` to disable the search bar       |
-| tabindex   | <code>let</code> | No       | <code>string</code>                       | <code>"0"</code>   | Specify the tabindex                          |
+| Prop name  | Kind             | Reactive | Type                              | Default value      | Description                                   |
+| :--------- | :--------------- | :------- | :-------------------------------- | ------------------ | --------------------------------------------- |
+| ref        | <code>let</code> | Yes      | <code>HTMLInputElement</code>     | <code>null</code>  | Obtain a reference to the input HTML element  |
+| expanded   | <code>let</code> | Yes      | <code>boolean</code>              | <code>false</code> | Set to `true` to expand the search bar        |
+| value      | <code>let</code> | Yes      | <code>number &#124; string</code> | <code>""</code>    | Specify the value of the search input         |
+| persistent | <code>let</code> | No       | <code>boolean</code>              | <code>false</code> | Set to `true` to keep the search bar expanded |
+| disabled   | <code>let</code> | No       | <code>boolean</code>              | <code>false</code> | Set to `true` to disable the search bar       |
+| tabindex   | <code>let</code> | No       | <code>string</code>               | <code>"0"</code>   | Specify the tabindex                          |
 
 ### Slots
 
diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index 35b84000..c9527b8c 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -1604,7 +1604,7 @@
           "name": "listRef",
           "kind": "let",
           "description": "Obtain a reference to the list HTML element",
-          "type": "null | HTMLDivElement",
+          "type": "HTMLDivElement",
           "value": "null",
           "isFunction": false,
           "isFunctionDeclaration": false,
@@ -1824,7 +1824,7 @@
           "name": "target",
           "kind": "let",
           "description": "Specify an element or list of elements to trigger the context menu.\nIf no element is specified, the context menu applies to the entire window",
-          "type": "null | HTMLElement | HTMLElement[]",
+          "type": "HTMLElement | HTMLElement[]",
           "value": "null",
           "isFunction": false,
           "isFunctionDeclaration": false,
@@ -6700,7 +6700,7 @@
           "name": "fieldRef",
           "kind": "let",
           "description": "Obtain a reference to the field box element",
-          "type": "null | HTMLDivElement",
+          "type": "HTMLDivElement",
           "value": "null",
           "isFunction": false,
           "isFunctionDeclaration": false,
@@ -6711,7 +6711,7 @@
           "name": "selectionRef",
           "kind": "let",
           "description": "Obtain a reference to the selection element",
-          "type": "null | HTMLDivElement",
+          "type": "HTMLDivElement",
           "value": "null",
           "isFunction": false,
           "isFunctionDeclaration": false,
@@ -12806,7 +12806,7 @@
           "name": "ref",
           "kind": "let",
           "description": "Obtain a reference to the input HTML element",
-          "type": "null | HTMLInputElement",
+          "type": "HTMLInputElement",
           "value": "null",
           "isFunction": false,
           "isFunctionDeclaration": false,
diff --git a/src/ComboBox/ComboBox.svelte b/src/ComboBox/ComboBox.svelte
index 1a02c276..2486a72e 100644
--- a/src/ComboBox/ComboBox.svelte
+++ b/src/ComboBox/ComboBox.svelte
@@ -90,7 +90,7 @@
 
   /**
    * Obtain a reference to the list HTML element
-   * @type {null | HTMLDivElement}
+   * @type {HTMLDivElement}
    */
   export let listRef = null;
 
diff --git a/src/ContextMenu/ContextMenu.svelte b/src/ContextMenu/ContextMenu.svelte
index c1490844..9397688e 100644
--- a/src/ContextMenu/ContextMenu.svelte
+++ b/src/ContextMenu/ContextMenu.svelte
@@ -6,7 +6,7 @@
   /**
    * Specify an element or list of elements to trigger the context menu.
    * If no element is specified, the context menu applies to the entire window
-   * @type {null | HTMLElement | HTMLElement[]}
+   * @type {HTMLElement | HTMLElement[]}
    */
   export let target = null;
 
diff --git a/src/DataTable/ToolbarSearch.svelte b/src/DataTable/ToolbarSearch.svelte
index 21c0c256..f527cbee 100644
--- a/src/DataTable/ToolbarSearch.svelte
+++ b/src/DataTable/ToolbarSearch.svelte
@@ -21,7 +21,7 @@
 
   /**
    * Obtain a reference to the input HTML element
-   * @type {null | HTMLInputElement}
+   * @type {HTMLInputElement}
    */
   export let ref = null;
 
diff --git a/src/MultiSelect/MultiSelect.svelte b/src/MultiSelect/MultiSelect.svelte
index add3a9a1..1ef2ed70 100644
--- a/src/MultiSelect/MultiSelect.svelte
+++ b/src/MultiSelect/MultiSelect.svelte
@@ -136,13 +136,13 @@
 
   /**
    * Obtain a reference to the field box element
-   * @type {null | HTMLDivElement}
+   * @type {HTMLDivElement}
    */
   export let fieldRef = null;
 
   /**
    * Obtain a reference to the selection element
-   * @type {null | HTMLDivElement}
+   * @type {HTMLDivElement}
    */
   export let selectionRef = null;
 
diff --git a/src/TreeView/TreeViewNode.svelte b/src/TreeView/TreeViewNode.svelte
index ffcd4ad1..79bfbeb8 100644
--- a/src/TreeView/TreeViewNode.svelte
+++ b/src/TreeView/TreeViewNode.svelte
@@ -22,7 +22,7 @@
   /**
    * Finds the nearest parent tree node
    * @param {HTMLElement} node
-   * @returns {null | HTMLElement}
+   * @returns {HTMLElement}
    */
   function findParentTreeNode(node) {
     if (node.classList.contains("bx--tree-parent-node")) return node;
diff --git a/tests/ComboBox.test.svelte b/tests/ComboBox.test.svelte
index 919a973b..9ee7eb9d 100644
--- a/tests/ComboBox.test.svelte
+++ b/tests/ComboBox.test.svelte
@@ -9,6 +9,7 @@
   ];
 
   let ref: ComboBox;
+  let listRef: HTMLDivElement = null;
 
   $: ref?.clear();
 </script>
@@ -19,6 +20,7 @@
   titleText="Contact"
   placeholder="Select contact method"
   items="{items}"
+  bind:listRef
 />
 
 <ComboBox
diff --git a/tests/ContextMenu.test.svelte b/tests/ContextMenu.test.svelte
index c19f4097..38d63085 100644
--- a/tests/ContextMenu.test.svelte
+++ b/tests/ContextMenu.test.svelte
@@ -9,13 +9,16 @@
   import CopyFile16 from "carbon-icons-svelte/lib/CopyFile16";
   import Cut16 from "carbon-icons-svelte/lib/Cut16";
 
+  let target: HTMLElement = null;
   let selectedId = "0";
   let selectedIds = [];
 
   $: console.log("selectedId", selectedId);
 </script>
 
-<ContextMenu open on:open="{(e) => console.log(e.detail)}">
+<div bind:this="{target}"></div>
+
+<ContextMenu open on:open="{(e) => console.log(e.detail)}" bind:target>
   <ContextMenuOption
     kind="danger"
     indented
diff --git a/types/ComboBox/ComboBox.svelte.d.ts b/types/ComboBox/ComboBox.svelte.d.ts
index fbd90438..eaf5a906 100644
--- a/types/ComboBox/ComboBox.svelte.d.ts
+++ b/types/ComboBox/ComboBox.svelte.d.ts
@@ -135,7 +135,7 @@ export interface ComboBoxProps
    * Obtain a reference to the list HTML element
    * @default null
    */
-  listRef?: null | HTMLDivElement;
+  listRef?: HTMLDivElement;
 }
 
 export default class ComboBox extends SvelteComponentTyped<
diff --git a/types/ContextMenu/ContextMenu.svelte.d.ts b/types/ContextMenu/ContextMenu.svelte.d.ts
index 505265d5..cd0dca1f 100644
--- a/types/ContextMenu/ContextMenu.svelte.d.ts
+++ b/types/ContextMenu/ContextMenu.svelte.d.ts
@@ -8,7 +8,7 @@ export interface ContextMenuProps
    * If no element is specified, the context menu applies to the entire window
    * @default null
    */
-  target?: null | HTMLElement | HTMLElement[];
+  target?: HTMLElement | HTMLElement[];
 
   /**
    * Set to `true` to open the menu
diff --git a/types/DataTable/ToolbarSearch.svelte.d.ts b/types/DataTable/ToolbarSearch.svelte.d.ts
index b3ced787..e9cc8466 100644
--- a/types/DataTable/ToolbarSearch.svelte.d.ts
+++ b/types/DataTable/ToolbarSearch.svelte.d.ts
@@ -37,7 +37,7 @@ export interface ToolbarSearchProps
    * Obtain a reference to the input HTML element
    * @default null
    */
-  ref?: null | HTMLInputElement;
+  ref?: HTMLInputElement;
 }
 
 export default class ToolbarSearch extends SvelteComponentTyped<
diff --git a/types/MultiSelect/MultiSelect.svelte.d.ts b/types/MultiSelect/MultiSelect.svelte.d.ts
index b3abbcb7..f3519dbf 100644
--- a/types/MultiSelect/MultiSelect.svelte.d.ts
+++ b/types/MultiSelect/MultiSelect.svelte.d.ts
@@ -197,13 +197,13 @@ export interface MultiSelectProps
    * Obtain a reference to the field box element
    * @default null
    */
-  fieldRef?: null | HTMLDivElement;
+  fieldRef?: HTMLDivElement;
 
   /**
    * Obtain a reference to the selection element
    * @default null
    */
-  selectionRef?: null | HTMLDivElement;
+  selectionRef?: HTMLDivElement;
 }
 
 export default class MultiSelect extends SvelteComponentTyped<