From e4e75e5859d8ba245a5f19c9caeb83e5b18a44b2 Mon Sep 17 00:00:00 2001
From: Eric Liu <ericyl.us@gmail.com>
Date: Sat, 11 Sep 2021 12:29:26 -0700
Subject: [PATCH] Fixes (#814)

* fix(combo-box): clicking chevron should not open the combo box if disabled

Fixes #776

* fix(toolbar-batch-actions): cancel text should be slottable

Fixes #782
---
 COMPONENT_INDEX.md                       |  7 ++++---
 docs/src/COMPONENT_API.json              | 10 +++++++++-
 src/ComboBox/ComboBox.svelte             |  1 +
 src/DataTable/ToolbarBatchActions.svelte |  2 +-
 types/DataTable/ToolbarBatchActions.d.ts |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/COMPONENT_INDEX.md b/COMPONENT_INDEX.md
index 4231168c..047bc719 100644
--- a/COMPONENT_INDEX.md
+++ b/COMPONENT_INDEX.md
@@ -4532,9 +4532,10 @@ None.
 
 ### Slots
 
-| Slot name | Default | Props | Fallback |
-| :-------- | :------ | :---- | :------- |
-| --        | Yes     | --    | --       |
+| Slot name | Default | Props | Fallback            |
+| :-------- | :------ | :---- | :------------------ |
+| --        | Yes     | --    | --                  |
+| cancel    | No      | --    | <code>Cancel</code> |
 
 ### Events
 
diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index 89191d30..82788382 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -12541,7 +12541,15 @@
           "reactive": false
         }
       ],
-      "slots": [{ "name": "__default__", "default": true, "slot_props": "{}" }],
+      "slots": [
+        { "name": "__default__", "default": true, "slot_props": "{}" },
+        {
+          "name": "cancel",
+          "default": false,
+          "fallback": "Cancel",
+          "slot_props": "{}"
+        }
+      ],
       "events": [],
       "typedefs": [],
       "rest_props": { "type": "Element", "name": "div" }
diff --git a/src/ComboBox/ComboBox.svelte b/src/ComboBox/ComboBox.svelte
index 0c85abd4..47c41c36 100644
--- a/src/ComboBox/ComboBox.svelte
+++ b/src/ComboBox/ComboBox.svelte
@@ -309,6 +309,7 @@
       {/if}
       <ListBoxMenuIcon
         on:click="{(e) => {
+          if (disabled) return;
           e.stopPropagation();
           open = !open;
         }}"
diff --git a/src/DataTable/ToolbarBatchActions.svelte b/src/DataTable/ToolbarBatchActions.svelte
index fb1b2e7e..edc0169c 100644
--- a/src/DataTable/ToolbarBatchActions.svelte
+++ b/src/DataTable/ToolbarBatchActions.svelte
@@ -51,7 +51,7 @@
         tabindex="{showActions ? '0' : '-1'}"
         on:click="{ctx.resetSelectedRowIds}"
       >
-        Cancel
+        <slot name="cancel">Cancel</slot>
       </Button>
     </div>
   </div>
diff --git a/types/DataTable/ToolbarBatchActions.d.ts b/types/DataTable/ToolbarBatchActions.d.ts
index e046a567..3c1f46a6 100644
--- a/types/DataTable/ToolbarBatchActions.d.ts
+++ b/types/DataTable/ToolbarBatchActions.d.ts
@@ -13,5 +13,5 @@ export interface ToolbarBatchActionsProps
 export default class ToolbarBatchActions extends SvelteComponentTyped<
   ToolbarBatchActionsProps,
   {},
-  { default: {} }
+  { default: {}; cancel: {} }
 > {}