Skip to content

Commit df12d30

Browse files
Merge branch 'master' into eslint-fix
2 parents 917424b + 075b8dc commit df12d30

File tree

6 files changed

+84
-11
lines changed

6 files changed

+84
-11
lines changed

package-lock.json

Lines changed: 15 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sistent/sistent",
3-
"version": "0.0.1",
3+
"version": "0.16.5",
44
"description": "Reusable React Components and SVG Icons library",
55
"repository": {
66
"type": "git",

src/custom/UserSearchField/UserSearchFieldInput.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ interface UserSearchFieldProps {
3535
setDisableSave?: (disable: boolean) => void;
3636
handleNotifyPref?: () => void;
3737
notifyUpdate?: boolean;
38+
showNotifyCheckbox?: boolean;
3839
isCreate?: boolean;
3940
searchType?: string;
4041
disabled?: boolean;
@@ -53,6 +54,7 @@ const UserSearchField: React.FC<UserSearchFieldProps> = ({
5354
setDisableSave,
5455
handleNotifyPref,
5556
notifyUpdate,
57+
showNotifyCheckbox = true,
5658
isCreate,
5759
searchType,
5860
disabled = false,
@@ -229,7 +231,7 @@ const UserSearchField: React.FC<UserSearchFieldProps> = ({
229231
</li>
230232
)}
231233
/>
232-
{!isCreate && (
234+
{showNotifyCheckbox && !isCreate && handleNotifyPref && (
233235
<FormGroup row={true}>
234236
<div style={{ display: 'flex', flexWrap: 'nowrap' }}>
235237
<FormControlLabel
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
import React from 'react';
2+
import { SlackIconProps } from './types';
3+
4+
const SlackIcon: React.FC<SlackIconProps> = ({
5+
width = 40,
6+
height = 40,
7+
primaryColor = '#E01E5A',
8+
secondaryColor = '#36C5F0',
9+
tertiaryColor = '#2EB67D',
10+
quaternaryColor = '#ECB22E',
11+
style
12+
}) => (
13+
<svg
14+
width={width}
15+
height={height}
16+
viewBox="0 0 24 24"
17+
fill="none"
18+
xmlns="http://www.w3.org/2000/svg"
19+
style={style}
20+
>
21+
<path
22+
d="m8.843 12.651c-1.392 0-2.521 1.129-2.521 2.521v6.306c0 1.392 1.129 2.521 2.521 2.521s2.521-1.129 2.521-2.521v-6.306c-.001-1.392-1.13-2.521-2.521-2.521z"
23+
fill={primaryColor}
24+
/>
25+
<path
26+
d="m.019 15.172c0 1.393 1.13 2.523 2.523 2.523s2.523-1.13 2.523-2.523v-2.523h-2.521c-.001 0-.001 0-.002 0-1.393 0-2.523 1.13-2.523 2.523z"
27+
fill={secondaryColor}
28+
/>
29+
<path
30+
d="m8.846-.001c-.001 0-.002 0-.003 0-1.393 0-2.523 1.13-2.523 2.523s1.13 2.523 2.523 2.523h2.521v-2.523c0-.001 0-.003 0-.005-.001-1.391-1.128-2.518-2.518-2.518z"
31+
fill={tertiaryColor}
32+
/>
33+
<path
34+
d="m2.525 11.37h6.318c1.393 0 2.523-1.13 2.523-2.523s-1.13-2.523-2.523-2.523h-6.318c-1.393 0-2.523 1.13-2.523 2.523s1.13 2.523 2.523 2.523z"
35+
fill={quaternaryColor}
36+
/>
37+
<path
38+
d="m21.457 6.323c-1.391 0-2.518 1.127-2.518 2.518v.005 2.523h2.521c1.393 0 2.523-1.13 2.523-2.523s-1.13-2.523-2.523-2.523c-.001 0-.002 0-.003 0z"
39+
fill={primaryColor}
40+
/>
41+
<path
42+
d="m12.641 2.522v6.325c0 1.392 1.129 2.521 2.521 2.521s2.521-1.129 2.521-2.521v-6.325c0-1.392-1.129-2.521-2.521-2.521-1.392 0-2.521 1.129-2.521 2.521z"
43+
fill={secondaryColor}
44+
/>
45+
<path
46+
d="m17.682 21.476c0-1.392-1.129-2.521-2.521-2.521h-2.521v2.523c.001 1.391 1.129 2.519 2.521 2.519s2.521-1.129 2.521-2.521z"
47+
fill={tertiaryColor}
48+
/>
49+
<path
50+
d="m21.479 12.649h-6.318c-1.393 0-2.523 1.13-2.523 2.523s1.13 2.523 2.523 2.523h6.318c1.393 0 2.523-1.13 2.523-2.523s-1.13-2.523-2.523-2.523z"
51+
fill={quaternaryColor}
52+
/>
53+
</svg>
54+
);
55+
56+
export default SlackIcon;

src/icons/SocialMedial/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import FacebookIcon from './FacebookIcon';
22
import LinkedinIcon from './LinkedinIcon';
3+
import SlackIcon from './SlackIcon';
34
import TwitterIcon from './TwitterIcon';
45

5-
export { FacebookIcon, LinkedinIcon, TwitterIcon };
6+
export { FacebookIcon, LinkedinIcon, SlackIcon, TwitterIcon };

src/icons/SocialMedial/types.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,10 @@ export interface IconProps {
44
fill?: string;
55
style?: React.CSSProperties;
66
}
7+
8+
export interface SlackIconProps extends IconProps {
9+
primaryColor?: string;
10+
secondaryColor?: string;
11+
tertiaryColor?: string;
12+
quaternaryColor?: string;
13+
}

0 commit comments

Comments
 (0)