bm-core-ui 2.12.0-beta.10 → 2.12.0-beta.13

package/build/@types/index.d.ts

@@ -5838,6 +5838,12 @@ export class BMDragSession implements EventHandlerObject {
 	 */
 	readonly transferKind?: BMDragTransferKind | null | undefined;
 
+	/**
+	 * Set to `YES` after this drag session finishes.
+	 *     
+	 */
+	private _finished: boolean;
+
 	/**
 	 * Sets up the drag previews and indicator and appropriate event handlers and starts tracking
 	 * a drag originating from the event with which this drag session was initialized.
@@ -5902,6 +5908,22 @@ export class BMDragSession implements EventHandlerObject {
 	private _setDropTarget(target?: BMView | null | undefined): void;
 
 
+	/**
+	 * Causes this drag session to request a new drop action from its delegate if no
+	 * drop session is currently active, then set it as the current drop action.
+	 *     
+	 */
+	invalidateDropAction(): void;
+
+
+	/**
+	 * Causes this drag session to request a new drop action from its delegate if the specified drop session
+	 * is the currently active one, then set it as the current action for the this session.
+	 *     
+	 */
+	private _invalidateDropActionForDropSession(): void;
+
+
 	/**
 	 * Updates the drop action displayed by this drag session, based on the current
 	 * source and target drop actions.
@@ -5997,6 +6019,15 @@ export class BMDropSession {
 	 */
 	readonly dropAction: BMDropSessionAction;
 
+	/**
+	 * Causes this drop session to request a new drop action from its delegate if it
+	 * is the current active drop session for the current drag session, then set it as the current action
+	 * for the drag session.
+	 *     
+	 */
+	invalidateDropAction(): void;
+
+
 	/**
 	 * An array of drop previews that can be used to customize the drop animation. This property is only
 	 * initialized at the end of accepted drop sessions if the delegate object implemented the

package/build/BMCollectionView/BMCollectionView.js

@@ -3582,13 +3582,20 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		// If this collection view was already waiting for the data set to insert some data from a drop,
 		// play the generic drop animation for those previews
 		if (this._dropPreviews) {
-			for (const preview of this._dropPreviews) {
-				preview.performDrop();
-			}
+			BMAnimateWithBlock(() => {
+				for (const preview of this._dropPreviews) {
+					preview.performDrop();
+				}
+			}, {duration: 300, easing: 'easeInQuad'});
 		}
 
 		// If there are no items to accept, don't perform any other changes
 		if (!session.dropItems.length) {
+			BMAnimateWithBlock(() => {
+				for (const preview of session.dropPreviews) {
+					preview.performDrop();
+				}
+			}, {duration: 300, easing: 'easeInQuad'});
 			return;
 		}
 
@@ -3625,9 +3632,12 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 						this._dropPreviews = undefined;
 					}
 
-					for (const preview of dropPreviews) {
-						preview.performDrop();
-					}
+					BMAnimateWithBlock(() => {
+						for (const preview of dropPreviews) {
+							preview.performDrop();
+						}
+					}, {duration: 300, easing: 'easeInQuad'});
+
 				}
 			}, _BMCollectionViewAsynchronousDropDelay);
 		}
@@ -6811,7 +6821,10 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 			self.scrollOffset = offset;
 
 			if (!currentContext) {
-				BMAnimationApply();
+				return BMAnimationApply();
+			}
+			else {
+				return new Promise(resolve => BMAnimationContextAddCompletionHandler(resolve));
 			}
 		}
 		else {

package/build/BMView/BMDragSession.js

@@ -375,6 +375,11 @@ BMDragSession.prototype = {
         return this._transferKind;
     },
 
+    /**
+     * Set to `YES` after this drag session finishes.
+     */
+    _finished: NO, // <Boolean>
+
     /**
      * Sets up the drag previews and indicator and appropriate event handlers and starts tracking
      * a drag originating from the event with which this drag session was initialized.
@@ -586,6 +591,8 @@ BMDragSession.prototype = {
     async _dragDidFinishWithEvent(event) {
         event.preventDefault();
 
+        this._finished = YES;
+
         this._action = this._dropAction;
 
         // Instruct the delegates that the session is about to end
@@ -855,7 +862,7 @@ BMDragSession.prototype = {
                 const session = this._dropSessions.get(target);
                 session._delegate.dropSessionDidEnter?.(session);
 
-                let action = session._delegate.dropSessionDidUpdate?.(this) ?? BMDropSessionAction.actionWithKind(BMDropSessionActionKind.Ignore);
+                let action = session._delegate.dropSessionDidUpdate?.(session) ?? BMDropSessionAction.actionWithKind(BMDropSessionActionKind.Ignore);
 
                 // If the target action is delete, the source delegate must be able to specify
                 // a transfer of kind move
@@ -892,6 +899,11 @@ BMDragSession.prototype = {
         this._itemPreviewsUpdateIdentifier = setTimeout(() => {
             this._itemPreviewsUpdateIdentifier = undefined;
 
+            // If the session finished in the meantime, don't perform any further transition
+            if (this._finished) {
+                return;
+            }
+
             const newPreviews = new Map();
             if (this._dropTarget && this._dropTarget != this._sourceView) {
                 // If there is a valid drop target, request item previews and apply them
@@ -912,6 +924,48 @@ BMDragSession.prototype = {
         }, 16);
     },
 
+
+    /**
+     * Causes this drag session to request a new drop action from its delegate if no
+     * drop session is currently active, then set it as the current drop action.
+     */
+    invalidateDropAction() {
+        if (this._finished || this._dropTarget && this._dropTarget != this._sourceView) {
+            return;
+        }
+
+        // Dispatch an update to the source view then update the drop action accordingly
+        const sourceAction = this._delegate.dragSessionDidUpdate?.(this);
+        if (sourceAction) {
+            this._sourceDropAction = sourceAction;
+            this._updateDropAction();
+        }
+    },
+
+
+    /**
+     * Causes this drag session to request a new drop action from its delegate if the specified drop session
+     * is the currently active one, then set it as the current action for the this session.
+     */
+    _invalidateDropActionForDropSession(session) {
+        if (this._finished || !this._dropTarget || this._dropTarget == this._sourceView) {
+            return;
+        }
+
+        const dropSession = this._dropSessions.get(this._dropTarget);
+        if (dropSession != session) {
+            return;
+        }
+
+        // Dispatch an update to the target view then update the drop action accordingly
+        const targetAction = session._delegate.dropSessionDidUpdate?.(session) ?? BMDropSessionAction.actionWithKind(BMDropSessionActionKind.Ignore);
+        if (targetAction) {
+            session._dropAction = targetAction;
+            this._targetDropAction = targetAction;
+            this._updateDropAction();
+        }
+    },
+
     /**
      * Updates the drop action displayed by this drag session, based on the current
      * source and target drop actions.
@@ -1109,6 +1163,15 @@ BMDropSession.prototype = {
         return this._dropAction;
     },
 
+    /**
+     * Causes this drop session to request a new drop action from its delegate if it
+     * is the current active drop session for the current drag session, then set it as the current action
+     * for the drag session.
+     */
+    invalidateDropAction() {
+        this._dragSession._invalidateDropActionForDropSession(this);
+    },
+
     /**
      * An array of drop previews that can be used to customize the drop animation. This property is only
      * initialized at the end of accepted drop sessions if the delegate object implemented the

package/build/BMView/BMMenu.js

@@ -1282,7 +1282,9 @@ BMMenu.prototype = {
             // If the mouse pointer enters the submenu's frame, cause it to acquire focus
             // and resume events
             if (submenuFrame.intersectsPoint(currentPosition)) {
-                submenu._node.focus();
+                if (submenu._node) {
+                    submenu._node.focus();
+                }
                 resumeEvents();
                 return;
             }

package/lib/@types/BMCoreUI.min.d.ts

@@ -5838,6 +5838,12 @@ declare class BMDragSession implements EventHandlerObject {
 	 */
 	readonly transferKind?: BMDragTransferKind | null | undefined;
 
+	/**
+	 * Set to `YES` after this drag session finishes.
+	 *     
+	 */
+	private _finished: boolean;
+
 	/**
 	 * Sets up the drag previews and indicator and appropriate event handlers and starts tracking
 	 * a drag originating from the event with which this drag session was initialized.
@@ -5902,6 +5908,22 @@ declare class BMDragSession implements EventHandlerObject {
 	private _setDropTarget(target?: BMView | null | undefined): void;
 
 
+	/**
+	 * Causes this drag session to request a new drop action from its delegate if no
+	 * drop session is currently active, then set it as the current drop action.
+	 *     
+	 */
+	invalidateDropAction(): void;
+
+
+	/**
+	 * Causes this drag session to request a new drop action from its delegate if the specified drop session
+	 * is the currently active one, then set it as the current action for the this session.
+	 *     
+	 */
+	private _invalidateDropActionForDropSession(): void;
+
+
 	/**
 	 * Updates the drop action displayed by this drag session, based on the current
 	 * source and target drop actions.
@@ -5997,6 +6019,15 @@ declare class BMDropSession {
 	 */
 	readonly dropAction: BMDropSessionAction;
 
+	/**
+	 * Causes this drop session to request a new drop action from its delegate if it
+	 * is the current active drop session for the current drag session, then set it as the current action
+	 * for the drag session.
+	 *     
+	 */
+	invalidateDropAction(): void;
+
+
 	/**
 	 * An array of drop previews that can be used to customize the drop animation. This property is only
 	 * initialized at the end of accepted drop sessions if the delegate object implemented the