@umbraco-cms/backoffice 14.0.0--preview005-d8ecd776 → 14.0.0--preview005-b4989b95

package/dist-cms/custom-elements.json

@@ -5297,20 +5297,6 @@
         }
       ]
     },
-    {
-      "name": "test-my-sorter-controller",
-      "path": "./../src/packages/core/sorter/stories/test-sorter-controller.element.ts",
-      "properties": [
-        {
-          "name": "styles",
-          "type": "array",
-          "default": "[null]"
-        },
-        {
-          "name": "sorter"
-        }
-      ]
-    },
     {
       "name": "umb-temporary-file-badge",
       "path": "./../src/packages/core/temporary-file/components/temporary-file-badge.element.ts",

package/dist-cms/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.js

@@ -21,11 +21,11 @@ import { UmbModalRouteRegistrationController } from '../../../../core/modal/inde
 import { UmbChangeEvent } from '../../../../core/event/index.js';
 import { UmbSorterController } from '../../../../core/sorter/index.js';
 const SORTER_CONFIG = {
-    compareElementToModel: (element, model) => {
-        return element.getAttribute('data-udi') === model.contentUdi;
+    getUniqueOfElement: (element) => {
+        return element.getAttribute('data-udi');
     },
-    querySelectModelToElement: (container, modelEntry) => {
-        return container.querySelector("umb-property-editor-ui-block-list-block[data-udi='" + modelEntry.contentUdi + "']");
+    getUniqueOfModel: (modelEntry) => {
+        return modelEntry.contentUdi;
     },
     identifier: 'block-list-editor',
     itemSelector: 'umb-property-editor-ui-block-list-block',

package/dist-cms/packages/core/components/backoffice-notification-container/backoffice-notification-container.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbTextStyles } from '../../../../shared/style/index.js';
 import { css, html, customElement, state, repeat, query } from '../../../../external/lit/index.js';
-import { UMB_NOTIFICATION_CONTEXT, } from '../../notification/index.js';
+import { UMB_NOTIFICATION_CONTEXT } from '../../notification/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 let UmbBackofficeNotificationContainerElement = class UmbBackofficeNotificationContainerElement extends UmbLitElement {
     constructor() {
@@ -25,11 +25,11 @@ let UmbBackofficeNotificationContainerElement = class UmbBackofficeNotificationC
             // TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
-            this._notificationsElement?.hidePopover();
+            this._notificationsElement?.hidePopover?.(); // To prevent issues in FireFox I added `?.` before `()`  [NL]
             // TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
-            this._notificationsElement?.showPopover();
+            this._notificationsElement?.showPopover?.(); // To prevent issues in FireFox I added `?.` before `()`  [NL]
         });
     }
     render() {

package/dist-cms/packages/core/components/multiple-color-picker-input/multiple-color-picker-input.element.js

@@ -17,11 +17,11 @@ import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { UmbSorterController } from '../../sorter/index.js';
 import { UMB_PROPERTY_DATASET_CONTEXT } from '../../property/index.js';
 const SORTER_CONFIG = {
-    compareElementToModel: (element, model) => {
-        return element.getAttribute('data-sort-entry-id') === model.value;
+    getUniqueOfElement: (element) => {
+        return element.value.toString();
     },
-    querySelectModelToElement: (container, modelEntry) => {
-        return container.querySelector('[data-sort-entry-id=' + modelEntry.value + ']');
+    getUniqueOfModel: (modelEntry) => {
+        return modelEntry.value;
     },
     identifier: 'Umb.SorterIdentifier.ColorEditor',
     itemSelector: 'umb-multiple-color-picker-item-input',
@@ -132,7 +132,6 @@ _UmbMultipleColorPickerInputElement_renderItems = function _UmbMultipleColorPick
 			${repeat(this._items, (item) => item.value, (item, index) => html ` <umb-multiple-color-picker-item-input
 						?showLabels=${this.showLabels}
 						value=${item.value}
-						data-sort-entry-id=${item.value}
 						label=${ifDefined(item.label)}
 						name="item-${index}"
 						@change=${(event) => __classPrivateFieldGet(this, _UmbMultipleColorPickerInputElement_instances, "m", _UmbMultipleColorPickerInputElement_onChange).call(this, event, index)}

package/dist-cms/packages/core/components/multiple-text-string-input/input-multiple-text-string.element.js

@@ -16,11 +16,11 @@ import { UmbChangeEvent } from '../../event/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { UmbSorterController } from '../../sorter/index.js';
 const SORTER_CONFIG = {
-    compareElementToModel: (element, model) => {
-        return element.getAttribute('data-sort-entry-id') === model.value;
+    getUniqueOfElement: (element) => {
+        return element.getAttribute('data-sort-entry-id');
     },
-    querySelectModelToElement: (container, modelEntry) => {
-        return container.querySelector('[data-sort-entry-id=' + modelEntry.value + ']');
+    getUniqueOfModel: (modelEntry) => {
+        return modelEntry.value;
     },
     identifier: 'Umb.SorterIdentifier.ColorEditor',
     itemSelector: 'umb-input-multiple-text-string-item',

package/dist-cms/packages/core/sorter/sorter.controller.d.ts

@@ -1,8 +1,8 @@
 import type { UmbController, UmbControllerHostElement } from '../../../libs/controller-api/index.js';
 type INTERNAL_UmbSorterConfig<T, ElementType extends HTMLElement> = {
-    compareElementToModel: (el: ElementType, modelEntry: T) => boolean;
-    querySelectModelToElement: (container: HTMLElement, modelEntry: T) => ElementType | null;
-    identifier: string;
+    getUniqueOfElement: (element: ElementType) => string | null | symbol | number;
+    getUniqueOfModel: (modeEntry: T) => string | null | symbol | number;
+    identifier: string | symbol;
     itemSelector: string;
     disabledItemSelector?: string;
     containerSelector: string;
@@ -58,7 +58,7 @@ type INTERNAL_UmbSorterConfig<T, ElementType extends HTMLElement> = {
         item: T;
     }) => Promise<boolean> | boolean;
 };
-export type UmbSorterConfig<T, ElementType extends HTMLElement = HTMLElement> = Omit<INTERNAL_UmbSorterConfig<T, ElementType>, 'ignorerSelector' | 'containerSelector'> & Partial<Pick<INTERNAL_UmbSorterConfig<T, ElementType>, 'ignorerSelector' | 'containerSelector'>>;
+export type UmbSorterConfig<T, ElementType extends HTMLElement = HTMLElement> = Omit<INTERNAL_UmbSorterConfig<T, ElementType>, 'ignorerSelector' | 'containerSelector' | 'identifier'> & Partial<Pick<INTERNAL_UmbSorterConfig<T, ElementType>, 'ignorerSelector' | 'containerSelector' | 'identifier'>>;
 /**
  * @export
  * @class UmbSorterController
@@ -67,20 +67,32 @@ export type UmbSorterConfig<T, ElementType extends HTMLElement = HTMLElement> =
  */
 export declare class UmbSorterController<T, ElementType extends HTMLElement = HTMLElement> implements UmbController {
     #private;
+    static originalSorter?: UmbSorterController<unknown>;
+    static originalIndex?: number;
+    static dropSorter?: UmbSorterController<unknown>;
+    static activeSorter?: UmbSorterController<unknown>;
+    static activeIndex?: number;
+    static activeItem?: any;
+    static activeElement?: HTMLElement;
+    static activeDragElement?: Element;
     get controllerAlias(): string;
+    get identifier(): string | symbol;
     constructor(host: UmbControllerHostElement, config: UmbSorterConfig<T, ElementType>);
     setModel(model: Array<T>): void;
+    hasItem(unique: string): boolean;
+    getItem(unique: string): T | undefined;
     hostConnected(): void;
     private _onFirstRender;
     hostDisconnected(): void;
+    _itemDraggedOver: (e: DragEvent) => void;
     setupItem(element: ElementType): void;
     destroyItem(element: HTMLElement): void;
     /** Management methods: */
     getItemOfElement(element: ElementType): T | undefined;
     removeItem(item: T): Promise<boolean>;
     hasOtherItemsThan(item: T): boolean;
-    moveItemInModel(newIndex: number, element: ElementType, fromCtrl: UmbSorterController<T, ElementType>): Promise<boolean>;
-    updateAllowIndication(controller: UmbSorterController<T, ElementType>, item: T): boolean;
+    moveItemInModel(newIndex: number, fromCtrl: UmbSorterController<unknown>): Promise<boolean>;
+    updateAllowIndication(item: T): boolean;
     removeAllowIndication(): void;
     private autoScrollX;
     private autoScrollY;