@umbraco-cms/backoffice 17.2.2 → 17.3.0-rc2

package/dist-cms/packages/core/router/conditions/is-routable-context/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/core/router/conditions/is-routable-context/manifests.js

@@ -0,0 +1,10 @@
+import { UMB_IS_ROUTABLE_CONTEXT_CONDITION_ALIAS } from './constants.js';
+import { UmbIsRoutableContextCondition } from './index.js';
+export const manifests = [
+    {
+        type: 'condition',
+        name: 'Is in a Routable Context Condition',
+        alias: UMB_IS_ROUTABLE_CONTEXT_CONDITION_ALIAS,
+        api: UmbIsRoutableContextCondition,
+    },
+];

package/dist-cms/packages/core/router/conditions/is-routable-context/types.d.ts

@@ -0,0 +1,15 @@
+import type { UMB_IS_ROUTABLE_CONTEXT_CONDITION_ALIAS } from './constants.js';
+import type { UmbConditionConfigBase } from '../../../../../libs/extension-api/index.js';
+export interface UmbIsRoutableContextConditionConfig extends UmbConditionConfigBase<typeof UMB_IS_ROUTABLE_CONTEXT_CONDITION_ALIAS> {
+    /**
+     * The expected routable context state to match.
+     * - `true`: Condition is permitted when inside a routable context (default)
+     * - `false`: Condition is permitted when NOT inside a routable context
+     */
+    match?: boolean;
+}
+declare global {
+    interface UmbExtensionConditionConfigMap {
+        UmbIsRoutableContextConditionConfig: UmbIsRoutableContextConditionConfig;
+    }
+}

package/dist-cms/packages/core/router/conditions/is-routable-context/types.js

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

package/dist-cms/packages/core/router/index.d.ts

@@ -4,5 +4,6 @@ export * from './encode-folder-name.function.js';
 export * from './modal-registration/modal-route-registration.controller.js';
 export * from './path-pattern.class.js';
 export * from './router-slot/index.js';
+export * from './conditions/is-routable-context/index.js';
 export type * from './modal-registration/modal-route-registration.interface.js';
 export type * from './types.js';

package/dist-cms/packages/core/router/index.js

@@ -4,3 +4,4 @@ export * from './encode-folder-name.function.js';
 export * from './modal-registration/modal-route-registration.controller.js';
 export * from './path-pattern.class.js';
 export * from './router-slot/index.js';
+export * from './conditions/is-routable-context/index.js';

package/dist-cms/packages/core/router/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/core/router/manifests.js

@@ -0,0 +1,2 @@
+import { manifests as UmbIsRoutableContextConditionManifests } from './conditions/is-routable-context/manifests.js';
+export const manifests = [...UmbIsRoutableContextConditionManifests];

package/dist-cms/packages/core/router/types.d.ts

@@ -1,5 +1,6 @@
 import type { IRoutingInfo, PageComponent } from './router-slot/index.js';
 import type { UmbApi } from '../../../libs/extension-api/index.js';
+export type * from './conditions/is-routable-context/types.js';
 export interface UmbRouteEntry extends UmbApi {
     getPath?(): string;
     setup?(element: PageComponent, info: IRoutingInfo): void;

package/dist-cms/packages/core/search/global-search/global-search.extension.d.ts

@@ -7,6 +7,7 @@ export interface ManifestGlobalSearch extends ManifestApi<UmbGlobalSearchApi>, M
 export interface MetaGlobalSearch {
     label: string;
     searchProviderAlias: string;
+    sectionAlias?: string;
 }
 declare global {
     interface UmbExtensionManifestMap {

package/dist-cms/packages/core/search/search-modal/search-modal.element.js

@@ -4,16 +4,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 { css, html, nothing, repeat, customElement, query, state, property, when, } from '../../../../external/lit/index.js';
-import { UmbExtensionsManifestInitializer, createExtensionApi } from '../../../../libs/extension-api/index.js';
+import { UMB_BACKOFFICE_CONTEXT } from '../../../../apps/backoffice/backoffice.context.js';
+import { css, customElement, html, nothing, property, query, repeat, state, when, } from '../../../../external/lit/index.js';
 import { createExtensionApiByAlias, umbExtensionsRegistry } from '../../extension-registry/index.js';
+import { UmbExtensionsManifestInitializer, createExtensionApi } from '../../../../libs/extension-api/index.js';
 import { UmbLitElement } from '../../lit-element/index.js';
 import { UmbTextStyles } from '../../style/index.js';
 import '../search-result/search-result-item.element.js';
 let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
     #searchItemNavIndex;
+    #searchRequestNumber;
     #inputTimer;
     #inputTimerAmount;
+    #currentSectionAlias;
     constructor() {
         super();
         this._search = '';
@@ -21,6 +24,7 @@ let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
         this._globalSearchers = [];
         this._loading = false;
         this.#searchItemNavIndex = 0;
+        this.#searchRequestNumber = 0;
         this.#inputTimerAmount = 300;
         this.#onDocumentClick = (event) => {
             const path = event.composedPath();
@@ -28,6 +32,14 @@ let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
                 return;
             this.modalContext?.reject();
         };
+        this.consumeContext(UMB_BACKOFFICE_CONTEXT, (backofficeContext) => {
+            if (!backofficeContext)
+                return;
+            this.observe(backofficeContext.activeSectionAlias, (alias) => {
+                this.#currentSectionAlias = alias;
+                this.#updateDefaultSearcher();
+            });
+        });
         this.#observeGlobalSearchers();
     }
     connectedCallback() {
@@ -65,16 +77,29 @@ let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
                         name: controller.manifest.meta?.label || controller.manifest.name,
                         api: searchApi,
                         alias: controller.alias,
+                        sectionAlias: controller.manifest.meta?.sectionAlias,
                     };
                     globalSearch.push(searcher);
                 }
             }
             this._globalSearchers = globalSearch;
-            if (this._globalSearchers.length > 0) {
-                this._currentGlobalSearcher = this._globalSearchers[0];
-            }
+            this.#updateDefaultSearcher();
         });
     }
+    #updateDefaultSearcher() {
+        if (this._globalSearchers.length === 0)
+            return;
+        // Try to find a searcher matching the current section
+        if (this.#currentSectionAlias) {
+            const matchingSearcher = this._globalSearchers.find((s) => s.sectionAlias === this.#currentSectionAlias);
+            if (matchingSearcher) {
+                this._currentGlobalSearcher = matchingSearcher;
+                return;
+            }
+        }
+        // Fall back to first searcher
+        this._currentGlobalSearcher = this._globalSearchers[0];
+    }
     async #setSearchItemNavIndex(index) {
         const prevElement = this.shadowRoot?.querySelector(`a[data-item-index="${this.#searchItemNavIndex}"]`);
         prevElement?.classList.remove('active');
@@ -105,14 +130,18 @@ let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
         if (this._currentGlobalSearcher === searcher)
             return;
         this._currentGlobalSearcher = searcher;
+        this.#searchRequestNumber++;
         this.#focusInput();
         this._loading = true;
         this._searchResults = [];
         this.#updateSearchResults();
     }
     async #updateSearchResults() {
+        const requestNumber = this.#searchRequestNumber;
         if (this._search && this._currentGlobalSearcher?.api) {
             const { data } = await this._currentGlobalSearcher.api.search({ query: this._search });
+            if (requestNumber !== this.#searchRequestNumber)
+                return; // stale response, discard
             if (!data)
                 return;
             this._searchResults = data.items;
@@ -135,6 +164,7 @@ let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
     #onSearchChange(event) {
         const target = event.target;
         this._search = target.value.trim();
+        this.#searchRequestNumber++;
         clearTimeout(this.#inputTimer);
         if (!this._search) {
             this._loading = false;
@@ -228,6 +258,7 @@ let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
         }
     }
     render() {
+        const inputLabel = this.localize.term('placeholders_search');
         return html `
 			<div id="top">
 				<div id="search-icon">
@@ -236,9 +267,11 @@ let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
 				<div id="input-wrapper">
 					<div id="input-wrapper-fake-cursor" aria-hidden="true"></div>
 					<input
+						name="search-input"
 						type="text"
 						autocomplete="off"
-						placeholder=${this.localize.term('placeholders_search')}
+						placeholder=${inputLabel}
+						aria-label=${inputLabel}
 						value=${this._search}
 						@input=${this.#onSearchChange}
 						@blur=${() => this.#setShowFakeCursor(true)}
@@ -278,7 +311,7 @@ let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
 			<a
 				class="search-item"
 				data-item-index=${index}
-				href=${item.href}
+				href=${item.href ?? '#'}
 				@click=${this.#closeModal}
 				@keydown=${this.#closeModal}>
 				<umb-extension-slot
@@ -295,17 +328,19 @@ let UmbSearchModalElement = class UmbSearchModalElement extends UmbLitElement {
         return html `<div id="no-results">${this.localize.term('general_searchNoResult')}</div>`;
     }
     #renderNavigationTips() {
-        return html `<div id="navigation-tips">
-			<div class="navigation-tips-key" style="grid-column: span 2;">Tab</div>
-			<span>${this.localize.term('globalSearch_navigateSearchProviders')}</span>
-			<div class="navigation-tips-key">
-				<uui-icon name="icon-arrow-up"></uui-icon>
-			</div>
-			<div class="navigation-tips-key">
-				<uui-icon name="icon-arrow-down"></uui-icon>
+        return html `
+			<div id="navigation-tips">
+				<div class="navigation-tips-key" style="grid-column: span 2;">Tab</div>
+				<span>${this.localize.term('globalSearch_navigateSearchProviders')}</span>
+				<div class="navigation-tips-key">
+					<uui-icon name="icon-arrow-up"></uui-icon>
+				</div>
+				<div class="navigation-tips-key">
+					<uui-icon name="icon-arrow-down"></uui-icon>
+				</div>
+				<span>${this.localize.term('globalSearch_navigateSearchResults')}</span>
 			</div>
-			<span>${this.localize.term('globalSearch_navigateSearchResults')}</span>
-		</div>`;
+		`;
     }
     static { this.styles = [
         UmbTextStyles,

package/dist-cms/packages/core/search/types.d.ts

@@ -3,6 +3,7 @@ import type { UmbItemModel } from '../entity-item/index.js';
 import type { UmbApi } from '../../../libs/extension-api/index.js';
 import type { FieldPresentationModel, SearchResultResponseModel } from '../backend-api/index.js';
 import type { UmbPagedModel, UmbRepositoryResponse } from '../repository/index.js';
+import type { UmbOffsetPaginationRequestModel } from '../utils/index.js';
 export type { UmbSearchDataSource } from './search-data-source.interface.js';
 export type { UmbSearchRepository } from './search-repository.interface.js';
 export type * from './extensions/types.js';
@@ -14,6 +15,7 @@ export interface UmbSearchResultItemModel extends UmbItemModel {
 export type UmbSearchRequestArgs = {
     query: string;
     searchFrom?: UmbEntityModel;
+    paging?: UmbOffsetPaginationRequestModel;
 };
 export type UmbSearchFieldPresentationModel = FieldPresentationModel;
 export interface UmbSearchProvider<SearchResultItemType extends UmbSearchResultItemModel = UmbSearchResultItemModel, SearchRequestArgsType extends UmbSearchRequestArgs = UmbSearchRequestArgs> extends UmbApi {

package/dist-cms/packages/core/server/conditions/constants.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Server Is Production Mode condition alias
+ */
+export declare const UMB_IS_SERVER_PRODUCTION_MODE_CONDITION_ALIAS = "Umb.Condition.Server.IsProductionMode";

package/dist-cms/packages/core/server/conditions/constants.js

@@ -0,0 +1,4 @@
+/**
+ * Server Is Production Mode condition alias
+ */
+export const UMB_IS_SERVER_PRODUCTION_MODE_CONDITION_ALIAS = 'Umb.Condition.Server.IsProductionMode';

package/dist-cms/packages/core/server/conditions/index.d.ts

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

package/dist-cms/packages/core/server/conditions/index.js

@@ -0,0 +1 @@
+export * from './constants.js';

package/dist-cms/packages/core/server/conditions/is-production-mode.condition.d.ts

@@ -0,0 +1,7 @@
+import type { UmbIsServerProductionModeConditionConfig } from './types.js';
+import { UmbConditionBase } from '../../extension-registry/index.js';
+import type { UmbConditionControllerArguments, UmbExtensionCondition } from '../../../../libs/extension-api/index.js';
+import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
+export declare class UmbIsServerProductionModeCondition extends UmbConditionBase<UmbIsServerProductionModeConditionConfig> implements UmbExtensionCondition {
+    constructor(host: UmbControllerHost, args: UmbConditionControllerArguments<UmbIsServerProductionModeConditionConfig>);
+}

package/dist-cms/packages/core/server/conditions/is-production-mode.condition.js

@@ -0,0 +1,17 @@
+import { UMB_SERVER_CONTEXT } from '../server.context-token.js';
+import { UmbConditionBase } from '../../extension-registry/index.js';
+const ObserveSymbol = Symbol();
+export class UmbIsServerProductionModeCondition extends UmbConditionBase {
+    constructor(host, args) {
+        super(host, args);
+        // Default to not permitted until we know the server's runtime mode (safe default).
+        this.permitted = false;
+        this.consumeContext(UMB_SERVER_CONTEXT, (context) => {
+            this.observe(context?.isProductionMode, (isProduction) => {
+                if (isProduction !== undefined) {
+                    this.permitted = isProduction === (this.config.match ?? true);
+                }
+            }, ObserveSymbol);
+        });
+    }
+}

package/dist-cms/packages/core/server/conditions/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/core/server/conditions/manifests.js

@@ -0,0 +1,10 @@
+import { UMB_IS_SERVER_PRODUCTION_MODE_CONDITION_ALIAS } from './constants.js';
+import { UmbIsServerProductionModeCondition } from './is-production-mode.condition.js';
+export const manifests = [
+    {
+        type: 'condition',
+        name: 'Server Production Mode Condition',
+        alias: UMB_IS_SERVER_PRODUCTION_MODE_CONDITION_ALIAS,
+        api: UmbIsServerProductionModeCondition,
+    },
+];

package/dist-cms/packages/core/server/conditions/types.d.ts

@@ -0,0 +1,14 @@
+import type { UMB_IS_SERVER_PRODUCTION_MODE_CONDITION_ALIAS } from './constants.js';
+import type { UmbConditionConfigBase } from '../../../../libs/extension-api/index.js';
+export interface UmbIsServerProductionModeConditionConfig extends UmbConditionConfigBase<typeof UMB_IS_SERVER_PRODUCTION_MODE_CONDITION_ALIAS> {
+    /**
+     * If true (default), the condition is permitted when in Production mode.
+     * If false, the condition is permitted when NOT in Production mode.
+     */
+    match?: boolean;
+}
+declare global {
+    interface UmbExtensionConditionConfigMap {
+        umbIsServerProductionModeConditionConfig: UmbIsServerProductionModeConditionConfig;
+    }
+}

package/dist-cms/packages/core/server/conditions/types.js

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

package/dist-cms/packages/core/server/index.d.ts

@@ -1,4 +1,5 @@
 export * from './server-connection.js';
 export * from './server.context-token.js';
 export * from './server.context.js';
+export * from './conditions/index.js';
 export type * from './types.js';

package/dist-cms/packages/core/server/index.js

@@ -1,3 +1,4 @@
 export * from './server-connection.js';
 export * from './server.context-token.js';
 export * from './server.context.js';
+export * from './conditions/index.js';

package/dist-cms/packages/core/server/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/core/server/manifests.js

@@ -0,0 +1,2 @@
+import { manifests as conditionManifests } from './conditions/manifests.js';
+export const manifests = [...conditionManifests];

package/dist-cms/packages/core/server/server.context.d.ts

@@ -1,8 +1,20 @@
 import type { UmbServerContextConfig } from './types.js';
+import type { ServerInformationResponseModel } from '../backend-api/index.js';
 import { UmbContextBase } from '../../../libs/class-api/index.js';
 import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
 export declare class UmbServerContext extends UmbContextBase {
     #private;
+    /**
+     * Observable that emits true when the server is running in Production mode,
+     * false when not in Production mode, or undefined until server information is loaded.
+     * UI consumers should treat undefined as restricted (safe default).
+     * The server information is fetched lazily on first subscription.
+     */
+    readonly isProductionMode: import("rxjs").Observable<boolean | undefined>;
+    /**
+     * Observable that provides the full server information.
+     */
+    readonly serverInformation: import("rxjs").Observable<ServerInformationResponseModel | undefined>;
     constructor(host: UmbControllerHost, config: UmbServerContextConfig);
     getBackofficePath(): string;
     getServerUrl(): string;

package/dist-cms/packages/core/server/server.context.js

@@ -1,15 +1,48 @@
 import { UMB_SERVER_CONTEXT } from './server.context-token.js';
+import { RuntimeModeModel, ServerService } from '../backend-api/index.js';
 import { UmbContextBase } from '../../../libs/class-api/index.js';
+import { UmbObjectState } from '../../../libs/observable-api/index.js';
+import { defer } from '../../../external/rxjs/index.js';
+import { tryExecute } from '../resources/index.js';
 export class UmbServerContext extends UmbContextBase {
     #serverUrl;
     #backofficePath;
     #serverConnection;
+    #serverInformation;
+    #serverInformationFetched;
     constructor(host, config) {
         super(host, UMB_SERVER_CONTEXT.toString());
+        this.#serverInformation = new UmbObjectState(undefined);
+        this.#serverInformationFetched = false;
+        /**
+         * Observable that emits true when the server is running in Production mode,
+         * false when not in Production mode, or undefined until server information is loaded.
+         * UI consumers should treat undefined as restricted (safe default).
+         * The server information is fetched lazily on first subscription.
+         */
+        this.isProductionMode = defer(() => {
+            if (!this.#serverInformationFetched) {
+                this.#serverInformationFetched = true;
+                this.#fetchServerInformation();
+            }
+            return this.#serverInformation.asObservablePart((info) => info ? info.runtimeMode === RuntimeModeModel.PRODUCTION : undefined);
+        });
+        /**
+         * Observable that provides the full server information.
+         */
+        this.serverInformation = this.#serverInformation.asObservable();
         this.#serverUrl = config.serverUrl;
         this.#backofficePath = config.backofficePath;
         this.#serverConnection = config.serverConnection;
     }
+    async #fetchServerInformation() {
+        const { data } = await tryExecute(this._host, ServerService.getServerInformation(), {
+            disableNotifications: true,
+        });
+        if (data) {
+            this.#serverInformation.setValue(data);
+        }
+    }
     getBackofficePath() {
         return this.#backofficePath;
     }

package/dist-cms/packages/core/sorter/sorter.controller.js

@@ -249,10 +249,11 @@ export class UmbSorterController extends UmbControllerBase {
             this.#containerElement.style.minHeight = containerRect.height + 'px';
             this.#setCurrentElement(element);
             //UmbSorterController.activeDragElement?.addEventListener('dragend', this.#handleDragEnd);
-            window.addEventListener('mouseup', this.#handleMouseUp);
-            window.addEventListener('mouseout', this.#handleMouseUp);
-            window.addEventListener('mouseleave', this.#handleMouseUp);
+            window.addEventListener('mouseout', this.#handleMouseOut);
+            window.addEventListener('mouseleave', this.#handleMouseOut);
             window.addEventListener('mousemove', this.#handleMouseMove);
+            window.addEventListener('dragleave', this.#handleDragLeave);
+            window.addEventListener('dragenter', this.#handleDragEnter);
             _a.activeItem = this.getItemOfElement(_a.activeElement);
             if (!_a.activeItem) {
                 console.error('Could not find item related to this element.', _a.activeElement);
@@ -313,16 +314,28 @@ export class UmbSorterController extends UmbControllerBase {
         /**
          * Listen to mouse move, to check if the mouse is still down.
          * This event does not happen while dragging, so its a indication that the drag is over.
+         * NOTE: On Firefox Linux, mousemove can fire during drag with buttons === 0, so we need to be careful.
          */
-        this.#handleMouseMove = (event) => {
-            // buttons should reprensent which buttons are held, and 0 => represents no button is pressed. [NL]
+        this.#handleMouseMove = () => {
+            // If mouse moves with #waitingForReentry set to true, it means that the mouse returned without firing a dragenter event, so we can assume the drag ended outside the window and we should end the drag-state.
+            if (this.#waitingForReentry) {
+                this.#handleMoveEnd();
+                this.#waitingForReentry = false;
+            }
+        };
+        this.#handleMouseOut = (event) => {
             if (event.buttons === 0) {
                 this.#handleMoveEnd();
             }
         };
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        this.#handleMouseUp = (event) => {
-            this.#handleMoveEnd();
+        this.#waitingForReentry = false;
+        this.#handleDragLeave = (e) => {
+            if (e.clientX <= 0 || e.clientY <= 0 || e.clientX >= window.innerWidth || e.clientY >= window.innerHeight) {
+                this.#waitingForReentry = true;
+            }
+        };
+        this.#handleDragEnter = () => {
+            this.#waitingForReentry = false;
         };
         this.#updateDragMove = () => {
             _a.rqaId = undefined;
@@ -671,10 +684,11 @@ export class UmbSorterController extends UmbControllerBase {
                 _a.originalSorter = undefined;
                 //UmbSorterController.activeSorter = this as unknown as UmbSorterController<unknown>;
                 //UmbSorterController.originalSorter = this as unknown as UmbSorterController<unknown>;
-                window.addEventListener('mouseup', this.#handleMouseUp);
-                window.addEventListener('mouseout', this.#handleMouseUp);
-                window.addEventListener('mouseleave', this.#handleMouseUp);
+                window.addEventListener('mouseout', this.#handleMouseOut);
+                window.addEventListener('mouseleave', this.#handleMouseOut);
                 window.addEventListener('mousemove', this.#handleMouseMove);
+                window.addEventListener('dragleave', this.#handleDragLeave);
+                window.addEventListener('dragenter', this.#handleDragEnter);
                 if (!this.#scrollElement) {
                     this.#scrollElement = getParentScrollElement(this.#containerElement, true);
                 }
@@ -798,10 +812,13 @@ export class UmbSorterController extends UmbControllerBase {
     /**
      * Listen to mouse move, to check if the mouse is still down.
      * This event does not happen while dragging, so its a indication that the drag is over.
+     * NOTE: On Firefox Linux, mousemove can fire during drag with buttons === 0, so we need to be careful.
      */
     #handleMouseMove;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    #handleMouseUp;
+    #handleMouseOut;
+    #waitingForReentry;
+    #handleDragLeave;
+    #handleDragEnter;
     #handleMoveEnd() {
         this.#cleanupMove();
         this.#stopAutoScroll();
@@ -832,6 +849,7 @@ export class UmbSorterController extends UmbControllerBase {
         _a.dropSorter = undefined;
         _a.originalIndex = undefined;
         _a.originalSorter = undefined;
+        this.#waitingForReentry = false;
         this.#dragX = 0;
         this.#dragY = 0;
     }
@@ -839,10 +857,11 @@ export class UmbSorterController extends UmbControllerBase {
         if (this.#containerElement) {
             this.#containerElement.style.minHeight = '';
         }
-        window.removeEventListener('mouseup', this.#handleMouseUp);
-        window.removeEventListener('mouseout', this.#handleMouseUp);
-        window.removeEventListener('mouseleave', this.#handleMouseUp);
+        window.removeEventListener('mouseout', this.#handleMouseOut);
+        window.removeEventListener('mouseleave', this.#handleMouseOut);
         window.removeEventListener('mousemove', this.#handleMouseMove);
+        window.removeEventListener('dragleave', this.#handleDragLeave);
+        window.removeEventListener('dragenter', this.#handleDragEnter);
     }
     #handleDragMove(event, instant) {
         if (!_a.activeItem) {

package/dist-cms/packages/core/store/detail/detail-store-base.d.ts

@@ -23,4 +23,11 @@ export declare abstract class UmbDetailStoreBase<T extends UmbEntityModel> exten
      * @memberof UmbDetailStoreBase
      */
     byUnique(unique: string): import("rxjs").Observable<T | undefined>;
+    /**
+     * Retrieve multiple detail models from the store
+     * @param {Array<string>} uniques - Array of unique identifiers
+     * @returns {Observable<Array<T>>}
+     * @memberof UmbDetailStoreBase
+     */
+    byUniques(uniques: Array<string>): import("rxjs").Observable<T[]>;
 }

package/dist-cms/packages/core/store/detail/detail-store-base.js

@@ -25,4 +25,13 @@ export class UmbDetailStoreBase extends UmbStoreBase {
     byUnique(unique) {
         return this._data.asObservablePart((x) => x.find((y) => y.unique === unique));
     }
+    /**
+     * Retrieve multiple detail models from the store
+     * @param {Array<string>} uniques - Array of unique identifiers
+     * @returns {Observable<Array<T>>}
+     * @memberof UmbDetailStoreBase
+     */
+    byUniques(uniques) {
+        return this._data.asObservablePart((x) => x.filter((y) => y.unique !== null && uniques.includes(y.unique)));
+    }
 }

package/dist-cms/packages/core/store/detail/detail-store.interface.d.ts

@@ -4,4 +4,5 @@ import type { UmbApi } from '../../../../libs/extension-api/index.js';
 import type { UmbEntityModel } from '../../entity/index.js';
 export interface UmbDetailStore<T extends UmbEntityModel> extends UmbStore<T>, UmbApi {
     byUnique: (unique: string) => Observable<T | undefined>;
+    byUniques: (uniques: Array<string>) => Observable<Array<T>>;
 }