Merge branch 'master' into rkaraivanov/tooltip

Author: RivaIvanova

src/components/common/controllers/drag.ts

@@ -6,7 +6,12 @@ import type {
 import type { Ref } from 'lit/directives/ref.js';
 
 import { getDefaultLayer } from '../../resize-container/default-ghost.js';
-import { findElementFromEventPath, getRoot, roundByDPR } from '../util.js';
+import {
+  findElementFromEventPath,
+  getRoot,
+  isLTR,
+  roundByDPR,
+} from '../util.js';
 
 type DragCallback = (parameters: DragCallbackParameters) => unknown;
 type DragCancelCallback = (state: DragState) => unknown;
@@ -21,13 +26,20 @@ type State = {
   current: DOMRect;
   position: { x: number; y: number };
   offset: { x: number; y: number };
+  pointerState: {
+    initial: { initialX: number; initialY: number };
+    current: { currentX: number; currentY: number };
+    direction: Direction;
+  };
 };
 
 type DragState = State & {
   ghost: HTMLElement | null;
   element: Element | null;
 };
 
+type Direction = 'start' | 'end' | 'bottom' | 'top';
+
 type DragControllerConfiguration = {
   /** Whether the drag feature is enabled for the current host. */
   enabled?: boolean;
@@ -157,13 +169,30 @@ class DragController implements ReactiveController {
   }
 
   private get _stateParameters(): DragState {
+    this._state.pointerState.direction = this._trackPointerMovement();
+
     return {
       ...this._state,
       ghost: this._ghost,
       element: this._matchedElement,
     };
   }
 
+  private _trackPointerMovement(): Direction {
+    const { initialX, initialY } = this._state.pointerState.initial;
+    const { currentX, currentY } = this._state.pointerState.current;
+    const deltaX = currentX - initialX;
+    const deltaY = currentY - initialY;
+    const LTR = isLTR(this._host);
+
+    const isHorizontalMove = Math.abs(deltaX) >= Math.abs(deltaY);
+
+    if (isHorizontalMove) {
+      return (LTR ? deltaX >= 0 : deltaX <= 0) ? 'end' : 'start';
+    }
+    return deltaY >= 0 ? 'bottom' : 'top';
+  }
+
   constructor(
     host: ReactiveControllerHost & LitElement,
     options?: DragControllerConfiguration
@@ -249,7 +278,11 @@ class DragController implements ReactiveController {
     this._createDragGhost();
     this._updatePosition(event);
 
-    const parameters = { event, state: this._stateParameters };
+    const parameters = {
+      event,
+      state: this._stateParameters,
+    };
+
     if (this._options.start?.call(this._host, parameters) === false) {
       this.dispose();
       return;
@@ -267,7 +300,20 @@ class DragController implements ReactiveController {
     this._updatePosition(event);
     this._updateMatcher(event);
 
-    const parameters = { event, state: this._stateParameters };
+    this._state.pointerState.initial = {
+      initialX: this._state.pointerState.current.currentX,
+      initialY: this._state.pointerState.current.currentY,
+    };
+    this._state.pointerState.current = {
+      currentX: event.clientX,
+      currentY: event.clientY,
+    };
+
+    const parameters = {
+      event,
+      state: this._stateParameters,
+    };
+
     this._options.move?.call(this._host, parameters);
 
     this._assignPosition(this._dragItem);
@@ -313,6 +359,11 @@ class DragController implements ReactiveController {
       current: structuredClone(rect),
       position,
       offset,
+      pointerState: {
+        initial: { initialX: clientX, initialY: clientY },
+        current: { currentX: clientX, currentY: clientY },
+        direction: 'end',
+      },
     };
   }
 

src/components/resize-container/resize-container.ts

@@ -19,6 +19,7 @@ import type {
   ResizeState,
 } from './types.js';
 
+/** @ignore */
 export interface IgcResizeContainerComponentEventMap {
   igcResizeStart: CustomEvent<ResizeCallbackParams>;
   igcResize: CustomEvent<ResizeCallbackParams>;

src/components/tile-manager/tile-dnd.spec.ts

@@ -75,7 +75,7 @@ describe('Tile drag and drop', () => {
       tile,
       { clientX: opts.x, clientY: opts.y },
       { x: opts.dx, y: opts.dy },
-      2
+      3
     );
   }
 
@@ -292,6 +292,22 @@ describe('Tile drag and drop', () => {
       await elementUpdated(draggedTile);
     });
 
+    it('should swap positions properly in RTL mode', async () => {
+      tileManager.dir = 'rtl';
+      const draggedTile = getTile(0);
+      const dropTarget = getTile(1);
+
+      await elementUpdated(tileManager);
+
+      expect(draggedTile.position).to.equal(0);
+      expect(dropTarget.position).to.equal(1);
+
+      await dragAndDrop(draggedTile, dropTarget);
+
+      expect(draggedTile.position).to.equal(1);
+      expect(dropTarget.position).to.equal(0);
+    });
+
     it('should swap positions properly when row, column and span are specified', async () => {
       const draggedTile = getTile(0);
       const dropTarget = getTile(1);

src/components/tile-manager/tile-ghost-util.ts

@@ -1,3 +1,4 @@
+import { isLTR } from '../common/util.js';
 import type IgcTileComponent from './tile.js';
 
 export function createTileDragGhost(tile: IgcTileComponent): IgcTileComponent {
@@ -13,6 +14,7 @@ export function createTileDragGhost(tile: IgcTileComponent): IgcTileComponent {
   });
 
   Object.assign(clone.style, {
+    direction: isLTR(tile) ? 'ltr' : 'rtl',
     position: 'absolute',
     contain: 'strict',
     top: 0,

src/components/tile-manager/tile-manager.ts

@@ -22,6 +22,7 @@ import { styles as shared } from './themes/shared/tile-manager.common.css.js';
 import { styles } from './themes/tile-manager.base.css.js';
 import IgcTileComponent from './tile.js';
 
+/* blazorAdditionalDependency: IgcTileComponent */
 /**
  * The tile manager component enables the dynamic arrangement, resizing, and interaction of tiles.
  *

src/components/tile-manager/tile.ts

@@ -26,8 +26,8 @@ import {
   asNumber,
   createCounter,
   findElementFromEventPath,
-  getCenterPoint,
   isEmpty,
+  isLTR,
   partNameMap,
 } from '../common/util.js';
 import IgcDividerComponent from '../divider/divider.js';
@@ -42,10 +42,10 @@ import { all } from './themes/tile.js';
 import { createTileDragGhost, createTileGhost } from './tile-ghost-util.js';
 import type IgcTileManagerComponent from './tile-manager.js';
 
-export type IgcTileChangeStateEventArgs = {
+export interface IgcTileChangeStateEventArgs {
   tile: IgcTileComponent;
   state: boolean;
-};
+}
 
 type AdornerType = 'side' | 'corner' | 'bottom';
 
@@ -135,6 +135,7 @@ export default class IgcTileComponent extends EventEmitterMixin<
   private _position = -1;
   private _resizeState = createTileResizeState();
   private _dragStack = createTileDragStack();
+  private _previousPointerPosition: { x: number; y: number } | null = null;
 
   private _customAdorners = new Map<string, boolean>(
     Object.entries({
@@ -399,17 +400,40 @@ export default class IgcTileComponent extends EventEmitterMixin<
     return true;
   }
 
-  private _handleDragOver(parameters: DragCallbackParameters) {
+  private _handleDragOver(parameters: DragCallbackParameters): void {
     const match = parameters.state.element as IgcTileComponent;
-    const { clientX, clientY } = parameters.event;
 
     if (this._dragStack.peek() === match) {
-      const { x, y } = getCenterPoint(match);
-
-      const shouldSwap =
-        this.position <= match.position
-          ? clientX > x || clientY > y
-          : clientX < x || clientY < y;
+      const direction = parameters.state.pointerState.direction;
+      const { clientX, clientY } = parameters.event;
+      const { left, top, width, height } = match.getBoundingClientRect();
+      const relativeX = (clientX - left) / width;
+      const relativeY = (clientY - top) / height;
+      const LTR = isLTR(this);
+
+      let shouldSwap = false;
+
+      switch (direction) {
+        case 'start':
+          shouldSwap =
+            this.position > match.position &&
+            (LTR ? relativeX <= 0.25 : relativeX >= 0.75);
+          break;
+
+        case 'end':
+          shouldSwap =
+            this.position < match.position &&
+            (LTR ? relativeX >= 0.75 : relativeX <= 0.25);
+          break;
+
+        case 'top':
+          shouldSwap = this.position > match.position && relativeY <= 0.25;
+          break;
+
+        case 'bottom':
+          shouldSwap = this.position < match.position && relativeY >= 0.75;
+          break;
+      }
 
       if (shouldSwap) {
         this._dragStack.pop();