typo3-typescript-sources 13.4.37 → 13.4.39

package/.last-synced-tag

@@ -1 +1 @@
-v13.4.37
+v13.4.39

package/README.md

@@ -23,7 +23,7 @@ npm install github:maikschneider/typo3-typescript-sources#main
 
 - **Original Repository:** [TYPO3/typo3](https://github.com/TYPO3/typo3)
 - **Source Path:** `Build/Sources/TypeScript/`
-- **Current TYPO3 Version:** `v13.4.37`
+- **Current TYPO3 Version:** `v13.4.39`
 
 ## 🌿 Branches
 

package/backend/tests/utility/drag-drop-utility-test.ts

@@ -0,0 +1,82 @@
+import DragDropUtility from '@typo3/backend/utility/drag-drop-utility.js';
+import { expect } from '@open-wc/testing';
+import { stub, type SinonStub } from 'sinon';
+import type { } from 'mocha';
+
+type DragEventState = {
+  dropEffect: DataTransfer['dropEffect'],
+  effectAllowed?: DataTransfer['effectAllowed'],
+  ctrlKey?: boolean,
+  altKey?: boolean,
+};
+
+function createDragEvent(state: DragEventState): DragEvent {
+  return {
+    ctrlKey: state.ctrlKey ?? false,
+    altKey: state.altKey ?? false,
+    dataTransfer: {
+      dropEffect: state.dropEffect,
+      effectAllowed: state.effectAllowed ?? 'copyMove',
+    },
+  } as unknown as DragEvent;
+}
+
+describe('@typo3/backend/utility/drag-drop-utility', () => {
+  let userAgentStub: SinonStub;
+
+  afterEach(() => {
+    userAgentStub?.restore();
+  });
+
+  function emulatePlatform(userAgent: string): void {
+    userAgentStub = stub(navigator, 'userAgent').get(() => userAgent);
+  }
+
+  describe('on Windows', () => {
+    beforeEach(() => {
+      emulatePlatform('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/156.0.0.0 Safari/537.36');
+    });
+
+    it('detects a copy intention when Ctrl is held although the browser preset dropEffect to "move"', () => {
+      const event = createDragEvent({ dropEffect: 'move', ctrlKey: true });
+      expect(DragDropUtility.isCopyModifierFromEvent(event)).to.equal(true);
+    });
+
+    it('detects a move intention without modifier', () => {
+      const event = createDragEvent({ dropEffect: 'move' });
+      expect(DragDropUtility.isCopyModifierFromEvent(event)).to.equal(false);
+    });
+
+    it('keeps the copy intention propagated by dropEffect', () => {
+      const event = createDragEvent({ dropEffect: 'copy' });
+      expect(DragDropUtility.isCopyModifierFromEvent(event)).to.equal(true);
+    });
+
+    it('reflects the copy intention in dropEffect', () => {
+      const event = createDragEvent({ dropEffect: 'move', ctrlKey: true });
+      DragDropUtility.updateEventAndTooltipToReflectCopyMoveIntention(event);
+      expect(event.dataTransfer.dropEffect).to.equal('copy');
+    });
+  });
+
+  describe('on macOS', () => {
+    beforeEach(() => {
+      emulatePlatform('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/156.0.0.0 Safari/537.36');
+    });
+
+    it('detects a copy intention when Option is held although the browser preset dropEffect to "move"', () => {
+      const event = createDragEvent({ dropEffect: 'move', altKey: true });
+      expect(DragDropUtility.isCopyModifierFromEvent(event)).to.equal(true);
+    });
+
+    it('detects a copy intention when the platform restricted the operation to copy', () => {
+      const event = createDragEvent({ dropEffect: 'none', effectAllowed: 'copy' });
+      expect(DragDropUtility.isCopyModifierFromEvent(event)).to.equal(true);
+    });
+
+    it('ignores Ctrl', () => {
+      const event = createDragEvent({ dropEffect: 'move', ctrlKey: true });
+      expect(DragDropUtility.isCopyModifierFromEvent(event)).to.equal(false);
+    });
+  });
+});

package/backend/utility/drag-drop-utility.ts

@@ -20,17 +20,13 @@ import type { DragTooltipMetadata } from '@typo3/backend/drag-tooltip';
  */
 export default class DragDropUtility {
   public static isCopyModifierFromEvent(event: DragEvent): boolean {
-    if (event.dataTransfer.dropEffect === 'copy') {
-      return true;
-    }
-
-    if (event.dataTransfer.dropEffect === 'move') {
-      return false;
-    }
-
-    return navigator.userAgent.includes('Mac')
+    // Browsers may preset dropEffect to "move" regardless of pressed modifiers
+    // (e.g. Chrome on Windows), therefore the modifier takes precedence.
+    const isCopyModifierPressed = navigator.userAgent.includes('Mac')
       ? (event.dataTransfer.effectAllowed === 'copy' || event.altKey)
       : event.ctrlKey;
+
+    return isCopyModifierPressed || event.dataTransfer.dropEffect === 'copy';
   }
 
   public static updateEventAndTooltipToReflectCopyMoveIntention(event: DragEvent): void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typo3-typescript-sources",
-  "version": "13.4.37",
+  "version": "13.4.39",
   "description": "TYPO3 Core TypeScript Sources - Extracted from TYPO3/typo3 repository",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,7 +28,7 @@
   },
   "typo3": {
     "sourceRepository": "https://github.com/TYPO3/typo3",
-    "sourceTag": "v13.4.37",
+    "sourceTag": "v13.4.39",
     "sourcePath": "Build/Sources/TypeScript"
   }
 }