@umbraco-cms/backoffice 17.0.2 → 17.1.0-rc

package/dist-cms/packages/core/property/property-value-preset/property-value-preset-variant-builder.controller.js

@@ -68,8 +68,46 @@ export class UmbPropertyValuePresetVariantBuilderController extends UmbPropertyV
         const variantId = new UmbVariantId(culture, segment);
         const args = {
             variantId,
-            value: this._existingValues?.find((x) => x.alias === alias && variantId.compare(x))?.value,
+            value: this.#findExistingValue(alias, variantId),
         };
         return args;
     }
+    /**
+     * Finds an existing value for a property, with fallback logic for variation setting changes.
+     * When a property changes from invariant to variant (or vice versa), the existing values
+     * may have a different culture/segment than what we're looking for. This method handles
+     * value migration by trying fallback lookups.
+     */
+    #findExistingValue(alias, variantId) {
+        if (!this._existingValues)
+            return undefined;
+        // First, try exact match (same alias + same culture/segment)
+        const exactMatch = this._existingValues.find((x) => x.alias === alias && variantId.compare(x));
+        if (exactMatch) {
+            return exactMatch.value;
+        }
+        // No exact match - try fallback for variation setting changes
+        // Get all values for this property alias
+        const valuesForAlias = this._existingValues.filter((x) => x.alias === alias);
+        if (valuesForAlias.length === 0) {
+            return undefined;
+        }
+        // Fallback 1: If looking for a culture-specific value, try to use the invariant value
+        // This handles: invariant → variant migration
+        if (variantId.culture !== null) {
+            const invariantValue = valuesForAlias.find((x) => x.culture === null && x.segment === variantId.segment);
+            if (invariantValue) {
+                return invariantValue.value;
+            }
+        }
+        // Fallback 2: If looking for an invariant value, try to use the first culture-specific value
+        // This handles: variant → invariant migration
+        if (variantId.culture === null) {
+            const anyVariantValue = valuesForAlias.find((x) => x.culture !== null && x.segment === variantId.segment);
+            if (anyVariantValue) {
+                return anyVariantValue.value;
+            }
+        }
+        return undefined;
+    }
 }

package/dist-cms/packages/core/property-editor/extensions/property-editor.extension.d.ts

@@ -57,6 +57,10 @@ export interface PropertyEditorSettingsProperty {
     propertyEditorDataSourceAlias?: string;
     config?: UmbPropertyEditorConfig;
     weight?: number;
+    validation?: {
+        mandatory: boolean;
+        mandatoryMessage?: string | null;
+    };
 }
 export interface PropertyEditorSettingsDefaultData {
     alias: string;

package/dist-cms/packages/core/property-editor/ui-picker-modal/property-editor-ui-picker-modal.element.js

@@ -85,7 +85,7 @@ let UmbPropertyEditorUIPickerModalElement = class UmbPropertyEditorUIPickerModal
 						<li class="item" ?selected=${this.value.selection.includes(propertyEditorUI.alias)}>
 							<button type="button" @click=${() => this.#handleClick(propertyEditorUI)}>
 								<umb-icon name=${propertyEditorUI.meta.icon} class="icon"></umb-icon>
-								${propertyEditorUI.meta.label || propertyEditorUI.name}
+								${this.localize.string(propertyEditorUI.meta.label || propertyEditorUI.name)}
 							</button>
 						</li>
 					`)}

package/dist-cms/packages/core/property-sort-mode/constants.d.ts

@@ -0,0 +1,2 @@
+export * from './property-action/constants.js';
+export * from './property-context/constants.js';

package/dist-cms/packages/core/property-sort-mode/constants.js

@@ -0,0 +1,2 @@
+export * from './property-action/constants.js';
+export * from './property-context/constants.js';

package/dist-cms/packages/core/property-sort-mode/global-components/index.d.ts

@@ -0,0 +1,2 @@
+import './property-sort-mode-toolbar.element.js';
+export * from './property-sort-mode-toolbar.element.js';

package/dist-cms/packages/core/property-sort-mode/global-components/index.js

@@ -0,0 +1,2 @@
+import './property-sort-mode-toolbar.element.js';
+export * from './property-sort-mode-toolbar.element.js';

package/dist-cms/packages/core/property-sort-mode/global-components/property-sort-mode-toolbar.element.d.ts

@@ -0,0 +1,11 @@
+import { UmbLitElement } from '../../lit-element/index.js';
+export declare class UmbPropertySortModeToolbarElement extends UmbLitElement {
+    #private;
+    render(): import("lit-html").TemplateResult<1>;
+    static readonly styles: import("lit").CSSResult[];
+}
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-property-sort-mode-toolbar': UmbPropertySortModeToolbarElement;
+    }
+}

package/dist-cms/packages/core/property-sort-mode/global-components/property-sort-mode-toolbar.element.js

@@ -0,0 +1,45 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { UMB_PROPERTY_SORT_MODE_CONTEXT } from '../property-context/property-sort-mode.context-token.js';
+import { css, customElement, html } from '../../../../external/lit/index.js';
+import { UmbLitElement } from '../../lit-element/index.js';
+let UmbPropertySortModeToolbarElement = class UmbPropertySortModeToolbarElement extends UmbLitElement {
+    #onSortModeExit = async () => {
+        const context = await this.getContext(UMB_PROPERTY_SORT_MODE_CONTEXT);
+        context?.setIsSortMode(false);
+    };
+    render() {
+        return html `
+			<div id="sort-mode">
+				<uui-button
+					look="secondary"
+					label=${this.localize.term('blockEditor_actionExitSortMode')}
+					@click=${this.#onSortModeExit}></uui-button>
+			</div>
+		`;
+    }
+    static { this.styles = [
+        css `
+			#sort-mode {
+				background-color: var(--uui-color-selected);
+				color: var(--uui-color-selected-contrast);
+				box-sizing: border-box;
+				border-radius: var(--uui-border-radius);
+				display: flex;
+				gap: var(--uui-size-3);
+				padding: var(--uui-size-space-4) var(--uui-size-space-6);
+				width: 100%;
+				align-items: center;
+				justify-content: flex-end;
+			}
+		`,
+    ]; }
+};
+UmbPropertySortModeToolbarElement = __decorate([
+    customElement('umb-property-sort-mode-toolbar')
+], UmbPropertySortModeToolbarElement);
+export { UmbPropertySortModeToolbarElement };

package/dist-cms/packages/core/property-sort-mode/index.d.ts

@@ -0,0 +1,5 @@
+export * from './constants.js';
+export * from './global-components/index.js';
+export * from './property-action/index.js';
+export * from './property-context/index.js';
+export type * from './types.js';

package/dist-cms/packages/core/property-sort-mode/index.js

@@ -0,0 +1,4 @@
+export * from './constants.js';
+export * from './global-components/index.js';
+export * from './property-action/index.js';
+export * from './property-context/index.js';

package/dist-cms/packages/core/property-sort-mode/manifests.d.ts

@@ -0,0 +1,2 @@
+import type { UmbExtensionManifestKind } from '../extension-registry/index.js';
+export declare const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind>;

package/dist-cms/packages/core/property-sort-mode/manifests.js

@@ -0,0 +1,6 @@
+import { manifests as propertyActionManifests } from './property-action/manifests.js';
+import { manifests as propertyContextManifests } from './property-context/manifests.js';
+export const manifests = [
+    ...propertyActionManifests,
+    ...propertyContextManifests,
+];

package/dist-cms/packages/core/property-sort-mode/property-action/constants.d.ts

@@ -0,0 +1 @@
+export { UMB_PROPERTY_ACTION_SORT_MODE_KIND_MANIFEST } from './manifests.js';

package/dist-cms/packages/core/property-sort-mode/property-action/constants.js

@@ -0,0 +1 @@
+export { UMB_PROPERTY_ACTION_SORT_MODE_KIND_MANIFEST } from './manifests.js';

package/dist-cms/packages/core/property-sort-mode/property-action/index.d.ts

@@ -0,0 +1,3 @@
+export * from './constants.js';
+export { UmbPropertySortModePropertyAction } from './property-sort-mode-property-action.js';
+export type * from './types.js';

package/dist-cms/packages/core/property-sort-mode/property-action/index.js

@@ -0,0 +1,2 @@
+export * from './constants.js';
+export { UmbPropertySortModePropertyAction } from './property-sort-mode-property-action.js';

package/dist-cms/packages/core/property-sort-mode/property-action/manifests.d.ts

@@ -0,0 +1,3 @@
+import type { UmbExtensionManifestKind } from '../../extension-registry/index.js';
+export declare const UMB_PROPERTY_ACTION_SORT_MODE_KIND_MANIFEST: UmbExtensionManifestKind;
+export declare const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind>;

package/dist-cms/packages/core/property-sort-mode/property-action/manifests.js

@@ -0,0 +1,21 @@
+import { UMB_PROPERTY_ACTION_DEFAULT_KIND_MANIFEST } from '../../property-action/index.js';
+export const UMB_PROPERTY_ACTION_SORT_MODE_KIND_MANIFEST = {
+    type: 'kind',
+    alias: 'Umb.Kind.PropertyAction.SortMode',
+    matchKind: 'sortMode',
+    matchType: 'propertyAction',
+    manifest: {
+        ...UMB_PROPERTY_ACTION_DEFAULT_KIND_MANIFEST.manifest,
+        type: 'propertyAction',
+        kind: 'sortMode',
+        api: () => import('./property-sort-mode-property-action.js'),
+        element: () => import('./property-sort-mode-property-action.element.js'),
+        meta: {
+            icon: 'icon-sort',
+            label: '#general_sort',
+        },
+    },
+};
+export const manifests = [
+    UMB_PROPERTY_ACTION_SORT_MODE_KIND_MANIFEST,
+];

package/dist-cms/packages/core/property-sort-mode/property-action/property-sort-mode-property-action.d.ts

@@ -0,0 +1,13 @@
+import { UmbPropertyActionBase } from '../../property-action/index.js';
+/**
+ * Property action that toggles the property sort mode.
+ * When executed, it retrieves the sort mode context and toggles its state.
+ */
+export declare class UmbPropertySortModePropertyAction extends UmbPropertyActionBase {
+    /**
+     * Executes the property action by toggling the sort mode state.
+     * @returns {Promise<void>} A promise that resolves when the action is complete.
+     */
+    execute(): Promise<void>;
+}
+export { UmbPropertySortModePropertyAction as api };

package/dist-cms/packages/core/property-sort-mode/property-action/property-sort-mode-property-action.element.d.ts

@@ -0,0 +1,17 @@
+import type { ManifestPropertyActionSortModeKind } from './types.js';
+import { UmbLitElement } from '../../lit-element/index.js';
+import type { UmbPropertyAction } from '../../property-action/index.js';
+export declare class UmbPropertySortModePropertyActionElement extends UmbLitElement {
+    #private;
+    private _isSortMode;
+    manifest?: ManifestPropertyActionSortModeKind;
+    api?: UmbPropertyAction<ManifestPropertyActionSortModeKind> | undefined;
+    constructor();
+    render(): import("lit-html").TemplateResult<1>;
+}
+export { UmbPropertySortModePropertyActionElement as element };
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-property-sort-mode-property-action': UmbPropertySortModePropertyActionElement;
+    }
+}

package/dist-cms/packages/core/property-sort-mode/property-action/property-sort-mode-property-action.element.js

@@ -0,0 +1,51 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { UMB_PROPERTY_SORT_MODE_CONTEXT } from '../property-context/property-sort-mode.context-token.js';
+import { customElement, html, property, state, when } from '../../../../external/lit/index.js';
+import { UmbActionExecutedEvent } from '../../event/index.js';
+import { UmbLitElement } from '../../lit-element/index.js';
+let UmbPropertySortModePropertyActionElement = class UmbPropertySortModePropertyActionElement extends UmbLitElement {
+    constructor() {
+        super();
+        this._isSortMode = false;
+        this.consumeContext(UMB_PROPERTY_SORT_MODE_CONTEXT, (context) => {
+            this.observe(context?.isSortMode, (isSortMode) => (this._isSortMode = isSortMode ?? false));
+        });
+    }
+    async #onClickLabel(event) {
+        event.stopPropagation();
+        await this.api?.execute().catch(() => { });
+        this.dispatchEvent(new UmbActionExecutedEvent());
+    }
+    // TODO: we need to stop the regular click event from bubbling up to the table so it doesn't select the row.
+    // This should probably be handled in the UUI Menu item component. so we don't dispatch a label-click event and click event at the same time.
+    #onClick(event) {
+        event.stopPropagation();
+    }
+    render() {
+        const label = this._isSortMode ? 'blockEditor_actionExitSortMode' : 'blockEditor_actionEnterSortMode';
+        return html `
+			<uui-menu-item label=${this.localize.term(label)} @click-label=${this.#onClickLabel} @click=${this.#onClick}>
+				${when(this.manifest?.meta.icon, (icon) => html `<umb-icon slot="icon" name=${icon}></umb-icon>`)}
+			</uui-menu-item>
+		`;
+    }
+};
+__decorate([
+    state()
+], UmbPropertySortModePropertyActionElement.prototype, "_isSortMode", void 0);
+__decorate([
+    property({ attribute: false })
+], UmbPropertySortModePropertyActionElement.prototype, "manifest", void 0);
+__decorate([
+    property({ attribute: false })
+], UmbPropertySortModePropertyActionElement.prototype, "api", void 0);
+UmbPropertySortModePropertyActionElement = __decorate([
+    customElement('umb-property-sort-mode-property-action')
+], UmbPropertySortModePropertyActionElement);
+export { UmbPropertySortModePropertyActionElement };
+export { UmbPropertySortModePropertyActionElement as element };

package/dist-cms/packages/core/property-sort-mode/property-action/property-sort-mode-property-action.js

@@ -0,0 +1,17 @@
+import { UMB_PROPERTY_SORT_MODE_CONTEXT } from '../property-context/property-sort-mode.context-token.js';
+import { UmbPropertyActionBase } from '../../property-action/index.js';
+/**
+ * Property action that toggles the property sort mode.
+ * When executed, it retrieves the sort mode context and toggles its state.
+ */
+export class UmbPropertySortModePropertyAction extends UmbPropertyActionBase {
+    /**
+     * Executes the property action by toggling the sort mode state.
+     * @returns {Promise<void>} A promise that resolves when the action is complete.
+     */
+    async execute() {
+        const context = await this.getContext(UMB_PROPERTY_SORT_MODE_CONTEXT);
+        context?.toggleIsSortMode();
+    }
+}
+export { UmbPropertySortModePropertyAction as api };

package/dist-cms/packages/core/property-sort-mode/property-action/types.d.ts

@@ -0,0 +1,11 @@
+import type { ManifestPropertyAction, MetaPropertyActionDefaultKind } from '../../property-action/index.js';
+export interface ManifestPropertyActionSortModeKind<MetaType extends MetaPropertyActionSortModeKind = MetaPropertyActionSortModeKind> extends ManifestPropertyAction<MetaType> {
+    type: 'propertyAction';
+    kind: 'sortMode';
+}
+export type MetaPropertyActionSortModeKind = MetaPropertyActionDefaultKind;
+declare global {
+    interface UmbExtensionManifestMap {
+        umbManifestPropertyActionSortModeKind: ManifestPropertyActionSortModeKind;
+    }
+}

package/dist-cms/packages/core/property-sort-mode/property-action/types.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/core/property-sort-mode/property-context/constants.d.ts

@@ -0,0 +1 @@
+export * from './property-sort-mode.context-token.js';

package/dist-cms/packages/core/property-sort-mode/property-context/constants.js

@@ -0,0 +1 @@
+export * from './property-sort-mode.context-token.js';

package/dist-cms/packages/core/property-sort-mode/property-context/index.d.ts

@@ -0,0 +1,3 @@
+export * from './constants.js';
+export { UmbPropertySortModeContext } from './property-sort-mode.context.js';
+export type * from './types.js';

package/dist-cms/packages/core/property-sort-mode/property-context/index.js

@@ -0,0 +1,2 @@
+export * from './constants.js';
+export { UmbPropertySortModeContext } from './property-sort-mode.context.js';

package/dist-cms/packages/core/property-sort-mode/property-context/manifests.d.ts

@@ -0,0 +1,2 @@
+import type { UmbExtensionManifestKind } from '../../extension-registry/index.js';
+export declare const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind>;

package/dist-cms/packages/core/property-sort-mode/property-context/manifests.js

@@ -0,0 +1,14 @@
+export const manifests = [
+    {
+        type: 'kind',
+        alias: 'Umb.Kind.PropertyContext.SortMode',
+        matchKind: 'sortMode',
+        matchType: 'propertyContext',
+        manifest: {
+            type: 'propertyContext',
+            kind: 'sortMode',
+            api: () => import('./property-sort-mode.context.js'),
+            weight: 1300,
+        },
+    },
+];

package/dist-cms/packages/core/property-sort-mode/property-context/property-sort-mode.context-token.d.ts

@@ -0,0 +1,3 @@
+import type { UmbPropertySortModeContext } from './property-sort-mode.context.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export declare const UMB_PROPERTY_SORT_MODE_CONTEXT: UmbContextToken<UmbPropertySortModeContext, UmbPropertySortModeContext>;

package/dist-cms/packages/core/property-sort-mode/property-context/property-sort-mode.context-token.js

@@ -0,0 +1,2 @@
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export const UMB_PROPERTY_SORT_MODE_CONTEXT = new UmbContextToken('UmbPropertyContext', 'UmbPropertySortModeContext');

package/dist-cms/packages/core/property-sort-mode/property-context/property-sort-mode.context.d.ts

@@ -0,0 +1,33 @@
+import { UmbContextBase } from '../../../../libs/class-api/index.js';
+import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
+/**
+ * Context for managing the property sort mode state.
+ * Provides reactive state management for enabling/disabling sort mode on properties.
+ */
+export declare class UmbPropertySortModeContext extends UmbContextBase {
+    #private;
+    /**
+     * Observable that emits the current sort mode state.
+     */
+    readonly isSortMode: import("rxjs").Observable<boolean>;
+    /**
+     * Creates an instance of UmbPropertySortModeContext.
+     * @param {UmbControllerHost} host - The controller host that this context belongs to.
+     */
+    constructor(host: UmbControllerHost);
+    /**
+     * Gets the current sort mode state.
+     * @returns {boolean | undefined} The current sort mode state, or undefined if not set.
+     */
+    getIsSortMode(): boolean | undefined;
+    /**
+     * Sets the sort mode state.
+     * @param {boolean} isSortMode - Whether sort mode should be enabled.
+     */
+    setIsSortMode(isSortMode: boolean): void;
+    /**
+     * Toggles the sort mode state between enabled and disabled.
+     */
+    toggleIsSortMode(): void;
+}
+export { UmbPropertySortModeContext as api };

package/dist-cms/packages/core/property-sort-mode/property-context/property-sort-mode.context.js

@@ -0,0 +1,44 @@
+import { UMB_PROPERTY_SORT_MODE_CONTEXT } from './property-sort-mode.context-token.js';
+import { UmbBooleanState } from '../../../../libs/observable-api/index.js';
+import { UmbContextBase } from '../../../../libs/class-api/index.js';
+/**
+ * Context for managing the property sort mode state.
+ * Provides reactive state management for enabling/disabling sort mode on properties.
+ */
+export class UmbPropertySortModeContext extends UmbContextBase {
+    #isSortMode;
+    /**
+     * Creates an instance of UmbPropertySortModeContext.
+     * @param {UmbControllerHost} host - The controller host that this context belongs to.
+     */
+    constructor(host) {
+        super(host, UMB_PROPERTY_SORT_MODE_CONTEXT);
+        this.#isSortMode = new UmbBooleanState(false);
+        /**
+         * Observable that emits the current sort mode state.
+         */
+        this.isSortMode = this.#isSortMode.asObservable();
+    }
+    /**
+     * Gets the current sort mode state.
+     * @returns {boolean | undefined} The current sort mode state, or undefined if not set.
+     */
+    getIsSortMode() {
+        return this.#isSortMode.getValue();
+    }
+    /**
+     * Sets the sort mode state.
+     * @param {boolean} isSortMode - Whether sort mode should be enabled.
+     */
+    setIsSortMode(isSortMode) {
+        this.#isSortMode.setValue(isSortMode);
+    }
+    /**
+     * Toggles the sort mode state between enabled and disabled.
+     */
+    toggleIsSortMode() {
+        const enabled = this.getIsSortMode();
+        this.setIsSortMode(!enabled);
+    }
+}
+export { UmbPropertySortModeContext as api };

package/dist-cms/packages/core/property-sort-mode/property-context/types.d.ts

@@ -0,0 +1,12 @@
+import type { ManifestPropertyContext, MetaPropertyContext } from '../../property/index.js';
+export interface ManifestPropertyContextSortModeKind extends ManifestPropertyContext<MetaPropertyContextSortModeKind> {
+    type: 'propertyContext';
+    kind: 'sortMode';
+}
+export interface MetaPropertyContextSortModeKind extends MetaPropertyContext {
+}
+declare global {
+    interface UmbExtensionManifestMap {
+        umbManifestPropertyContextSortModeKind: ManifestPropertyContextSortModeKind;
+    }
+}

package/dist-cms/packages/core/property-sort-mode/property-context/types.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/core/property-sort-mode/types.d.ts

@@ -0,0 +1,2 @@
+export type * from './property-action/types.js';
+export type * from './property-context/types.js';

package/dist-cms/packages/core/property-sort-mode/types.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/core/recycle-bin/entity-action/empty-recycle-bin/empty-recycle-bin.action.kind.js

@@ -12,7 +12,7 @@ export const manifest = {
         weight: 100,
         forEntityTypes: [],
         meta: {
-            icon: 'icon-trash',
+            icon: 'icon-trash-empty',
             label: 'Empty Recycle Bin',
             additionalOptions: true,
         },

package/dist-cms/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/modal/restore-from-recycle-bin-modal.element.js

@@ -40,7 +40,7 @@ let UmbRestoreFromRecycleBinModalElement = class UmbRestoreFromRecycleBinModalEl
             this._destinationItemName = 'Root';
             this.#setDestinationValue({
                 unique: null,
-                entityType: 'unknown',
+                entityType: this.data?.entityType ?? 'unknown',
             });
         }
         if (unique) {

package/dist-cms/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.js

@@ -1,7 +1,7 @@
 import { UMB_RESTORE_FROM_RECYCLE_BIN_MODAL } from './modal/restore-from-recycle-bin-modal.token.js';
 import { UmbEntityRestoredFromRecycleBinEvent } from './restore-from-recycle-bin.event.js';
 import { umbOpenModal } from '../../../modal/index.js';
-import { UmbEntityActionBase, UmbRequestReloadStructureForEntityEvent } from '../../../entity-action/index.js';
+import { UmbEntityActionBase, UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '../../../entity-action/index.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '../../../action/index.js';
 /**
  * Entity action for restoring an item from the recycle bin.
@@ -32,18 +32,21 @@ export class UmbRestoreFromRecycleBinEntityAction extends UmbEntityActionBase {
         if (!actionEventContext) {
             throw new Error('Event context not found.');
         }
-        const event = new UmbRequestReloadStructureForEntityEvent({
+        const sourceEvent = new UmbRequestReloadStructureForEntityEvent({
             unique: this.args.unique,
             entityType: this.args.entityType,
         });
-        actionEventContext.dispatchEvent(event);
+        actionEventContext.dispatchEvent(sourceEvent);
         const trashedEvent = new UmbEntityRestoredFromRecycleBinEvent({
             unique: this.args.unique,
             entityType: this.args.entityType,
         });
         actionEventContext.dispatchEvent(trashedEvent);
-        // TODO: reload destination
-        console.log(destination.unique, destination.entityType);
+        const destinationEvent = new UmbRequestReloadChildrenOfEntityEvent({
+            unique: destination.unique,
+            entityType: destination.entityType,
+        });
+        actionEventContext.dispatchEvent(destinationEvent);
     }
 }
 export { UmbRestoreFromRecycleBinEntityAction as api };

package/dist-cms/packages/core/router/router-slot/util/anchor.d.ts

@@ -1,5 +1,5 @@
 /**
- * Hook up a click listener to the window that, for all anchor tags
+ * Hook up a click listener to the window that, for all anchor tags (HTML or SVG)
  * that has a relative HREF, uses the history API instead.
  */
 export declare function ensureAnchorHistory(): void;

package/dist-cms/packages/core/router/router-slot/util/anchor.js

@@ -1,37 +1,53 @@
 /**
- * Hook up a click listener to the window that, for all anchor tags
+ * Hook up a click listener to the window that, for all anchor tags (HTML or SVG)
  * that has a relative HREF, uses the history API instead.
  */
 export function ensureAnchorHistory() {
-    const isWindows = navigator.platform.toUpperCase().indexOf('WIN') !== -1;
+    const isMac = /Mac|iPhone|iPad|iPod/.test(navigator.userAgent);
     window.addEventListener('click', (e) => {
-        // If we try to open link in a new tab, then we want to skip skip:
-        if ((isWindows && e.ctrlKey) || (!isWindows && e.metaKey))
+        // If we try to open link in a new tab, we want to skip:
+        // - Mac uses Meta (⌘) + Click
+        // - Windows and Linux use Ctrl + Click
+        if ((isMac && e.metaKey) || (!isMac && e.ctrlKey))
             return;
         // Find the target by using the composed path to get the element through the shadow boundaries.
+        // Support both HTML anchor tags and SVG anchor tags
         const $anchor = ('composedPath' in e)
-            ? e.composedPath().find(($elem) => $elem instanceof HTMLAnchorElement)
+            ? e.composedPath().find(($elem) => $elem instanceof HTMLAnchorElement || $elem instanceof SVGAElement)
             : e.target;
-        // Abort if the event is not about the anchor tag
-        if ($anchor == null || !($anchor instanceof HTMLAnchorElement)) {
+        // Abort if the event is not about an anchor tag (HTML or SVG)
+        if ($anchor == null || !($anchor instanceof HTMLAnchorElement || $anchor instanceof SVGAElement)) {
             return;
         }
         // Get the HREF value from the anchor tag
-        const href = $anchor.href;
+        // SVGAElement.href returns SVGAnimatedString, so we need to access .baseVal
+        const href = $anchor instanceof SVGAElement ? $anchor.href.baseVal : $anchor.href;
+        const target = $anchor instanceof SVGAElement ? $anchor.target.baseVal : $anchor.target;
+        // For SVG anchors, we need to construct a full URL to extract pathname, search, and hash
+        // For HTML anchors, these properties are directly available
+        let fullUrl;
+        try {
+            // Use the current document base URI as the base to resolve relative URLs
+            // This respects the <base> tag and works the same as HTML anchors
+            // Note: This may resolve into an external URL, but we validate that later
+            fullUrl = new URL(href, document.baseURI);
+        }
+        catch {
+            // Invalid URL, skip
+            return;
+        }
         // 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') ||
+        if (fullUrl.origin !== location.origin ||
+            (target !== '' && target !== '_self') ||
             $anchor.dataset['routerSlot'] === 'disabled') {
             return;
         }
-        // Remove the origin from the start of the HREF to get the path
-        const path = $anchor.pathname + $anchor.search + $anchor.hash;
         // Prevent the default behavior
         e.preventDefault();
         // Change the history!
-        history.pushState(null, '', path);
+        history.pushState(null, '', fullUrl);
     });
 }