binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[WEB-5423] revert: update imports for pragmatic-drag-and-drop to use cjs entry points and add TypeScript error handling (#8118)

Browse source
This commit is contained in:
Prateek Shourya 2025-11-14 19:04:49 +05:30 • committed by GitHub
parent 19a0ef490b
commit c04ae51d20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/ui/src/sortable/draggable.tsx
View file

@ -1,6 +1,15 @@
import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine"; // @ts-expect-error Due to live server dependencies
import { draggable, dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter"; import { combine } from "@atlaskit/pragmatic-drag-and-drop/dist/cjs/entry-point/combine.js";
import { attachClosestEdge, extractClosestEdge } from "@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge"; import {
draggable,
dropTargetForElements,
// @ts-expect-error Due to live server dependencies
} from "@atlaskit/pragmatic-drag-and-drop/dist/cjs/entry-point/element/adapter.js";
import {
attachClosestEdge,
extractClosestEdge,
// @ts-expect-error Due to live server dependencies
} from "@atlaskit/pragmatic-drag-and-drop-hitbox/dist/cjs/closest-edge.js";
import { isEqual } from "lodash-es"; import { isEqual } from "lodash-es";
import React, { useEffect, useRef, useState } from "react"; import React, { useEffect, useRef, useState } from "react";
import { DropIndicator } from "../drop-indicator"; import { DropIndicator } from "../drop-indicator";
@ -30,6 +39,7 @@ const Draggable = ({ children, data, className }: Props) => {
}), }),
dropTargetForElements({ dropTargetForElements({
element: el, element: el,
// @ts-expect-error Due to live server dependencies
onDragEnter: (args) => { onDragEnter: (args) => {
setIsDraggedOver(true); setIsDraggedOver(true);
setClosestEdge(extractClosestEdge(args.self.data)); setClosestEdge(extractClosestEdge(args.self.data));
@ -38,7 +48,9 @@ const Draggable = ({ children, data, className }: Props) => {
onDrop: () => { onDrop: () => {
setIsDraggedOver(false); setIsDraggedOver(false);
}, },
// @ts-expect-error Due to live server dependencies
canDrop: ({ source }) => !isEqual(source.data, data) && source.data.__uuid__ === data.__uuid__, canDrop: ({ source }) => !isEqual(source.data, data) && source.data.__uuid__ === data.__uuid__,
// @ts-expect-error Due to live server dependencies
getData: ({ input, element }) => getData: ({ input, element }) =>
attachClosestEdge(data, { attachClosestEdge(data, {
input, input,

4
packages/ui/src/sortable/sortable.tsx
View file

@ -1,4 +1,5 @@
import { monitorForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter"; // @ts-expect-error Due to live server dependencies
import { monitorForElements } from "@atlaskit/pragmatic-drag-and-drop/dist/cjs/entry-point/element/adapter.js";
import React, { Fragment, useEffect, useMemo } from "react"; import React, { Fragment, useEffect, useMemo } from "react";
import { Draggable } from "./draggable"; import { Draggable } from "./draggable";
@ -61,6 +62,7 @@ const moveItem = <T,>(
export const Sortable = <T,>({ data, render, onChange, keyExtractor, containerClassName, id }: Props<T>) => { export const Sortable = <T,>({ data, render, onChange, keyExtractor, containerClassName, id }: Props<T>) => {
useEffect(() => { useEffect(() => {
const unsubscribe = monitorForElements({ const unsubscribe = monitorForElements({
// @ts-expect-error Due to live server dependencies
onDrop({ source, location }) { onDrop({ source, location }) {
const destination = location?.current?.dropTargets[0]; const destination = location?.current?.dropTargets[0];
if (!destination) return; if (!destination) return;