Skip to content

Commit

Permalink
test: early return
Browse files Browse the repository at this point in the history
  • Loading branch information
ndom91 committed Oct 30, 2024
1 parent e8231e0 commit ff08666
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 3 deletions.
5 changes: 5 additions & 0 deletions apps/desktop/src/lib/dragging/dropzone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,21 @@ export const dropzoneRegistry = new Map<HTMLElement, Dropzone>();

export function dropzone(node: HTMLElement, configuration: DropzoneConfiguration) {
function setup(configuration: DropzoneConfiguration) {
console.log('registryNode', node);
if (configuration.disabled) return;
if (!node) return;

if (dropzoneRegistry.has(node)) {
console.log('registryNode.cleaning');
clean();
}

dropzoneRegistry.set(node, new Dropzone(configuration, node));
}

function clean() {
if (!node) return;

dropzoneRegistry.get(node)?.unregister();
dropzoneRegistry.delete(node);
}
Expand Down
23 changes: 20 additions & 3 deletions apps/desktop/src/lib/dragging/stackingReorderDropzoneManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,37 @@ export class StackingReorderDropzone {
private branchController: BranchController,
private currentSeries: PatchSeries,
private series: PatchSeries[],
private commitId: string
public commitId: string
) {}

accepts(data: any) {
if (!(data instanceof DraggableCommit)) return false;
if (data.branchId !== this.branchId) return false;
if (distanceBetweenCommits(this.series, data.commit.id, this.commitId) === 0) return false;
if (
this.commitId !== 'top' &&
distanceBetweenCommits(this.series, data.commit.id, this.commitId) === 0
)
return false;

return true;
}

onDrop(data: any) {
const allSeriesCommits = this.series.map((s) => ({
name: s.name,
commitIds: s.patches.map((p) => p.id)
}));

const flatCommits = allSeriesCommits.flatMap((s) => s.commitIds);

console.log('onDrop', {
data,
find: flatCommits.find((p) => p === data.commit.id)
});

if (!(data instanceof DraggableCommit)) return;
if (data.branchId !== this.branchId) return;
if (!flatCommits.find((p) => p === data.commit.id)) return;

const stackOrder = getTargetStackOrder(
this.series,
Expand All @@ -30,7 +47,7 @@ export class StackingReorderDropzone {
this.commitId
);

// console.log('onDrop.stackOrder.series', { series: stackOrder });
console.log('onDrop.stackOrder.series', { series: stackOrder });
if (stackOrder) {
this.branchController.reorderStackCommit(data.branchId, stackOrder);
}
Expand Down

0 comments on commit ff08666

Please sign in to comment.