@@ -12,43 +12,27 @@ export const TextElement = ({ text, style }) => (
12
12
13
13
// Key-Value Element Component
14
14
export const KeyValueElement = ( { item, appName, style, showNote } ) => {
15
- const values = Array . isArray ( item . value ) ? item . value : [ item . value ] ;
16
- const urls = Array . isArray ( item . url )
17
- ? item . url
18
- : typeof item . url !== 'undefined'
19
- ? [ item . url ]
20
- : [ ] ;
21
- const isRelativeUrls = Array . isArray ( item . isRelativeUrl )
22
- ? item . isRelativeUrl
23
- : typeof item . isRelativeUrl !== 'undefined'
24
- ? [ item . isRelativeUrl ]
25
- : [ ] ;
15
+ const values = Array . isArray ( item . values )
16
+ ? [ { value : item . value , url : item . url , isRelativeUrl : item . isRelativeUrl } , ...item . values ]
17
+ : [ { value : item . value , url : item . url , isRelativeUrl : item . isRelativeUrl } ] ;
26
18
27
19
const handleCopy = ( ) => {
28
- copy ( values . join ( ' ' ) ) ;
20
+ copy ( String ( item . value ) ) ;
29
21
if ( showNote ) {
30
22
showNote ( 'Value copied to clipboard' , false ) ;
31
23
}
32
24
} ;
33
25
34
- const renderValue = ( value , idx ) => {
35
- const url = urls [ idx ] ;
36
- const isRelative = isRelativeUrls [ idx ] ;
37
-
26
+ const renderValue = ( { value, url, isRelativeUrl } ) => {
38
27
if ( url ) {
39
28
return (
40
- < a
41
- key = { idx }
42
- href = { isRelative ? `apps/${ appName } /${ url } ` : url }
43
- target = "_blank"
44
- rel = "noreferrer"
45
- >
29
+ < a href = { isRelativeUrl ? `apps/${ appName } /${ url } ` : url } target = "_blank" rel = "noreferrer" >
46
30
{ value }
47
31
</ a >
48
32
) ;
49
33
}
50
34
51
- return < span key = { idx } > { value } </ span > ;
35
+ return < span > { value } </ span > ;
52
36
} ;
53
37
54
38
return (
@@ -57,7 +41,7 @@ export const KeyValueElement = ({ item, appName, style, showNote }) => {
57
41
{ values . map ( ( val , idx ) => (
58
42
< React . Fragment key = { idx } >
59
43
{ idx > 0 && ' ' }
60
- { renderValue ( val , idx ) }
44
+ { renderValue ( val ) }
61
45
</ React . Fragment >
62
46
) ) }
63
47
< span className = { styles . copyIcon } onClick = { handleCopy } >
0 commit comments