yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17781 from umbraco/v15/hotfix/tinymce-links

Browse Source 
V15: TinyMce triggers navigation when clicking links
This commit is contained in:
Niels Lyngsø
2024-12-11 15:59:43 +01:00
committed by GitHub
parent 5322e382f3 ccd365104a
commit 66c13e5dae
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts
View File

@@ -300,9 +300,9 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
? html`<uui-button
@click=${this.#expose}
label=${this.localize.term('blockEditor_createThisFor', this._contentTypeName)}
look="secondary"
><uui-icon name="icon-add"></uui-icon
></uui-button>`
look="secondary">
<uui-icon name="icon-add"></uui-icon>
</uui-button>`
: nothing;
}

36
src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.defaults.ts
View File

@@ -76,31 +76,31 @@ export const defaultFallbackConfig: RawEditorOptions = {
// If we try to open link in a new tab, then we want to skip skip:
//if ((isWindows && e.ctrlKey) || (!isWindows && e.metaKey)) return;
const composedPaths = 'composedPath' in e ? e.composedPath() : null;
// Find the target by using the composed path to get the element through the shadow boundaries.
// Notice the difference here compared to RouterSlots implementation [NL]
const $anchor: HTMLAnchorElement = (('composedPath' in e) as any)
? (e
.composedPath()
.find(($elem) => $elem instanceof HTMLAnchorElement || ($elem as any).tagName === 'A') as HTMLAnchorElement)
: (e.target as HTMLAnchorElement);
const $anchor: HTMLAnchorElement =
(composedPaths?.find(
($elem) => $elem instanceof HTMLAnchorElement || ($elem as any).tagName === 'A',
) as HTMLAnchorElement) ?? (e.target as HTMLAnchorElement);
// Abort if the event is not about the anchor tag
if ($anchor == null || !($anchor instanceof HTMLAnchorElement || ($anchor as any).tagName === 'A')) {
// Abort if the event is not about the anchor tag or the anchor tag has the attribute [data-router-slot]="disabled"
if (
$anchor == null ||
!($anchor instanceof HTMLAnchorElement || ($anchor as any).tagName === 'A') ||
$anchor.dataset['routerSlot'] === 'disabled'
) {
return;
}
// Get the HREF value from the anchor tag
const href = $anchor.href;
// Abort if the anchor tag is not inside a block element
const isInsideBlockElement =
composedPaths?.some(
($elem) => ($elem as any).tagName === 'UMB-RTE-BLOCK' || ($elem as any).tagName === 'UMB-RTE-BLOCK-INLINE',
) ?? false;
// Only handle the anchor tag if the follow holds true:
// - The HREF is relative to the origin of the current location.
// - The target is targeting the current frame.
// - The anchor doesn't have the attribute [data-router-slot]="disabled"
if (
!href.startsWith(location.origin) ||
($anchor.target !== '' && $anchor.target !== '_self') ||
$anchor.dataset['routerSlot'] === 'disabled'
) {
if (!isInsideBlockElement) {
return;
}