* 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
This commit is contained in:
Eric Liu 2021-09-11 12:29:26 -07:00 committed by GitHub
commit e4e75e5859
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 6 deletions

View file

@ -4532,9 +4532,10 @@ None.
### Slots
| Slot name | Default | Props | Fallback |
| :-------- | :------ | :---- | :------- |
| -- | Yes | -- | -- |
| Slot name | Default | Props | Fallback |
| :-------- | :------ | :---- | :------------------ |
| -- | Yes | -- | -- |
| cancel | No | -- | <code>Cancel</code> |
### Events

View file

@ -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" }

View file

@ -309,6 +309,7 @@
{/if}
<ListBoxMenuIcon
on:click="{(e) => {
if (disabled) return;
e.stopPropagation();
open = !open;
}}"

View file

@ -51,7 +51,7 @@
tabindex="{showActions ? '0' : '-1'}"
on:click="{ctx.resetSelectedRowIds}"
>
Cancel
<slot name="cancel">Cancel</slot>
</Button>
</div>
</div>

View file

@ -13,5 +13,5 @@ export interface ToolbarBatchActionsProps
export default class ToolbarBatchActions extends SvelteComponentTyped<
ToolbarBatchActionsProps,
{},
{ default: {} }
{ default: {}; cancel: {} }
> {}