refactor(wysiwyg): Clean up code and ensure drag-drop works with programmatic rendering
- Update drag handler to work without requestUpdate calls - Remove duplicate modal methods (using WysiwygModalManager) - Clean up unused imports and methods - Ensure all DOM updates are programmatic - Add comprehensive test files for all features - Follow separation of concerns principles
This commit is contained in:
@ -31,13 +31,10 @@ export class WysiwygDragDropHandler {
|
||||
e.dataTransfer.effectAllowed = 'move';
|
||||
e.dataTransfer.setData('text/plain', block.id);
|
||||
|
||||
// Update UI state
|
||||
this.updateComponentState();
|
||||
// Update component state (for parent drag handler access)
|
||||
this.component.draggedBlockId = this.draggedBlockId;
|
||||
|
||||
// Add slight delay to show dragging state
|
||||
setTimeout(() => {
|
||||
this.component.requestUpdate();
|
||||
}, 10);
|
||||
// The parent component already handles adding dragging classes programmatically
|
||||
}
|
||||
|
||||
/**
|
||||
@ -47,8 +44,13 @@ export class WysiwygDragDropHandler {
|
||||
this.draggedBlockId = null;
|
||||
this.dragOverBlockId = null;
|
||||
this.dragOverPosition = null;
|
||||
this.updateComponentState();
|
||||
this.component.requestUpdate();
|
||||
|
||||
// Update component state
|
||||
this.component.draggedBlockId = null;
|
||||
this.component.dragOverBlockId = null;
|
||||
this.component.dragOverPosition = null;
|
||||
|
||||
// The parent component already handles removing dragging classes programmatically
|
||||
}
|
||||
|
||||
/**
|
||||
@ -65,8 +67,12 @@ export class WysiwygDragDropHandler {
|
||||
|
||||
this.dragOverBlockId = block.id;
|
||||
this.dragOverPosition = e.clientY < midpoint ? 'before' : 'after';
|
||||
this.updateComponentState();
|
||||
this.component.requestUpdate();
|
||||
|
||||
// Update component state
|
||||
this.component.dragOverBlockId = this.dragOverBlockId;
|
||||
this.component.dragOverPosition = this.dragOverPosition;
|
||||
|
||||
// The parent component already handles drag-over classes programmatically
|
||||
}
|
||||
|
||||
/**
|
||||
@ -76,8 +82,12 @@ export class WysiwygDragDropHandler {
|
||||
if (this.dragOverBlockId === block.id) {
|
||||
this.dragOverBlockId = null;
|
||||
this.dragOverPosition = null;
|
||||
this.updateComponentState();
|
||||
this.component.requestUpdate();
|
||||
|
||||
// Update component state
|
||||
this.component.dragOverBlockId = null;
|
||||
this.component.dragOverPosition = null;
|
||||
|
||||
// The parent component already handles removing drag-over classes programmatically
|
||||
}
|
||||
}
|
||||
|
||||
@ -89,48 +99,11 @@ export class WysiwygDragDropHandler {
|
||||
|
||||
if (!this.draggedBlockId || this.draggedBlockId === targetBlock.id) return;
|
||||
|
||||
const blocks = [...this.component.blocks];
|
||||
const draggedIndex = blocks.findIndex(b => b.id === this.draggedBlockId);
|
||||
const targetIndex = blocks.findIndex(b => b.id === targetBlock.id);
|
||||
|
||||
if (draggedIndex === -1 || targetIndex === -1) return;
|
||||
|
||||
// Remove the dragged block
|
||||
const [draggedBlock] = blocks.splice(draggedIndex, 1);
|
||||
|
||||
// Calculate the new index
|
||||
let newIndex = targetIndex;
|
||||
if (this.dragOverPosition === 'after') {
|
||||
newIndex = draggedIndex < targetIndex ? targetIndex : targetIndex + 1;
|
||||
} else {
|
||||
newIndex = draggedIndex < targetIndex ? targetIndex - 1 : targetIndex;
|
||||
}
|
||||
|
||||
// Insert at new position
|
||||
blocks.splice(newIndex, 0, draggedBlock);
|
||||
|
||||
// Update blocks
|
||||
this.component.blocks = blocks;
|
||||
this.component.updateValue();
|
||||
this.handleDragEnd();
|
||||
|
||||
// Focus the moved block
|
||||
setTimeout(() => {
|
||||
const blockOps = this.component.blockOperations;
|
||||
if (draggedBlock.type !== 'divider') {
|
||||
blockOps.focusBlock(draggedBlock.id);
|
||||
}
|
||||
}, 100);
|
||||
// The parent component already has a handleDrop method that handles this programmatically
|
||||
// We'll delegate to that to ensure proper programmatic rendering
|
||||
this.component.handleDrop(e, targetBlock);
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates component drag state
|
||||
*/
|
||||
private updateComponentState(): void {
|
||||
this.component.draggedBlockId = this.draggedBlockId;
|
||||
this.component.dragOverBlockId = this.dragOverBlockId;
|
||||
this.component.dragOverPosition = this.dragOverPosition;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a block is being dragged
|
||||
|
Reference in New Issue
Block a user