Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export default Example;
| `valueRenderer` | custom dropdown header [docs](#-custom-value-renderer) | `function` | |
| `ItemRenderer` | custom dropdown option [docs](#-custom-item-renderer) | `function` | |
| `ClearIcon` | Custom Clear Icon for Search | `string|function` | |
| `ClearSelectedIcon` | Custom Clear Icon for Selected Items | `string|function` | |

## 🔍 Custom filter logic

Expand Down
1 change: 1 addition & 0 deletions src/lib/get-string.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const strings = {
selectAll: "Select All",
search: "Search",
clearSearch: "Clear Search",
clearSelected: "Clear Selected",
};

export default function getString(key: string, overrideStrings?): string {
Expand Down
1 change: 1 addition & 0 deletions src/lib/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ export interface ISelectProps {
className?: string;
onMenuToggle?;
ClearIcon?: string | Function;
ClearSelectedIcon?: string | Function;
}
29 changes: 29 additions & 0 deletions src/multi-select/dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import { css } from "goober";
import React, { useEffect, useRef, useState } from "react";

import getString from "../lib/get-string";
import Cross from "../select-panel/cross";
import Arrow from "./arrow";
import Loading from "./loading";

Expand All @@ -19,6 +21,7 @@ interface IDropdownProps {
labelledBy?: string;
onMenuToggle?;
ArrowRenderer?;
ClearSelectedIcon?;
}

const PanelContainer = css({
Expand Down Expand Up @@ -65,6 +68,13 @@ const DropdownHeading = css({
},
});

const ClearSelectedButton = css({
cursor: "pointer",
background: "none",
border: 0,
padding: 0,
});

const Dropdown = ({
children,
contentComponent: ContentComponent,
Expand All @@ -75,6 +85,7 @@ const Dropdown = ({
labelledBy,
onMenuToggle,
ArrowRenderer,
ClearSelectedIcon,
}: IDropdownProps) => {
const [expanded, setExpanded] = useState(false);
const [hasFocus, setHasFocus] = useState(false);
Expand Down Expand Up @@ -125,6 +136,11 @@ const Dropdown = ({
const toggleExpanded = () =>
setExpanded(isLoading || disabled ? false : !expanded);

const handleClearSelected = (e) => {
e.stopPropagation();
contentProps["onChange"]([]);
};

return (
<div
tabIndex={0}
Expand All @@ -146,6 +162,19 @@ const Dropdown = ({
>
<div className="dropdown-heading-value">{children}</div>
{isLoading && <Loading />}
{contentProps["value"].length > 0 && (
<button
type="button"
className={`${ClearSelectedButton} clear-selected-button`}
onClick={handleClearSelected}
aria-label={getString(
"clearSelected",
contentProps["overrideStrings"]
)}
>
{ClearSelectedIcon || <Cross />}
</button>
)}
<FinalArrow expanded={expanded} />
</div>
{expanded && (
Expand Down
2 changes: 2 additions & 0 deletions src/multi-select/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const MultiSelect = ({
labelledBy,
onMenuToggle,
ClearIcon,
ClearSelectedIcon,
}: ISelectProps) => {
const nvalue = value || [];
return (
Expand All @@ -72,6 +73,7 @@ const MultiSelect = ({
labelledBy={labelledBy}
onMenuToggle={onMenuToggle}
ArrowRenderer={ArrowRenderer}
ClearSelectedIcon={ClearSelectedIcon}
>
<DropdownHeader
value={nvalue}
Expand Down