File tree Expand file tree Collapse file tree 4 files changed +7
-29
lines changed
plugin-form-builder/src/utilities/lexical/converters
richtext-lexical/src/features Expand file tree Collapse file tree 4 files changed +7
-29
lines changed Original file line number Diff line number Diff line change @@ -15,17 +15,13 @@ export const LinkHTMLConverter: HTMLConverter<any> = {
15
15
submissionData,
16
16
} )
17
17
18
- const rel : string = node . fields . newTab ? ' rel="noopener noreferrer"' : ''
19
- const target : string = node . fields . newTab ? ' target="_blank"' : ''
20
-
21
18
let href : string =
22
19
node . fields . linkType === 'custom' ? node . fields . url : node . fields . doc ?. value ?. id
23
20
24
21
if ( submissionData ) {
25
22
href = replaceDoubleCurlys ( href , submissionData )
26
23
}
27
-
28
- return `<a href="${ href } "${ target } ${ rel } >${ childrenText } </a>`
24
+ return `<a href="${ href } "${ node . fields . newTab ? ' rel="noopener noreferrer" target="_blank"' : '' } >${ childrenText } </a>`
29
25
} ,
30
26
nodeTypes : [ 'link' ] ,
31
27
}
Original file line number Diff line number Diff line change @@ -16,10 +16,7 @@ export const LinkHTMLConverterAsync: (args: {
16
16
} )
17
17
) . join ( '' )
18
18
19
- const rel : string | undefined = node . fields . newTab ? 'noopener noreferrer' : undefined
20
- const target : string | undefined = node . fields . newTab ? '_blank' : undefined
21
-
22
- return `<a${ providedStyleTag } href="${ node . fields . url } " rel=${ rel } target=${ target } >
19
+ return `<a${ providedStyleTag } href="${ node . fields . url } "${ node . fields . newTab ? ' rel="noopener noreferrer" target="_blank"' : '' } >
23
20
${ children }
24
21
</a>`
25
22
} ,
@@ -30,9 +27,6 @@ export const LinkHTMLConverterAsync: (args: {
30
27
} )
31
28
) . join ( '' )
32
29
33
- const rel : string | undefined = node . fields . newTab ? 'noopener noreferrer' : undefined
34
- const target : string | undefined = node . fields . newTab ? '_blank' : undefined
35
-
36
30
let href : string = node . fields . url ?? ''
37
31
if ( node . fields . linkType === 'internal' ) {
38
32
if ( internalDocToHref ) {
@@ -45,7 +39,7 @@ export const LinkHTMLConverterAsync: (args: {
45
39
}
46
40
}
47
41
48
- return `<a${ providedStyleTag } href="${ href } " rel= ${ rel } target=${ target } >
42
+ return `<a${ providedStyleTag } href="${ href } "${ node . fields . newTab ? ' rel="noopener noreferrer" target="_blank"' : '' } >
49
43
${ children }
50
44
</a>`
51
45
} ,
Original file line number Diff line number Diff line change @@ -9,10 +9,7 @@ export const LinkHTMLConverter: (args: {
9
9
nodes : node . children ,
10
10
} ) . join ( '' )
11
11
12
- const rel : string | undefined = node . fields . newTab ? 'noopener noreferrer' : undefined
13
- const target : string | undefined = node . fields . newTab ? '_blank' : undefined
14
-
15
- return `<a${ providedStyleTag } href="${ node . fields . url } " rel=${ rel } target=${ target } >
12
+ return `<a${ providedStyleTag } href="${ node . fields . url } "${ node . fields . newTab ? ' rel="noopener noreferrer" target="_blank"' : '' } >
16
13
${ children }
17
14
</a>`
18
15
} ,
@@ -21,9 +18,6 @@ export const LinkHTMLConverter: (args: {
21
18
nodes : node . children ,
22
19
} ) . join ( '' )
23
20
24
- const rel : string | undefined = node . fields . newTab ? 'noopener noreferrer' : undefined
25
- const target : string | undefined = node . fields . newTab ? '_blank' : undefined
26
-
27
21
let href : string = node . fields . url ?? ''
28
22
if ( node . fields . linkType === 'internal' ) {
29
23
if ( internalDocToHref ) {
@@ -36,7 +30,7 @@ export const LinkHTMLConverter: (args: {
36
30
}
37
31
}
38
32
39
- return `<a${ providedStyleTag } href="${ href } " rel= ${ rel } target=${ target } >
33
+ return `<a${ providedStyleTag } href="${ href } "${ node . fields . newTab ? ' rel="noopener noreferrer" target="_blank"' : '' } >
40
34
${ children }
41
35
</a>`
42
36
} ,
Original file line number Diff line number Diff line change @@ -191,9 +191,6 @@ export const LinkFeature = createServerFeature<
191
191
showHiddenFields,
192
192
} )
193
193
194
- const rel : string = node . fields . newTab ? ' rel="noopener noreferrer"' : ''
195
- const target : string = node . fields . newTab ? ' target="_blank"' : ''
196
-
197
194
let href : string = node . fields . url ?? ''
198
195
if ( node . fields . linkType === 'internal' ) {
199
196
href =
@@ -202,7 +199,7 @@ export const LinkFeature = createServerFeature<
202
199
: String ( node . fields . doc ?. value ?. id )
203
200
}
204
201
205
- return `<a href="${ href } "${ target } ${ rel } >${ childrenText } </a>`
202
+ return `<a href="${ href } "${ node . fields . newTab ? ' rel="noopener noreferrer" target="_blank"' : '' } >${ childrenText } </a>`
206
203
} ,
207
204
nodeTypes : [ AutoLinkNode . getType ( ) ] ,
208
205
} ,
@@ -240,15 +237,12 @@ export const LinkFeature = createServerFeature<
240
237
showHiddenFields,
241
238
} )
242
239
243
- const rel : string = node . fields . newTab ? ' rel="noopener noreferrer"' : ''
244
- const target : string = node . fields . newTab ? ' target="_blank"' : ''
245
-
246
240
const href : string =
247
241
node . fields . linkType === 'custom'
248
242
? escapeHTML ( node . fields . url )
249
243
: ( node . fields . doc ?. value as string )
250
244
251
- return `<a href="${ href } "${ target } ${ rel } >${ childrenText } </a>`
245
+ return `<a href="${ href } "${ node . fields . newTab ? ' rel="noopener noreferrer" target="_blank"' : '' } >${ childrenText } </a>`
252
246
} ,
253
247
nodeTypes : [ LinkNode . getType ( ) ] ,
254
248
} ,
You can’t perform that action at this time.
0 commit comments