Skip to content

Commit fc02aca

Browse files
Merge pull request #7 from harshzalavadiya/ui-improvements
UI Improvements
2 parents 95ff2db + e6178ab commit fc02aca

File tree

8 files changed

+72
-65
lines changed

8 files changed

+72
-65
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const Example: React.FC = () => {
5151
);
5252
};
5353

54-
export default App;
54+
export default Example;
5555
```
5656

5757
## 👀 Props
@@ -93,9 +93,11 @@ You can override css variables to customize appearance
9393
.multi-select {
9494
--rmsc-primary: #4285f4;
9595
--rmsc-hover: #f1f3f5;
96+
--rmsc-selected: #e2e6ea;
9697
--rmsc-border: #ccc;
9798
--rmsc-gray: #aaa;
9899
--rmsc-background: #fff;
100+
--rmsc-spacing: 10px;
99101
--rmsc-border-radius: 4px;
100102
--rmsc-height: 38px;
101103
}

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-multi-select-component",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"description": "Simple and lightweight multiple selection dropdown component with checkboxes, search and select-all",
55
"author": "Harsh Zalavadiya",
66
"license": "MIT",
@@ -27,7 +27,7 @@
2727
"goober": "^1.7.1"
2828
},
2929
"devDependencies": {
30-
"@ampproject/filesize": "^3.2.1",
30+
"@ampproject/filesize": "^4.0.1",
3131
"@babel/core": "^7.9.0",
3232
"@storybook/addon-actions": "^5.3.18",
3333
"@storybook/addon-docs": "^5.3.18",
@@ -37,16 +37,16 @@
3737
"@storybook/addon-storysource": "^5.3.18",
3838
"@storybook/addons": "^5.3.18",
3939
"@storybook/react": "^5.3.18",
40-
"@types/react": "^16.9.32",
40+
"@types/react": "^16.9.34",
4141
"@types/react-dom": "^16.9.6",
4242
"babel-loader": "^8.1.0",
43-
"husky": "^4.2.3",
43+
"husky": "^4.2.5",
4444
"react": "^16.13.1",
4545
"react-docgen-typescript-loader": "^3.7.2",
4646
"react-dom": "^16.13.1",
4747
"react-is": "^16.13.1",
48-
"ts-loader": "^6.2.2",
49-
"tsdx": "^0.13.1",
48+
"ts-loader": "^7.0.1",
49+
"tsdx": "^0.13.2",
5050
"tslib": "^1.11.1",
5151
"typescript": "^3.8.3"
5252
},

src/multi-select/dropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const DropdownContainer = css({
5050

5151
const DropdownHeading = css({
5252
position: "relative",
53-
padding: "0 10px",
53+
padding: "0 var(--rmsc-spacing)",
5454
display: "flex",
5555
alignItems: "center",
5656
justifyContent: "flex-end",

src/multi-select/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ import DropdownHeader from "./header";
99
const MultiSelectBox = css({
1010
"--rmscPrimary": "#4285f4",
1111
"--rmscHover": "#f1f3f5",
12+
"--rmscSelected": "#e2e6ea",
1213
"--rmscBorder": "#ccc",
1314
"--rmscGray": "#aaa",
1415
"--rmscBackground": "#fff",
16+
"--rmscSpacing": "10px",
1517
"--rmscBorderRadius": "4px",
1618
"--rmscHeight": "38px",
1719

src/select-panel/default-item.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ interface IDefaultItemRendererProps {
1111
}
1212

1313
const DefaultRenderer = css({
14-
cursor: "default",
15-
1614
"input,span": {
1715
verticalAalign: "middle",
1816
margin: 0,

src/select-panel/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const SelectSearchContainer = css({
3636
borderBottom: "1px solid var(--rmsc-border)",
3737
input: {
3838
height: "var(--rmsc-height)",
39-
padding: "0 10px",
39+
padding: "0 var(--rmsc-spacing)",
4040
width: "100%",
4141
outline: "none",
4242
border: "0",
@@ -127,7 +127,7 @@ export const SelectPanel = (props: ISelectPanelProps) => {
127127
<input
128128
autoFocus={focusSearchOnOpen}
129129
placeholder={getString("search", overrideStrings)}
130-
type="text"
130+
type="search"
131131
aria-describedby={getString("search", overrideStrings)}
132132
onChange={handleSearchChange}
133133
onFocus={handleSearchFocus}

src/select-panel/select-item.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ const ItemContainer = css({
2121
boxSizing: "border-box",
2222
cursor: "pointer",
2323
display: "block",
24-
padding: "10px",
24+
padding: "var(--rmsc-spacing)",
2525
outline: "0",
26-
"&:hover,&.selected": {
26+
"&:hover": {
2727
background: "var(--rmsc-hover)",
2828
},
29+
"&.selected": {
30+
background: "var(--rmsc-selected)",
31+
},
2932
});
3033

3134
const SelectItem = ({

yarn.lock

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
"@ampproject/filesize@^3.2.1":
6-
version "3.2.1"
7-
resolved "https://registry.yarnpkg.com/@ampproject/filesize/-/filesize-3.2.1.tgz#5ed28338dd6213a72acea14cead69ce34e14f378"
8-
integrity sha512-b5Q0dg0t5fizZMX3qL4SuoUKNQ5i1WCiD4MNAWGokX2hFWPCeroa5UxxPIP2LmORDwtkgcZksZ6QrmiA/AU2Ng==
5+
"@ampproject/filesize@^4.0.1":
6+
version "4.0.1"
7+
resolved "https://registry.yarnpkg.com/@ampproject/filesize/-/filesize-4.0.1.tgz#a969318ec06b440e66f3b16df0f25cb826c2cd30"
8+
integrity sha512-YDaHU5d4RL6xuJV4W+1Eh3QxXtU0Y8i4hdrtRY7OLyG93wfYOLiabkSFbg5HQmxFWqj+NYko/3pjpBiXnEuhdw==
99
dependencies:
1010
bytes "3.1.0"
1111
fast-glob "3.2.2"
@@ -2046,20 +2046,6 @@
20462046
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
20472047
integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
20482048

2049-
"@types/events@*":
2050-
version "3.0.0"
2051-
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
2052-
integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
2053-
2054-
"@types/glob@*":
2055-
version "7.1.1"
2056-
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
2057-
integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
2058-
dependencies:
2059-
"@types/events" "*"
2060-
"@types/minimatch" "*"
2061-
"@types/node" "*"
2062-
20632049
"@types/history@*":
20642050
version "4.7.5"
20652051
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz#527d20ef68571a4af02ed74350164e7a67544860"
@@ -2095,16 +2081,18 @@
20952081
"@types/istanbul-lib-coverage" "*"
20962082
"@types/istanbul-lib-report" "*"
20972083

2084+
"@types/jest@^24.0.15":
2085+
version "24.9.1"
2086+
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz#02baf9573c78f1b9974a5f36778b366aa77bd534"
2087+
integrity sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==
2088+
dependencies:
2089+
jest-diff "^24.3.0"
2090+
20982091
"@types/json-schema@^7.0.3":
20992092
version "7.0.4"
21002093
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
21012094
integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
21022095

2103-
"@types/minimatch@*":
2104-
version "3.0.3"
2105-
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
2106-
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
2107-
21082096
"@types/node@*":
21092097
version "13.11.0"
21102098
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
@@ -2166,29 +2154,29 @@
21662154
dependencies:
21672155
"@types/react" "*"
21682156

2169-
"@types/react@*", "@types/react@^16.9.32":
2157+
"@types/react@*":
21702158
version "16.9.32"
21712159
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383"
21722160
integrity sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ==
21732161
dependencies:
21742162
"@types/prop-types" "*"
21752163
csstype "^2.2.0"
21762164

2165+
"@types/react@^16.9.34":
2166+
version "16.9.34"
2167+
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
2168+
integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==
2169+
dependencies:
2170+
"@types/prop-types" "*"
2171+
csstype "^2.2.0"
2172+
21772173
21782174
version "0.0.8"
21792175
resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
21802176
integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
21812177
dependencies:
21822178
"@types/node" "*"
21832179

2184-
"@types/shelljs@^0.8.5":
2185-
version "0.8.7"
2186-
resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.7.tgz#a2a606b185165abadf8b7995fea5e326e637088e"
2187-
integrity sha512-Mg2qGjLIJIieeJ1/NjswAOY9qXDShLeh6JwpD1NZsvUvI0hxdUCNDpnBXv9YQeugKi2EHU+BqkbUE4jpY4GKmQ==
2188-
dependencies:
2189-
"@types/glob" "*"
2190-
"@types/node" "*"
2191-
21922180
"@types/source-list-map@*":
21932181
version "0.1.2"
21942182
resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
@@ -3720,7 +3708,7 @@ camelcase@^4.1.0:
37203708
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
37213709
integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
37223710

3723-
camelcase@^5.0.0, camelcase@^5.3.1:
3711+
camelcase@^5.0.0, camelcase@^5.2.0, camelcase@^5.3.1:
37243712
version "5.3.1"
37253713
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
37263714
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -3793,6 +3781,14 @@ chalk@^3.0.0:
37933781
ansi-styles "^4.1.0"
37943782
supports-color "^7.1.0"
37953783

3784+
chalk@^4.0.0:
3785+
version "4.0.0"
3786+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
3787+
integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
3788+
dependencies:
3789+
ansi-styles "^4.1.0"
3790+
supports-color "^7.1.0"
3791+
37963792
character-entities-legacy@^1.0.0:
37973793
version "1.1.4"
37983794
resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
@@ -4071,7 +4067,7 @@ commondir@^1.0.1:
40714067
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
40724068
integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
40734069

4074-
compare-versions@^3.5.1:
4070+
compare-versions@^3.6.0:
40754071
version "3.6.0"
40764072
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
40774073
integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
@@ -6385,14 +6381,14 @@ humanize-duration@^3.15.3:
63856381
resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.22.0.tgz#b0b577e2071f231e69b71bfae25e1bb342ffb915"
63866382
integrity sha512-kq2Ncl1E8I7LJtjWhraQS8/LCsdt6fTQ+fwrGJ8dLSNFITW5YQpGWAgPgzjfIErAID7QHv0PA+HZBPfAf6f7IA==
63876383

6388-
husky@^4.2.3:
6389-
version "4.2.3"
6390-
resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.3.tgz#3b18d2ee5febe99e27f2983500202daffbc3151e"
6391-
integrity sha512-VxTsSTRwYveKXN4SaH1/FefRJYCtx+wx04sSVcOpD7N2zjoHxa+cEJ07Qg5NmV3HAK+IRKOyNVpi2YBIVccIfQ==
6384+
husky@^4.2.5:
6385+
version "4.2.5"
6386+
resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36"
6387+
integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==
63926388
dependencies:
6393-
chalk "^3.0.0"
6389+
chalk "^4.0.0"
63946390
ci-info "^2.0.0"
6395-
compare-versions "^3.5.1"
6391+
compare-versions "^3.6.0"
63966392
cosmiconfig "^6.0.0"
63976393
find-versions "^3.2.0"
63986394
opencollective-postinstall "^2.0.2"
@@ -7110,7 +7106,7 @@ jest-config@^24.9.0:
71107106
pretty-format "^24.9.0"
71117107
realpath-native "^1.1.0"
71127108

7113-
jest-diff@^24.9.0:
7109+
jest-diff@^24.3.0, jest-diff@^24.9.0:
71147110
version "24.9.0"
71157111
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
71167112
integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
@@ -10499,6 +10495,11 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
1049910495
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
1050010496
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
1050110497

10498+
semver@^7.1.1:
10499+
version "7.3.2"
10500+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
10501+
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
10502+
1050210503
1050310504
version "0.17.1"
1050410505
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -11483,10 +11484,10 @@ ts-jest@^24.0.2:
1148311484
semver "^5.5"
1148411485
yargs-parser "10.x"
1148511486

11486-
ts-loader@^6.2.2:
11487-
version "6.2.2"
11488-
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.2.tgz#dffa3879b01a1a1e0a4b85e2b8421dc0dfff1c58"
11489-
integrity sha512-HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ==
11487+
ts-loader@^7.0.1:
11488+
version "7.0.1"
11489+
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.1.tgz#ac9ae9eb8f5ebd0aa7b78b44db20691b6e31251b"
11490+
integrity sha512-wdGs9xO8UnwASwbluehzXciBtc9HfGlYA8Aiv856etLmdv8mJfAxCkt3YpS4g7G1IsGxaCVKQ102Qh0zycpeZQ==
1149011491
dependencies:
1149111492
chalk "^2.3.0"
1149211493
enhanced-resolve "^4.0.0"
@@ -11504,10 +11505,10 @@ ts-pnp@^1.1.2:
1150411505
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
1150511506
integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
1150611507

11507-
tsdx@^0.13.1:
11508-
version "0.13.1"
11509-
resolved "https://registry.yarnpkg.com/tsdx/-/tsdx-0.13.1.tgz#6fdfb7f70ecd22462d36c80f538d86f42d364b92"
11510-
integrity sha512-BAp96F6eLZVIk5FETP8kSbkC8sqvDQa0pPMz4euZ8am2aFNzeXNX7DbOxfMxYiwzfyemfUsmyb4p5usVbqM4IQ==
11508+
tsdx@^0.13.2:
11509+
version "0.13.2"
11510+
resolved "https://registry.yarnpkg.com/tsdx/-/tsdx-0.13.2.tgz#e6b0d5e52fadb3dd993c26887b9b75acd438cd05"
11511+
integrity sha512-x+GzQ/BEiaJvmfxoDqr0iJOwla6VxMllbAmJXrJbn/l9GGG/G188S3r6fgoDoAIYiqXdYEZdqEuLFCGj5WBSmQ==
1151111512
dependencies:
1151211513
"@babel/core" "^7.4.4"
1151311514
"@babel/helper-module-imports" "^7.0.0"
@@ -11523,7 +11524,7 @@ tsdx@^0.13.1:
1152311524
"@rollup/plugin-json" "^4.0.0"
1152411525
"@rollup/plugin-node-resolve" "^7.1.0"
1152511526
"@rollup/plugin-replace" "^2.2.1"
11526-
"@types/shelljs" "^0.8.5"
11527+
"@types/jest" "^24.0.15"
1152711528
"@typescript-eslint/eslint-plugin" "^2.12.0"
1152811529
"@typescript-eslint/parser" "^2.12.0"
1152911530
ansi-escapes "^4.2.1"
@@ -11536,7 +11537,7 @@ tsdx@^0.13.1:
1153611537
babel-plugin-transform-rename-import "^2.3.0"
1153711538
babel-traverse "^6.26.0"
1153811539
babylon "^6.18.0"
11539-
camelcase "^5.0.0"
11540+
camelcase "^5.2.0"
1154011541
chalk "^2.4.2"
1154111542
enquirer "^2.3.4"
1154211543
eslint "^6.1.0"
@@ -11564,6 +11565,7 @@ tsdx@^0.13.1:
1156411565
rollup-plugin-terser "^5.1.2"
1156511566
rollup-plugin-typescript2 "^0.26.0"
1156611567
sade "^1.4.2"
11568+
semver "^7.1.1"
1156711569
shelljs "^0.8.3"
1156811570
tiny-glob "^0.2.6"
1156911571
ts-jest "^24.0.2"

0 commit comments

Comments
 (0)