@fluentui-react-native/experimental-avatar 0.14.41 → 0.14.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.json +52 -1
- package/CHANGELOG.md +27 -2
- package/FRNAvatar.podspec +0 -2
- package/MIGRATION.md +1 -2
- package/SPEC.md +1 -11
- package/lib/JSAvatar.d.ts +2 -2
- package/lib/JSAvatar.d.ts.map +1 -1
- package/lib/JSAvatar.js +17 -8
- package/lib/JSAvatar.js.map +1 -1
- package/lib/JSAvatar.styling.d.ts.map +1 -1
- package/lib/JSAvatar.styling.js +69 -25
- package/lib/JSAvatar.styling.js.map +1 -1
- package/lib/JSAvatar.types.d.ts +43 -22
- package/lib/JSAvatar.types.d.ts.map +1 -1
- package/lib/JSAvatarTokens.d.ts.map +1 -1
- package/lib/JSAvatarTokens.js +0 -2
- package/lib/JSAvatarTokens.js.map +1 -1
- package/lib/JSAvatarTokens.win32.d.ts.map +1 -1
- package/lib/JSAvatarTokens.win32.js +0 -2
- package/lib/JSAvatarTokens.win32.js.map +1 -1
- package/lib/useAvatar.d.ts +3 -5
- package/lib/useAvatar.d.ts.map +1 -1
- package/lib/useAvatar.js +27 -17
- package/lib/useAvatar.js.map +1 -1
- package/lib-commonjs/JSAvatar.d.ts +2 -2
- package/lib-commonjs/JSAvatar.d.ts.map +1 -1
- package/lib-commonjs/JSAvatar.js +16 -7
- package/lib-commonjs/JSAvatar.js.map +1 -1
- package/lib-commonjs/JSAvatar.styling.d.ts.map +1 -1
- package/lib-commonjs/JSAvatar.styling.js +69 -25
- package/lib-commonjs/JSAvatar.styling.js.map +1 -1
- package/lib-commonjs/JSAvatar.types.d.ts +43 -22
- package/lib-commonjs/JSAvatar.types.d.ts.map +1 -1
- package/lib-commonjs/JSAvatarTokens.d.ts.map +1 -1
- package/lib-commonjs/JSAvatarTokens.js +0 -2
- package/lib-commonjs/JSAvatarTokens.js.map +1 -1
- package/lib-commonjs/JSAvatarTokens.win32.d.ts.map +1 -1
- package/lib-commonjs/JSAvatarTokens.win32.js +0 -2
- package/lib-commonjs/JSAvatarTokens.win32.js.map +1 -1
- package/lib-commonjs/useAvatar.d.ts +3 -5
- package/lib-commonjs/useAvatar.d.ts.map +1 -1
- package/lib-commonjs/useAvatar.js +29 -19
- package/lib-commonjs/useAvatar.js.map +1 -1
- package/package.json +2 -2
- package/src/JSAvatar.styling.ts +74 -32
- package/src/JSAvatar.tsx +40 -24
- package/src/JSAvatar.types.ts +51 -24
- package/src/JSAvatarTokens.ts +0 -2
- package/src/JSAvatarTokens.win32.ts +0 -2
- package/src/__tests__/JSAvatar.test.jsx +48 -77
- package/src/__tests__/__snapshots__/JSAvatar.test.jsx.snap +52 -55
- package/src/useAvatar.ts +32 -16
- package/lib/JSAvatar.helpers.d.ts +0 -7
- package/lib/JSAvatar.helpers.d.ts.map +0 -1
- package/lib/JSAvatar.helpers.js +0 -28
- package/lib/JSAvatar.helpers.js.map +0 -1
- package/lib/utils/getInitials.d.ts +0 -15
- package/lib/utils/getInitials.d.ts.map +0 -1
- package/lib/utils/getInitials.js +0 -78
- package/lib/utils/getInitials.js.map +0 -1
- package/lib/utils/getInitials.test.d.ts +0 -2
- package/lib/utils/getInitials.test.d.ts.map +0 -1
- package/lib/utils/getInitials.test.js +0 -116
- package/lib/utils/getInitials.test.js.map +0 -1
- package/lib/utils/index.d.ts +0 -2
- package/lib/utils/index.d.ts.map +0 -1
- package/lib/utils/index.js +0 -2
- package/lib/utils/index.js.map +0 -1
- package/lib-commonjs/JSAvatar.helpers.d.ts +0 -7
- package/lib-commonjs/JSAvatar.helpers.d.ts.map +0 -1
- package/lib-commonjs/JSAvatar.helpers.js +0 -32
- package/lib-commonjs/JSAvatar.helpers.js.map +0 -1
- package/lib-commonjs/utils/getInitials.d.ts +0 -15
- package/lib-commonjs/utils/getInitials.d.ts.map +0 -1
- package/lib-commonjs/utils/getInitials.js +0 -82
- package/lib-commonjs/utils/getInitials.js.map +0 -1
- package/lib-commonjs/utils/getInitials.test.d.ts +0 -2
- package/lib-commonjs/utils/getInitials.test.d.ts.map +0 -1
- package/lib-commonjs/utils/getInitials.test.js +0 -118
- package/lib-commonjs/utils/getInitials.test.js.map +0 -1
- package/lib-commonjs/utils/index.d.ts +0 -2
- package/lib-commonjs/utils/index.d.ts.map +0 -1
- package/lib-commonjs/utils/index.js +0 -6
- package/lib-commonjs/utils/index.js.map +0 -1
- package/src/JSAvatar.helpers.ts +0 -35
- package/src/utils/getInitials.test.ts +0 -154
- package/src/utils/getInitials.ts +0 -92
- package/src/utils/index.ts +0 -1
package/src/JSAvatarTokens.ts
CHANGED
|
@@ -5,8 +5,6 @@ import { globalTokens } from '@fluentui-react-native/theme-tokens';
|
|
|
5
5
|
|
|
6
6
|
export const defaultJSAvatarTokens: TokenSettings<JSAvatarTokens, Theme> = (t: Theme) =>
|
|
7
7
|
({
|
|
8
|
-
horizontalIconAlignment: 'end',
|
|
9
|
-
verticalIconAlignment: 'end',
|
|
10
8
|
color: t.colors.neutralForeground3,
|
|
11
9
|
backgroundColor: t.colors.neutralBackground6,
|
|
12
10
|
avatarOpacity: 1,
|
|
@@ -6,8 +6,6 @@ import { globalTokens } from '@fluentui-react-native/theme-tokens';
|
|
|
6
6
|
export const defaultJSAvatarTokens: TokenSettings<JSAvatarTokens, Theme> = (t: Theme) =>
|
|
7
7
|
({
|
|
8
8
|
badgeSize: 'smallest',
|
|
9
|
-
horizontalIconAlignment: 'end',
|
|
10
|
-
verticalIconAlignment: 'end',
|
|
11
9
|
color: t.colors.neutralForeground3,
|
|
12
10
|
backgroundColor: t.colors.neutralBackground6,
|
|
13
11
|
avatarOpacity: 1,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { JSAvatar } from '..';
|
|
3
|
-
import { getInitials
|
|
3
|
+
import { getInitials } from '../useAvatar';
|
|
4
4
|
import * as renderer from 'react-test-renderer';
|
|
5
5
|
|
|
6
6
|
const alphabeticalTestNames = [
|
|
@@ -18,7 +18,6 @@ const alphabeticalTestNames = [
|
|
|
18
18
|
'Richard Feynman {Teams}',
|
|
19
19
|
];
|
|
20
20
|
const alphabeticalInitials = ['M', 'AK', 'MB', 'AK', 'AK', 'WL', 'WL', 'AK', 'RF', 'R', 'RF', 'RF'];
|
|
21
|
-
const otherTestNames = ['(206) 123-4567', '耿盈盈']; // will return this case after bug bash - '耿 James'
|
|
22
21
|
const namesWithTitles = ['Mr Feynman', 'Dr Richard Feynman'];
|
|
23
22
|
const initialsForNameWithTitles = ['F', 'RF'];
|
|
24
23
|
|
|
@@ -29,130 +28,102 @@ describe('Avatar rendering', () => {
|
|
|
29
28
|
});
|
|
30
29
|
});
|
|
31
30
|
|
|
32
|
-
describe('
|
|
33
|
-
it('
|
|
34
|
-
|
|
35
|
-
expect(validateAlphabeticalCharacters(alphabeticalTestNames[i])).toBeTruthy();
|
|
36
|
-
}
|
|
37
|
-
for (let i = 0; i < otherTestNames.length; i++) {
|
|
38
|
-
expect(validateAlphabeticalCharacters(otherTestNames[i])).toBeFalsy();
|
|
39
|
-
}
|
|
31
|
+
describe('getInitials - names with titles', () => {
|
|
32
|
+
it('returns initials without title', () => {
|
|
33
|
+
expect(getInitials('Mr Faynman')).toBe('F');
|
|
40
34
|
});
|
|
35
|
+
it('returns initials for names with multi-word titles', () => {
|
|
36
|
+
expect(getInitials('Consul General Richard Faynman')).toBe('RF');
|
|
37
|
+
expect(getInitials('Major General Victor')).toBe('V');
|
|
38
|
+
});
|
|
39
|
+
});
|
|
41
40
|
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
describe('getInitials method - language support', () => {
|
|
42
|
+
it('returns correct initials cyrillic language', () => {
|
|
43
|
+
const test = getInitials('Илон Маск');
|
|
44
|
+
expect(test).toBe('ИМ');
|
|
44
45
|
});
|
|
45
|
-
it(
|
|
46
|
-
|
|
46
|
+
it('calculates correct initials for non-ASCII characters', () => {
|
|
47
|
+
const test = getInitials('Írissa Þórðardóttir');
|
|
48
|
+
expect(test).toBe('ÍÞ');
|
|
47
49
|
});
|
|
48
|
-
it(
|
|
49
|
-
|
|
50
|
+
it('returns correct initials for non-ASCII characters', () => {
|
|
51
|
+
const test = getInitials('Øyvind Åsen');
|
|
52
|
+
expect(test).toBe('ØÅ');
|
|
50
53
|
});
|
|
51
54
|
});
|
|
52
55
|
|
|
53
|
-
describe('removeTitlesFromName method', () => {
|
|
54
|
-
it('removes titles from the name', () => {
|
|
55
|
-
const words = ['Mr', 'Faynman'];
|
|
56
|
-
expect(removeTitlesFromName(words)).toStrictEqual(['Faynman']);
|
|
57
|
-
});
|
|
58
|
-
// it('removes multiword titles from the name', () => {
|
|
59
|
-
// const name = 'Consul General Richard Faynman';
|
|
60
|
-
// expect(removeTitlesFromName(name)).toStrictEqual(['Richard Faynman']);
|
|
61
|
-
// });
|
|
62
|
-
});
|
|
63
|
-
|
|
64
56
|
describe('getInitials method', () => {
|
|
65
57
|
it('returns correct initials', () => {
|
|
66
58
|
const test = getInitials('-Test str with *spaces');
|
|
67
59
|
expect(test).toBe('TS');
|
|
68
60
|
});
|
|
69
|
-
|
|
70
61
|
it('returns an empty string if name is undefined', () => {
|
|
71
62
|
expect(getInitials(undefined)).toBe('');
|
|
72
63
|
});
|
|
73
|
-
|
|
74
64
|
it('return initials for alphabetical words', () => {
|
|
75
65
|
for (let i = 0; i < alphabeticalTestNames.length; i++) {
|
|
76
66
|
expect(getInitials(alphabeticalTestNames[i])).toBe(alphabeticalInitials[i]);
|
|
77
67
|
}
|
|
78
68
|
});
|
|
79
|
-
|
|
80
69
|
it('return initials for words with titles', () => {
|
|
81
70
|
for (let i = 0; i < namesWithTitles.length; i++) {
|
|
82
71
|
expect(getInitials(namesWithTitles[i])).toBe(initialsForNameWithTitles[i]);
|
|
83
72
|
}
|
|
84
73
|
});
|
|
85
|
-
|
|
86
74
|
it("returns initials when there's a coma", () => {
|
|
87
75
|
expect(getInitials('Second, First')).toEqual('SF');
|
|
88
76
|
});
|
|
89
|
-
|
|
90
77
|
// Unit tests from Web
|
|
91
78
|
it('handles null inputs', () => {
|
|
92
79
|
expect(getInitials(null)).toEqual('');
|
|
93
80
|
expect(getInitials(undefined)).toEqual('');
|
|
94
81
|
});
|
|
95
|
-
|
|
96
|
-
// it('calculates an expected initials in LTR for non-ASCII characters', () => {
|
|
97
|
-
// expect(getInitials('Írissa Þórðardóttir')).toEqual('ÍÞ');
|
|
98
|
-
// expect(getInitials('Øyvind Åsen')).toEqual('ØÅ');
|
|
99
|
-
// });
|
|
100
|
-
|
|
101
82
|
it('calculates an expected initials in LTR with a hypen', () => {
|
|
102
83
|
expect(getInitials('David Zearing-Goff')).toEqual('DZ');
|
|
103
84
|
});
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
// });
|
|
85
|
+
it('calculates an expected initials in LTR with numbers', () => {
|
|
86
|
+
expect(getInitials('4lex 5loo')).toEqual('LL');
|
|
87
|
+
});
|
|
108
88
|
it('calculates an expected initials in LTR with multiple parentheses, extra spaces, and unwanted characters', () => {
|
|
109
89
|
const result = getInitials(' !@#$%^&*()=+ (Alpha) David (The man) `~<>,./?[]{}| Goff (Gamma) ');
|
|
110
90
|
expect(result).toEqual('DG');
|
|
111
91
|
});
|
|
112
|
-
|
|
113
92
|
it('calculates an expected initials in LTR with multiple types of unwanted text', () => {
|
|
114
|
-
const result = getInitials(
|
|
93
|
+
const result = getInitials(" !@#$%^&*()=+ (Alpha) /David (The man) `~<>,./?[]{}| 'Goff (Gamma) [Beta] ");
|
|
115
94
|
expect(result).toEqual('DG');
|
|
116
95
|
});
|
|
117
|
-
|
|
118
96
|
it('calculates an expected initials for Arabic names', () => {
|
|
119
|
-
expect(getInitials('خسرو رحیمی')).toEqual('');
|
|
97
|
+
expect(getInitials('خسرو رحیمی')).toEqual('خ');
|
|
120
98
|
});
|
|
121
|
-
|
|
122
99
|
it('calculates an expected initials for Chinese names', () => {
|
|
123
|
-
expect(getInitials('桂英')).toEqual('');
|
|
124
|
-
expect(getInitials('佳')).toEqual('');
|
|
125
|
-
expect(getInitials('宋智洋')).toEqual('');
|
|
100
|
+
expect(getInitials('桂英')).toEqual('桂');
|
|
101
|
+
expect(getInitials('佳')).toEqual('佳');
|
|
102
|
+
expect(getInitials('宋智洋')).toEqual('宋');
|
|
126
103
|
});
|
|
127
|
-
|
|
128
104
|
it('calculates an expected initials for Korean names', () => {
|
|
129
|
-
expect(getInitials('강현')).toEqual('');
|
|
130
|
-
expect(getInitials('최종래')).toEqual('');
|
|
131
|
-
expect(getInitials('남궁 성종')).toEqual('');
|
|
105
|
+
expect(getInitials('강현')).toEqual('강');
|
|
106
|
+
expect(getInitials('최종래')).toEqual('최');
|
|
107
|
+
expect(getInitials('남궁 성종')).toEqual('남');
|
|
132
108
|
});
|
|
133
|
-
|
|
134
109
|
it('calculates an expected initials for Japanese names', () => {
|
|
135
|
-
expect(getInitials('松田')).toEqual('');
|
|
136
|
-
expect(getInitials('海野')).toEqual('');
|
|
137
|
-
expect(getInitials('かり')).toEqual('');
|
|
110
|
+
expect(getInitials('松田')).toEqual('松');
|
|
111
|
+
expect(getInitials('海野')).toEqual('海');
|
|
112
|
+
expect(getInitials('かり')).toEqual('か');
|
|
113
|
+
});
|
|
114
|
+
it('validates phone numbers', () => {
|
|
115
|
+
expect(getInitials('12345678')).toEqual('');
|
|
116
|
+
// expect(getInitials('+1 (555) 123-4567 ext.4567')).toEqual('');
|
|
117
|
+
expect(getInitials('+47 12 34 56 78 (X 5678)')).toEqual('');
|
|
118
|
+
expect(getInitials('47 12 34')).toEqual('');
|
|
119
|
+
expect(getInitials('47 12')).toEqual('');
|
|
120
|
+
|
|
121
|
+
expect(getInitials('James Ext 2')).toEqual('JE');
|
|
122
|
+
// expect(getInitials('1 Ext 2')).toEqual('');
|
|
123
|
+
// expect(getInitials('1x1')).toEqual('');
|
|
124
|
+
result = getInitials('1');
|
|
125
|
+
expect(result).toEqual('');
|
|
126
|
+
result = getInitials('A 2');
|
|
127
|
+
expect(result).toEqual('A');
|
|
138
128
|
});
|
|
139
|
-
|
|
140
|
-
// it('validates phone numbers', () => {
|
|
141
|
-
// expect(getInitials('12345678')).toEqual('');
|
|
142
|
-
// expect(getInitials('+1 (555) 123-4567 ext.4567')).toEqual('');
|
|
143
|
-
// expect(getInitials('+47 12 34 56 78 (X 5678)')).toEqual('4');
|
|
144
|
-
// expect(getInitials('47 12 34')).toEqual('');
|
|
145
|
-
// expect(getInitials('47 12')).toEqual('');
|
|
146
|
-
// expect(getInitials('1 Ext 2')).toEqual('');
|
|
147
|
-
// result = getInitials('James Ext 2');
|
|
148
|
-
// expect(result).toEqual('JE');
|
|
149
|
-
// result = getInitials('1x1');
|
|
150
|
-
// expect(result).toEqual('');
|
|
151
|
-
// result = getInitials('1y1');
|
|
152
|
-
// expect(result).toEqual('');
|
|
153
|
-
// result = getInitials('1');
|
|
154
|
-
// expect(result).toEqual('');
|
|
155
|
-
// result = getInitials('A 2');
|
|
156
|
-
// expect(result).toEqual('A');
|
|
157
|
-
// });
|
|
158
129
|
});
|
|
@@ -5,16 +5,15 @@ exports[`Avatar rendering renders Avatar 1`] = `
|
|
|
5
5
|
accessibilityLabel=""
|
|
6
6
|
accessibilityRole="image"
|
|
7
7
|
accessible={true}
|
|
8
|
+
icon={null}
|
|
9
|
+
initials=""
|
|
8
10
|
shape="circular"
|
|
9
11
|
style={
|
|
10
12
|
Object {
|
|
11
|
-
"alignItems": "
|
|
12
|
-
"flexDirection": "row",
|
|
13
|
+
"alignItems": "center",
|
|
13
14
|
"height": 24,
|
|
14
|
-
"
|
|
15
|
-
"justifyContent": "flex-end",
|
|
15
|
+
"justifyContent": "center",
|
|
16
16
|
"opacity": 1,
|
|
17
|
-
"verticalIconAlignment": "end",
|
|
18
17
|
"width": 24,
|
|
19
18
|
}
|
|
20
19
|
}
|
|
@@ -24,73 +23,71 @@ exports[`Avatar rendering renders Avatar 1`] = `
|
|
|
24
23
|
style={
|
|
25
24
|
Object {
|
|
26
25
|
"alignItems": "center",
|
|
27
|
-
"alignSelf": "stretch",
|
|
28
26
|
"backgroundColor": "#e6e6e6",
|
|
29
27
|
"borderColor": "#ffffff",
|
|
30
28
|
"borderRadius": 9999,
|
|
31
29
|
"borderWidth": 0,
|
|
32
|
-
"flexGrow": 1,
|
|
33
30
|
"height": 24,
|
|
34
31
|
"justifyContent": "center",
|
|
32
|
+
"marginLeft": 2,
|
|
33
|
+
"marginTop": 2,
|
|
35
34
|
"width": 24,
|
|
36
35
|
}
|
|
37
36
|
}
|
|
38
37
|
>
|
|
39
|
-
<
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
bbWidth={14}
|
|
43
|
-
fill="none"
|
|
44
|
-
focusable={false}
|
|
45
|
-
height={16}
|
|
46
|
-
meetOrSlice={0}
|
|
47
|
-
minX={0}
|
|
48
|
-
minY={0}
|
|
38
|
+
<View
|
|
39
|
+
accessibilityRole="image"
|
|
40
|
+
accessible={false}
|
|
49
41
|
style={
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
"flex": 0,
|
|
57
|
-
"height": 16,
|
|
58
|
-
"width": 14,
|
|
59
|
-
},
|
|
60
|
-
]
|
|
42
|
+
Object {
|
|
43
|
+
"fontSize": 16,
|
|
44
|
+
"height": 16,
|
|
45
|
+
"position": "absolute",
|
|
46
|
+
"width": 16,
|
|
47
|
+
}
|
|
61
48
|
}
|
|
62
|
-
vbHeight={16}
|
|
63
|
-
vbWidth={14}
|
|
64
|
-
width={14}
|
|
65
|
-
xml="<svg width=\\"14\\" height=\\"16\\" viewBox=\\"0 0 14 16\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\">
|
|
66
|
-
<path d=\\"M7 0C4.79086 0 3 1.79086 3 4C3 6.20914 4.79086 8 7 8C9.20914 8 11 6.20914 11 4C11 1.79086 9.20914 0 7 0ZM4 4C4 2.34315 5.34315 1 7 1C8.65685 1 10 2.34315 10 4C10 5.65685 8.65685 7 7 7C5.34315 7 4 5.65685 4 4ZM2.00873 9C0.903151 9 0 9.88687 0 11C0 12.6912 0.83281 13.9663 2.13499 14.7966C3.41697 15.614 5.14526 16 7 16C8.85474 16 10.583 15.614 11.865 14.7966C13.1672 13.9663 14 12.6912 14 11C14 9.89557 13.1045 9.00001 12 9.00001L2.00873 9ZM1 11C1 10.4467 1.44786 10 2.00873 10L12 10C12.5522 10 13 10.4478 13 11C13 12.3088 12.3777 13.2837 11.3274 13.9534C10.2568 14.636 8.73511 15 7 15C5.26489 15 3.74318 14.636 2.67262 13.9534C1.62226 13.2837 1 12.3088 1 11Z\\" fill=\\"currentColor\\"/>
|
|
67
|
-
</svg>
|
|
68
|
-
"
|
|
69
|
-
xmlns="http://www.w3.org/2000/svg"
|
|
70
49
|
>
|
|
71
|
-
<
|
|
72
|
-
|
|
73
|
-
|
|
50
|
+
<RNSVGSvgView
|
|
51
|
+
align="xMidYMid"
|
|
52
|
+
bbHeight="100%"
|
|
53
|
+
bbWidth="100%"
|
|
54
|
+
focusable={false}
|
|
55
|
+
meetOrSlice={0}
|
|
56
|
+
minX={0}
|
|
57
|
+
minY={0}
|
|
58
|
+
style={
|
|
74
59
|
Array [
|
|
75
|
-
|
|
60
|
+
Object {
|
|
61
|
+
"backgroundColor": "transparent",
|
|
62
|
+
"borderWidth": 0,
|
|
63
|
+
},
|
|
64
|
+
Object {
|
|
65
|
+
"flex": 0,
|
|
66
|
+
"height": "100%",
|
|
67
|
+
"width": "100%",
|
|
68
|
+
},
|
|
76
69
|
]
|
|
77
70
|
}
|
|
71
|
+
vbHeight={16}
|
|
72
|
+
vbWidth={14}
|
|
78
73
|
>
|
|
79
|
-
<
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
74
|
+
<RNSVGGroup>
|
|
75
|
+
<RNSVGPath
|
|
76
|
+
d="M7 0C4.79086 0 3 1.79086 3 4C3 6.20914 4.79086 8 7 8C9.20914 8 11 6.20914 11 4C11 1.79086 9.20914 0 7 0ZM4 4C4 2.34315 5.34315 1 7 1C8.65685 1 10 2.34315 10 4C10 5.65685 8.65685 7 7 7C5.34315 7 4 5.65685 4 4ZM2.00873 9C0.903151 9 0 9.88687 0 11C0 12.6912 0.83281 13.9663 2.13499 14.7966C3.41697 15.614 5.14526 16 7 16C8.85474 16 10.583 15.614 11.865 14.7966C13.1672 13.9663 14 12.6912 14 11C14 9.89557 13.1045 9.00001 12 9.00001L2.00873 9ZM1 11C1 10.4467 1.44786 10 2.00873 10L12 10C12.5522 10 13 10.4478 13 11C13 12.3088 12.3777 13.2837 11.3274 13.9534C10.2568 14.636 8.73511 15 7 15C5.26489 15 3.74318 14.636 2.67262 13.9534C1.62226 13.2837 1 12.3088 1 11Z"
|
|
77
|
+
fill={
|
|
78
|
+
Array [
|
|
79
|
+
2,
|
|
80
|
+
]
|
|
81
|
+
}
|
|
82
|
+
propList={
|
|
83
|
+
Array [
|
|
84
|
+
"fill",
|
|
85
|
+
]
|
|
86
|
+
}
|
|
87
|
+
/>
|
|
88
|
+
</RNSVGGroup>
|
|
89
|
+
</RNSVGSvgView>
|
|
90
|
+
</View>
|
|
94
91
|
</View>
|
|
95
92
|
</View>
|
|
96
93
|
`;
|
package/src/useAvatar.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { JSAvatarProps, AvatarInfo, JSAvatarState, AvatarColors } from './JSAvat
|
|
|
2
2
|
import { PresenceBadgeProps } from '@fluentui-react-native/badge';
|
|
3
3
|
import { titles } from './titles';
|
|
4
4
|
import { getHashCodeWeb } from './getHashCode';
|
|
5
|
+
import { createIconProps } from '@fluentui-react-native/interactive-hooks';
|
|
5
6
|
/**
|
|
6
7
|
* Re-usable hook for FURN Avatar.
|
|
7
8
|
* This hook configures Avatar props and state for FURN Avatar.
|
|
@@ -20,13 +21,13 @@ export const useAvatar = (props: JSAvatarProps): AvatarInfo => {
|
|
|
20
21
|
idForColor,
|
|
21
22
|
initials,
|
|
22
23
|
name,
|
|
23
|
-
ring,
|
|
24
24
|
shape,
|
|
25
|
+
transparentRing,
|
|
26
|
+
icon,
|
|
25
27
|
...rest
|
|
26
28
|
} = props;
|
|
27
29
|
|
|
28
30
|
const showRing = active === 'active' && activeAppearance === 'ring';
|
|
29
|
-
const transparentRing = !!ring?.transparent;
|
|
30
31
|
const showBadge = (!active || active === 'unset') && !!badge && !!badge.status;
|
|
31
32
|
const accessibilityText = `${name || ''}${showBadge ? `, ${badge.status}` : ''}`;
|
|
32
33
|
|
|
@@ -37,7 +38,7 @@ export const useAvatar = (props: JSAvatarProps): AvatarInfo => {
|
|
|
37
38
|
|
|
38
39
|
const state: JSAvatarState = {
|
|
39
40
|
showRing,
|
|
40
|
-
transparentRing,
|
|
41
|
+
transparentRing: !!transparentRing,
|
|
41
42
|
showBadge,
|
|
42
43
|
};
|
|
43
44
|
|
|
@@ -45,6 +46,8 @@ export const useAvatar = (props: JSAvatarProps): AvatarInfo => {
|
|
|
45
46
|
const avatarColorsIdx = getHashCodeWeb(idForColor ?? name ?? '') % AvatarColors.length;
|
|
46
47
|
const _avatarColor = avatarColor === 'colorful' ? AvatarColors[avatarColorsIdx] : avatarColor;
|
|
47
48
|
|
|
49
|
+
const iconProps = createIconProps(icon);
|
|
50
|
+
|
|
48
51
|
return {
|
|
49
52
|
props: {
|
|
50
53
|
accessible: true,
|
|
@@ -57,6 +60,7 @@ export const useAvatar = (props: JSAvatarProps): AvatarInfo => {
|
|
|
57
60
|
activeAppearance,
|
|
58
61
|
badge: badgeProps,
|
|
59
62
|
initials: _initials,
|
|
63
|
+
icon: iconProps,
|
|
60
64
|
},
|
|
61
65
|
state: {
|
|
62
66
|
...state,
|
|
@@ -73,30 +77,42 @@ export const useAvatar = (props: JSAvatarProps): AvatarInfo => {
|
|
|
73
77
|
* Words in braces, titles, special characters, parantheses and dashes should be ignored.
|
|
74
78
|
*/
|
|
75
79
|
export const getInitials = (name: string): string => {
|
|
76
|
-
if (!name
|
|
80
|
+
if (!name) {
|
|
77
81
|
return '';
|
|
78
82
|
}
|
|
79
|
-
const
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
+
const ARABIC_ASIAN_REGEXP = new RegExp(
|
|
84
|
+
'[\u0600-\u06FF\u0750-\u077F\u08A0-\u08FF\u1100-\u11FF\u3130-\u318F\uA960-\uA97F\uAC00-\uD7AF\uD7B0-\uD7FF\u3040-\u309F\u30A0-\u30FF\u3400-\u4DBF\u4E00-\u9FFF\uF900-\uFAFF\uD840-\uD869]',
|
|
85
|
+
'g',
|
|
86
|
+
);
|
|
87
|
+
const words = removeRedundantCharacters(name);
|
|
83
88
|
const wordsLength = words.length;
|
|
84
89
|
const lastWordIdx = wordsLength - 1;
|
|
85
|
-
const
|
|
90
|
+
const firstLetter = words[0].charAt(0).toUpperCase();
|
|
91
|
+
const lastLetter = wordsLength > 1 ? words[lastWordIdx].charAt(0).toUpperCase() : '';
|
|
92
|
+
const initials = `${firstLetter}${ARABIC_ASIAN_REGEXP.test(name) ? '' : lastLetter}`;
|
|
86
93
|
return initials;
|
|
87
94
|
};
|
|
88
95
|
|
|
89
96
|
/**
|
|
90
|
-
* A function which
|
|
97
|
+
* A function which takes a name and returns array of valid words
|
|
91
98
|
*
|
|
92
99
|
* @param name
|
|
93
|
-
* @returns
|
|
94
|
-
* numeric values or the first character is non-alphabetical. In this case avatar should
|
|
95
|
-
* fall back to icon.
|
|
100
|
+
* @returns array of words without phone numbers and special characters.
|
|
96
101
|
*/
|
|
97
|
-
export const
|
|
98
|
-
|
|
99
|
-
|
|
102
|
+
export const removeRedundantCharacters = (name: string): string[] => {
|
|
103
|
+
if (!name) {
|
|
104
|
+
return [];
|
|
105
|
+
}
|
|
106
|
+
const WORDS_IN_BRACES_REGEXP = new RegExp('[(\\[\\{][^\\)\\]\\}]*[\\)\\]\\}]', 'g');
|
|
107
|
+
const PHONE_NUMBER_REGEXP = new RegExp('(\\+|(\\d|\\s))', 'g');
|
|
108
|
+
const SPECIAL_CHARACTERS_REGEXP = new RegExp('[!"#\'$%&*+,-./:;>=<?@^_`|~¡¢£¤¥¦§¨©ª«¬®ˉ°±²¼½¾¿×÷]', 'g');
|
|
109
|
+
const words = name
|
|
110
|
+
.replace(WORDS_IN_BRACES_REGEXP, '')
|
|
111
|
+
.replace(PHONE_NUMBER_REGEXP, ' ')
|
|
112
|
+
.replace(SPECIAL_CHARACTERS_REGEXP, '')
|
|
113
|
+
.trim()
|
|
114
|
+
.split(' ');
|
|
115
|
+
return removeTitlesFromName(words);
|
|
100
116
|
};
|
|
101
117
|
|
|
102
118
|
/**
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"JSAvatar.helpers.d.ts","sourceRoot":"","sources":["../src/JSAvatar.helpers.ts"],"names":[],"mappings":"AAQA,oBAAY,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAoB/C"}
|
package/lib/JSAvatar.helpers.js
DELETED
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
import { globalTokens } from '@fluentui-react-native/theme-tokens';
|
|
2
|
-
var sizeAdjustment = {
|
|
3
|
-
small: 8,
|
|
4
|
-
medium: 12,
|
|
5
|
-
large: 16,
|
|
6
|
-
};
|
|
7
|
-
export function getRingConfig(size) {
|
|
8
|
-
if (size <= 48) {
|
|
9
|
-
return {
|
|
10
|
-
size: size + sizeAdjustment.small,
|
|
11
|
-
stroke: globalTokens.stroke.width.thick,
|
|
12
|
-
innerStroke: globalTokens.stroke.width.thick,
|
|
13
|
-
};
|
|
14
|
-
}
|
|
15
|
-
if (size <= 71) {
|
|
16
|
-
return {
|
|
17
|
-
size: size + sizeAdjustment.medium,
|
|
18
|
-
stroke: globalTokens.stroke.width.thicker,
|
|
19
|
-
innerStroke: globalTokens.stroke.width.thicker,
|
|
20
|
-
};
|
|
21
|
-
}
|
|
22
|
-
return {
|
|
23
|
-
size: size + sizeAdjustment.large,
|
|
24
|
-
stroke: globalTokens.stroke.width.thickest,
|
|
25
|
-
innerStroke: globalTokens.stroke.width.thickest,
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
|
-
//# sourceMappingURL=JSAvatar.helpers.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"JSAvatar.helpers.js","sourceRoot":"","sources":["../src/JSAvatar.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,IAAM,cAAc,GAAG;IACrB,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,EAAE;CACV,CAAC;AAQF,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,IAAI,IAAI,IAAI,EAAE,EAAE;QACd,OAAO;YACL,IAAI,EAAE,IAAI,GAAG,cAAc,CAAC,KAAK;YACjC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK;YACvC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK;SAC7C,CAAC;KACH;IACD,IAAI,IAAI,IAAI,EAAE,EAAE;QACd,OAAO;YACL,IAAI,EAAE,IAAI,GAAG,cAAc,CAAC,MAAM;YAClC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO;YACzC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO;SAC/C,CAAC;KACH;IACD,OAAO;QACL,IAAI,EAAE,IAAI,GAAG,cAAc,CAAC,KAAK;QACjC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ;QAC1C,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ;KAChD,CAAC;AACJ,CAAC"}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Regular expressions matching characters to ignore when calculating the initials.
|
|
3
|
-
*/
|
|
4
|
-
/**
|
|
5
|
-
* Get (up to 2 characters) initials based on display name of the persona.
|
|
6
|
-
*
|
|
7
|
-
* @param displayName - The full name of the person or entity
|
|
8
|
-
* @param isRtl - Whether the display is in RTL
|
|
9
|
-
* @param allowPhoneInitials - Should initials be generated from phone numbers (default false)
|
|
10
|
-
*
|
|
11
|
-
* @returns The 1 or 2 character initials based on the name. Or an empty string if no initials
|
|
12
|
-
* could be derived from the name.
|
|
13
|
-
*/
|
|
14
|
-
export declare function getInitials(displayName: string | undefined | null, isRtl: boolean, allowPhoneInitials?: boolean): string;
|
|
15
|
-
//# sourceMappingURL=getInitials.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getInitials.d.ts","sourceRoot":"","sources":["../../src/utils/getInitials.ts"],"names":[],"mappings":"AAAA;;GAEG;AAkEH;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,MAAM,CAaxH"}
|
package/lib/utils/getInitials.js
DELETED
|
@@ -1,78 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Regular expressions matching characters to ignore when calculating the initials.
|
|
3
|
-
*/
|
|
4
|
-
/**
|
|
5
|
-
* Regular expression matching characters within various types of enclosures, including the enclosures themselves
|
|
6
|
-
* so for example, (xyz) [xyz] {xyz} all would be ignored
|
|
7
|
-
*/
|
|
8
|
-
var UNWANTED_ENCLOSURES_REGEX = /[\(\[\{][^\)\]\}]*[\)\]\}]/g;
|
|
9
|
-
/**
|
|
10
|
-
* Regular expression matching special ASCII characters except space, plus some unicode special characters.
|
|
11
|
-
* Applies after unwanted enclosures have been removed
|
|
12
|
-
*/
|
|
13
|
-
var UNWANTED_CHARS_REGEX = /[\0-\u001F\!-/:-@\[-`\{-\u00BF\u0250-\u036F\uD800-\uFFFF]/g;
|
|
14
|
-
/**
|
|
15
|
-
* Regular expression matching phone numbers. Applied after chars matching UNWANTED_CHARS_REGEX have been removed
|
|
16
|
-
* and number has been trimmed for whitespaces
|
|
17
|
-
*/
|
|
18
|
-
var PHONENUMBER_REGEX = /^\d+[\d\s]*(:?ext|x|)\s*\d+$/i;
|
|
19
|
-
/** Regular expression matching one or more spaces. */
|
|
20
|
-
var MULTIPLE_WHITESPACES_REGEX = /\s+/g;
|
|
21
|
-
/**
|
|
22
|
-
* Regular expression matching languages for which we currently don't support initials.
|
|
23
|
-
* Arabic: Arabic, Arabic Supplement, Arabic Extended-A.
|
|
24
|
-
* Korean: Hangul Jamo, Hangul Compatibility Jamo, Hangul Jamo Extended-A, Hangul Syllables, Hangul Jamo Extended-B.
|
|
25
|
-
* Japanese: Hiragana, Katakana.
|
|
26
|
-
* CJK: CJK Unified Ideographs Extension A, CJK Unified Ideographs, CJK Compatibility Ideographs,
|
|
27
|
-
* CJK Unified Ideographs Extension B
|
|
28
|
-
*/
|
|
29
|
-
// eslint-disable-next-line @fluentui/max-len
|
|
30
|
-
var UNSUPPORTED_TEXT_REGEX = /[\u0600-\u06FF\u0750-\u077F\u08A0-\u08FF\u1100-\u11FF\u3130-\u318F\uA960-\uA97F\uAC00-\uD7AF\uD7B0-\uD7FF\u3040-\u309F\u30A0-\u30FF\u3400-\u4DBF\u4E00-\u9FFF\uF900-\uFAFF]|[\uD840-\uD869][\uDC00-\uDED6]/;
|
|
31
|
-
function getInitialsLatin(displayName, isRtl) {
|
|
32
|
-
var initials = '';
|
|
33
|
-
var splits = displayName.split(' ');
|
|
34
|
-
if (splits.length === 2) {
|
|
35
|
-
initials += splits[0].charAt(0).toUpperCase();
|
|
36
|
-
initials += splits[1].charAt(0).toUpperCase();
|
|
37
|
-
}
|
|
38
|
-
else if (splits.length === 3) {
|
|
39
|
-
initials += splits[0].charAt(0).toUpperCase();
|
|
40
|
-
initials += splits[2].charAt(0).toUpperCase();
|
|
41
|
-
}
|
|
42
|
-
else if (splits.length !== 0) {
|
|
43
|
-
initials += splits[0].charAt(0).toUpperCase();
|
|
44
|
-
}
|
|
45
|
-
if (isRtl && initials.length > 1) {
|
|
46
|
-
return initials.charAt(1) + initials.charAt(0);
|
|
47
|
-
}
|
|
48
|
-
return initials;
|
|
49
|
-
}
|
|
50
|
-
function cleanupDisplayName(displayName) {
|
|
51
|
-
displayName = displayName.replace(UNWANTED_ENCLOSURES_REGEX, '');
|
|
52
|
-
displayName = displayName.replace(UNWANTED_CHARS_REGEX, '');
|
|
53
|
-
displayName = displayName.replace(MULTIPLE_WHITESPACES_REGEX, ' ');
|
|
54
|
-
displayName = displayName.trim();
|
|
55
|
-
return displayName;
|
|
56
|
-
}
|
|
57
|
-
/**
|
|
58
|
-
* Get (up to 2 characters) initials based on display name of the persona.
|
|
59
|
-
*
|
|
60
|
-
* @param displayName - The full name of the person or entity
|
|
61
|
-
* @param isRtl - Whether the display is in RTL
|
|
62
|
-
* @param allowPhoneInitials - Should initials be generated from phone numbers (default false)
|
|
63
|
-
*
|
|
64
|
-
* @returns The 1 or 2 character initials based on the name. Or an empty string if no initials
|
|
65
|
-
* could be derived from the name.
|
|
66
|
-
*/
|
|
67
|
-
export function getInitials(displayName, isRtl, allowPhoneInitials) {
|
|
68
|
-
if (!displayName) {
|
|
69
|
-
return '';
|
|
70
|
-
}
|
|
71
|
-
displayName = cleanupDisplayName(displayName);
|
|
72
|
-
// For names containing CJK characters, and phone numbers, we don't display initials
|
|
73
|
-
if (UNSUPPORTED_TEXT_REGEX.test(displayName) || (!allowPhoneInitials && PHONENUMBER_REGEX.test(displayName))) {
|
|
74
|
-
return '';
|
|
75
|
-
}
|
|
76
|
-
return getInitialsLatin(displayName, isRtl);
|
|
77
|
-
}
|
|
78
|
-
//# sourceMappingURL=getInitials.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getInitials.js","sourceRoot":"","sources":["../../src/utils/getInitials.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,IAAM,yBAAyB,GAAW,6BAA6B,CAAC;AAExE;;;GAGG;AACH,IAAM,oBAAoB,GAAW,4DAA4D,CAAC;AAElG;;;GAGG;AACH,IAAM,iBAAiB,GAAW,+BAA+B,CAAC;AAElE,sDAAsD;AACtD,IAAM,0BAA0B,GAAW,MAAM,CAAC;AAElD;;;;;;;GAOG;AACH,6CAA6C;AAC7C,IAAM,sBAAsB,GAC1B,4MAA4M,CAAC;AAE/M,SAAS,gBAAgB,CAAC,WAAmB,EAAE,KAAc;IAC3D,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,IAAM,MAAM,GAAa,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEhD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9C,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;KAC/C;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9C,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;KAC/C;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;KAC/C;IAED,IAAI,KAAK,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;KAChD;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB;IAC7C,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;IACjE,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;IAC5D,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;IACnE,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;IAEjC,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,WAAW,CAAC,WAAsC,EAAE,KAAc,EAAE,kBAA4B;IAC9G,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IAED,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAE9C,oFAAoF;IACpF,IAAI,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE;QAC5G,OAAO,EAAE,CAAC;KACX;IAED,OAAO,gBAAgB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;AAC9C,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getInitials.test.d.ts","sourceRoot":"","sources":["../../src/utils/getInitials.test.ts"],"names":[],"mappings":""}
|