Skip to content

🎥 Make videos programmatically with React

Remove obsolete sequence drag data handling

JonnyBurger81ef0bc84809
diff --git a/packages/example/e2e/sequence-reorder.test.mts b/packages/example/e2e/sequence-reorder.test.mts
deleted file mode 100644
index cf4fa8ffae..0000000000
--- a/packages/example/e2e/sequence-reorder.test.mts
+++ /dev/null
@@ -1,88 +0,0 @@
-import {expect, test, type Page} from '@playwright/test';
-import {STUDIO_URL} from './constants.mts';
-import {startStudio, stopStudio} from './studio-server.mts';
-
-const effectDragError = 'Could not read effect drag data';
-
-const dropOnTimelineRow = async ({
- page,
- title,
- data,
-}: {
- readonly page: Page;
- readonly title: string;
- readonly data: Record<string, string>;
-}) => {
- await page
- .locator(`[title="${title}"]`)
- .first()
- .evaluate((element, dropData) => {
- const timelineRow = element.parentElement?.parentElement?.parentElement;
- if (!timelineRow) {
- throw new Error('Could not find timeline row');
- }
-
- const dataTransfer = new DataTransfer();
- for (const [type, value] of Object.entries(dropData)) {
- dataTransfer.setData(type, value);
- }
-
- timelineRow.dispatchEvent(
- new DragEvent('drop', {
- bubbles: true,
- cancelable: true,
- dataTransfer,
- }),
- );
- }, data);
-};
-
-test.describe('sequence reorder', () => {
- test.beforeEach(async () => {
- await startStudio();
- });
-
- test.afterEach(async () => {
- await stopStudio();
- });
-
- test('does not parse sequence reorder data as effect drag data', async ({
- page,
- }) => {
- await page.goto(`${STUDIO_URL}/issue-8216`);
- await expect(page).toHaveURL(/issue-8216/, {timeout: 15_000});
- await page.waitForFunction(
- () => !document.body.innerText.includes('Loading...'),
- {timeout: 30_000},
- );
-
- await expect(page.locator('[title="Background"]').first()).toBeVisible({
- timeout: 15_000,
- });
-
- await dropOnTimelineRow({
- page,
- title: 'Background',
- data: {
- 'text/plain': 'not effect drag data',
- },
- });
- await expect(page.getByText(effectDragError)).toBeHidden();
-
- await dropOnTimelineRow({
- page,
- title: 'Background',
- data: {
- 'application/remotion-sequence-reorder': JSON.stringify({
- nodePath: {nodePath: [0]},
- nodePathKey: 'source',
- trackIndex: 0,
- parentId: null,
- fileName: 'Issue8216.tsx',
- }),
- },
- });
-
- await expect(page.getByText(effectDragError)).toBeHidden();
- });
-});
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx
index 2af098e587..a36cbe1c3c 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx
@@ -132,8 +132,6 @@ const effectDropHighlight: React.CSSProperties = {
outlineOffset: -1,
};
-const SEQUENCE_REORDER_MIME_TYPE = 'application/remotion-sequence-reorder';
-
type SequenceReorderDragData = {
readonly nodePath: SequencePropsSubscriptionKey;
readonly nodePathKey: string;
@@ -222,14 +220,6 @@ const sequenceReorderAfterLine: React.CSSProperties = {
top: -1,
};
-const hasSequenceReorderDragType = (dataTransfer: DataTransfer) => {
- return Array.from(dataTransfer.types).includes(SEQUENCE_REORDER_MIME_TYPE);
-};
-
-const isSequenceReorderDrag = (dataTransfer: DataTransfer) => {
- return hasSequenceReorderDragType(dataTransfer);
-};
-
const getDestinationIndex = ({
fromIndex,
insertionIndex,
@@ -1342,11 +1332,7 @@ const TimelineSequenceItemInner: React.FC<{
const onEffectDragOver = useCallback(
(e: React.DragEvent<HTMLDivElement>) => {
- if (
- !canDropEffect ||
- isSequenceReorderDrag(e.dataTransfer) ||
- !hasEffectDragType(e.dataTransfer)
- ) {
+ if (!canDropEffect || !hasEffectDragType(e.dataTransfer)) {
return;
}
@@ -1375,7 +1361,6 @@ const TimelineSequenceItemInner: React.FC<{
previewServerState.type !== 'connected' ||
nodePath === null ||
validatedLocation === null ||
- isSequenceReorderDrag(e.dataTransfer) ||
!hasEffectDragType(e.dataTransfer)
) {
return;