@reltio/components 1.4.2018 → 1.4.2019

package/VerticalHeadingsTable/components/DndComponent/DndComponent.js

@@ -0,0 +1,96 @@
+import { closestCenter, DndContext, DragOverlay, MouseSensor, useSensor, useSensors } from '@dnd-kit/core';
+import React, { useCallback, useMemo, useState } from 'react';
+import { createPortal } from 'react-dom';
+import { DndItemTypes } from '../../types';
+import { DndMeasurer } from '../DndMeasurer';
+import { TableColumnDragPreview } from '../TableColumnDragPreview';
+import { TableRowDragPreview } from '../TableRowDragPreview';
+import { columnMoveModifier, rowMoveModifier } from './helpers';
+import { useStyles } from './styles';
+export var DndComponent = function (_a) {
+    var _b, _c;
+    var children = _a.children, containerRef = _a.containerRef, onMoveColumn = _a.onMoveColumn, onDropColumn = _a.onDropColumn, onMoveRow = _a.onMoveRow, onDropRow = _a.onDropRow, columnsId = _a.columnsId, rowsId = _a.rowsId, tableClassName = _a.tableClassName;
+    var styles = useStyles();
+    var containerHeight = (_b = containerRef === null || containerRef === void 0 ? void 0 : containerRef.current) === null || _b === void 0 ? void 0 : _b.clientHeight;
+    var containerWidth = (_c = containerRef === null || containerRef === void 0 ? void 0 : containerRef.current) === null || _c === void 0 ? void 0 : _c.clientWidth;
+    var _d = useState(null), draggingType = _d[0], setDraggingType = _d[1];
+    var _e = useState(null), draggingColumn = _e[0], setDraggingColumn = _e[1];
+    var _f = useState(null), draggingRow = _f[0], setDraggingRow = _f[1];
+    var onDragStart = useCallback(function (event) {
+        var _a, _b;
+        var dndData = (_b = (_a = event.active) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.current;
+        if (dndData) {
+            setDraggingType(dndData === null || dndData === void 0 ? void 0 : dndData.type);
+        }
+        if ((dndData === null || dndData === void 0 ? void 0 : dndData.type) === DndItemTypes.Column) {
+            setDraggingColumn(dndData);
+        }
+        if ((dndData === null || dndData === void 0 ? void 0 : dndData.type) === DndItemTypes.Row) {
+            setDraggingRow(dndData);
+        }
+    }, []);
+    var onDragEnd = useCallback(function (event) {
+        var _a, _b, _c;
+        var draggingType = (_c = (_b = (_a = event.active) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.type;
+        setDraggingType(null);
+        setDraggingColumn(null);
+        setDraggingRow(null);
+        if (draggingType === DndItemTypes.Column) {
+            onDropColumn();
+        }
+        if (draggingType === DndItemTypes.Row) {
+            onDropRow();
+        }
+    }, [onDropColumn, onDropRow]);
+    var modifiers = useMemo(function () {
+        switch (draggingType) {
+            case DndItemTypes.Column:
+                return [columnMoveModifier];
+            case DndItemTypes.Row:
+                return [rowMoveModifier];
+            default:
+                return [];
+        }
+    }, [draggingType]);
+    var onDragOver = useCallback(function (_a) {
+        var _b, _c;
+        var active = _a.active, over = _a.over;
+        if (active.id === (over === null || over === void 0 ? void 0 : over.id))
+            return;
+        switch ((_c = (_b = active === null || active === void 0 ? void 0 : active.data) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.type) {
+            case DndItemTypes.Column:
+                return onMoveColumn(active.id, over === null || over === void 0 ? void 0 : over.id);
+            case DndItemTypes.Row:
+                return onMoveRow(active.id, over === null || over === void 0 ? void 0 : over.id);
+        }
+    }, [onMoveColumn, onMoveRow]);
+    var dragOverlayStyle = useMemo(function () {
+        var _a;
+        var containerRect = (_a = containerRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
+        switch (draggingType) {
+            case DndItemTypes.Column:
+                return {
+                    top: containerRect.top,
+                    width: 'auto',
+                    height: 'auto'
+                };
+            case DndItemTypes.Row:
+                return {
+                    left: containerRect.left,
+                    width: 'auto',
+                    height: 'auto'
+                };
+            default:
+                return {};
+        }
+    }, [containerRef, draggingType]);
+    var mouseSensor = useSensor(MouseSensor);
+    var sensors = useSensors(mouseSensor);
+    return (React.createElement(DndContext, { sensors: sensors, collisionDetection: closestCenter, onDragStart: onDragStart, onDragEnd: onDragEnd, onDragOver: onDragOver },
+        children,
+        draggingType && createPortal(React.createElement("div", { className: styles.backDrop }), document.body),
+        React.createElement(DndMeasurer, { columnsId: columnsId, rowsId: rowsId }),
+        createPortal(React.createElement(DragOverlay, { dropAnimation: null, style: dragOverlayStyle, modifiers: modifiers },
+            React.createElement(TableColumnDragPreview, { columnHeight: containerHeight, draggingColumn: draggingColumn }),
+            React.createElement(TableRowDragPreview, { tableWidth: containerWidth, draggingRow: draggingRow, tableClassName: tableClassName })), document.body)));
+};

package/VerticalHeadingsTable/components/DndComponent/helpers.d.ts

@@ -0,0 +1,3 @@
+import { Modifier } from '@dnd-kit/core';
+export declare const columnMoveModifier: Modifier;
+export declare const rowMoveModifier: Modifier;

package/VerticalHeadingsTable/components/DndComponent/helpers.js

@@ -0,0 +1,35 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { getEventCoordinates } from '@dnd-kit/utilities';
+export var columnMoveModifier = function (_a) {
+    var activatorEvent = _a.activatorEvent, draggingNodeRect = _a.draggingNodeRect, transform = _a.transform;
+    if (draggingNodeRect && activatorEvent) {
+        var activatorCoordinates = getEventCoordinates(activatorEvent);
+        if (!activatorCoordinates) {
+            return transform;
+        }
+        var offsetX = activatorCoordinates.x - draggingNodeRect.left;
+        return __assign(__assign({}, transform), { x: transform.x + offsetX - draggingNodeRect.width / 2, y: 0 });
+    }
+    return transform;
+};
+export var rowMoveModifier = function (_a) {
+    var activatorEvent = _a.activatorEvent, draggingNodeRect = _a.draggingNodeRect, transform = _a.transform;
+    if (draggingNodeRect && activatorEvent) {
+        var activatorCoordinates = getEventCoordinates(activatorEvent);
+        if (!activatorCoordinates) {
+            return transform;
+        }
+        return __assign(__assign({}, transform), { x: 0, y: transform.y });
+    }
+    return transform;
+};

package/VerticalHeadingsTable/components/DndComponent/index.d.ts

@@ -0,0 +1 @@
+export { DndComponent } from './DndComponent';

package/VerticalHeadingsTable/components/DndComponent/index.js

@@ -0,0 +1 @@
+export { DndComponent } from './DndComponent';

package/VerticalHeadingsTable/components/{TableColumnDragLayer → DndComponent}/styles.d.ts

@@ -1 +1 @@
-export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"dragLayer">;
+export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"backDrop">;

package/VerticalHeadingsTable/components/DndComponent/styles.js

@@ -0,0 +1,10 @@
+import { makeStyles } from '@mui/styles';
+export var useStyles = makeStyles(function () { return ({
+    backDrop: {
+        position: 'fixed',
+        top: 0,
+        bottom: 0,
+        left: 0,
+        right: 0
+    }
+}); });

package/VerticalHeadingsTable/components/DndComponent/types.d.ts

@@ -0,0 +1,14 @@
+import { ColumnData, DndItemTypes, RowData } from '../../types';
+export type ColumnDndData = {
+    type: DndItemTypes.Column;
+    getColumnWidth: () => number;
+    columnValue: ColumnData;
+    rowData: RowData;
+    index: number;
+};
+export type RowDndData = {
+    type: DndItemTypes.Row;
+    rowData: RowData;
+    columnsData: ColumnData[];
+};
+export type DndData = ColumnDndData | RowDndData | null;

package/VerticalHeadingsTable/components/DndMeasurer/DndMeasurer.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+type Props = {
+    columnsId: string[];
+    rowsId: string[];
+};
+export declare const DndMeasurer: ({ columnsId, rowsId }: Props) => React.JSX.Element;
+export {};

package/VerticalHeadingsTable/components/DndMeasurer/DndMeasurer.js

@@ -0,0 +1,13 @@
+import React, { useEffect } from 'react';
+import { useDndContext } from '@dnd-kit/core';
+export var DndMeasurer = function (_a) {
+    var columnsId = _a.columnsId, rowsId = _a.rowsId;
+    var measureDroppableContainers = useDndContext().measureDroppableContainers;
+    useEffect(function () {
+        measureDroppableContainers(columnsId);
+    }, [columnsId]);
+    useEffect(function () {
+        measureDroppableContainers(rowsId);
+    }, [rowsId]);
+    return React.createElement(React.Fragment, null);
+};

package/VerticalHeadingsTable/components/DndMeasurer/index.d.ts

@@ -0,0 +1 @@
+export { DndMeasurer } from './DndMeasurer';

package/VerticalHeadingsTable/components/DndMeasurer/index.js

@@ -0,0 +1 @@
+export { DndMeasurer } from './DndMeasurer';

package/VerticalHeadingsTable/components/TableCell/TableCell.d.ts

@@ -5,7 +5,7 @@ type Props = {
     rowData: RowData;
     setHoveredColumn: (columnValue: ColumnData) => void;
     resetHoveredColumn: () => void;
-    someRowIsDragging?: boolean;
+    rowIsDragging?: boolean;
 };
-export declare const TableCell: ({ columnValue, rowData, setHoveredColumn, resetHoveredColumn, someRowIsDragging }: Props) => React.JSX.Element;
+export declare const TableCell: ({ columnValue, rowData, setHoveredColumn, resetHoveredColumn, rowIsDragging }: Props) => React.JSX.Element;
 export {};

package/VerticalHeadingsTable/components/TableCell/TableCell.js

@@ -4,11 +4,11 @@ import { DefaultCellRenderer } from '../../helpers';
 import { useStyles } from './styles';
 export var TableCell = function (_a) {
     var _b;
-    var columnValue = _a.columnValue, rowData = _a.rowData, setHoveredColumn = _a.setHoveredColumn, resetHoveredColumn = _a.resetHoveredColumn, someRowIsDragging = _a.someRowIsDragging;
+    var columnValue = _a.columnValue, rowData = _a.rowData, setHoveredColumn = _a.setHoveredColumn, resetHoveredColumn = _a.resetHoveredColumn, rowIsDragging = _a.rowIsDragging;
     var styles = useStyles();
     var CellRenderer = rowData.cellRenderer || DefaultCellRenderer;
     var onMouseOver = setHoveredColumn ? function () { return setHoveredColumn(columnValue); } : undefined;
     return (React.createElement("td", { onMouseOver: onMouseOver, onMouseLeave: resetHoveredColumn },
-        React.createElement("div", { className: classnames((_b = {}, _b[styles.hidden] = someRowIsDragging, _b)) },
+        React.createElement("div", { className: classnames((_b = {}, _b[styles.hidden] = rowIsDragging, _b)) },
             React.createElement(CellRenderer, { value: columnValue[rowData.id] }))));
 };

package/VerticalHeadingsTable/components/TableCell/TableCell.test.js

@@ -1,58 +1,116 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import React from 'react';
-import { shallow } from 'enzyme';
-import { act } from 'react-dom/test-utils';
 import { TableCell } from './TableCell';
-import { DefaultCellRenderer } from '../../helpers';
+import { fireEvent, render, screen } from '@testing-library/react';
 var columnValue = {
-    'attributes.FirstName': { value: 'Some value' },
+    'attributes.FirstName': 'Some value',
     id: 'entities/123'
 };
-var setHoveredColumn = jest.fn();
-var resetHoveredColumn = jest.fn();
+var rowData = {
+    id: 'attributes.FirstName',
+    label: 'FirstName'
+};
+var defaultProps = {
+    columnValue: columnValue,
+    rowData: rowData,
+    setHoveredColumn: jest.fn(),
+    resetHoveredColumn: jest.fn()
+};
+var setUp = function (props) {
+    if (props === void 0) { props = defaultProps; }
+    var Wrapper = function (_a) {
+        var children = _a.children;
+        return (React.createElement("table", null,
+            React.createElement("tbody", null,
+                React.createElement("tr", null, children))));
+    };
+    return render(React.createElement(TableCell, __assign({}, props)), { wrapper: Wrapper });
+};
 describe('TableCell tests', function () {
     it('should render cellRenderer from rowData correctly', function () {
-        var CellRenderer = function () { return null; };
-        var rowData = {
-            id: 'attributes.FirstName',
-            label: 'FirstName',
-            cellRenderer: CellRenderer
+        var CellRenderer = function (_a) {
+            var value = _a.value;
+            return React.createElement("div", { className: "cellRenderer" }, value);
         };
-        var component = shallow(React.createElement(TableCell, { rowData: rowData, columnValue: columnValue, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
-        expect(component.find(CellRenderer).prop('value')).toEqual(columnValue[rowData.id]);
+        setUp(__assign(__assign({}, defaultProps), { rowData: __assign(__assign({}, rowData), { cellRenderer: CellRenderer }) }));
+        expect(screen.getByText(columnValue['attributes.FirstName'])).toHaveClass('cellRenderer');
     });
     it('should render DefaultHeadCellRenderer if headCellRenderer is missing in rowData', function () {
-        var rowData = {
-            id: 'attributes.FirstName',
-            label: 'FirstName'
-        };
-        var component = shallow(React.createElement(TableCell, { rowData: rowData, columnValue: columnValue, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
-        expect(component.find(DefaultCellRenderer).prop('value')).toEqual(columnValue[rowData.id]);
+        setUp();
+        expect(screen.getByText(columnValue['attributes.FirstName'])).toBeInTheDocument();
     });
-    it('setHoveredColumn handler should work correctly', function () {
-        var rowData = {
-            id: 'attributes.FirstName',
-            label: 'FirstName'
-        };
-        var component = shallow(React.createElement(TableCell, { rowData: rowData, columnValue: columnValue, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
-        act(function () {
-            component.find('td').prop('onMouseOver')(null);
+    it('setHoveredColumn handler should work correctly', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var setHoveredColumn;
+        return __generator(this, function (_a) {
+            setHoveredColumn = jest.fn();
+            setUp(__assign(__assign({}, defaultProps), { setHoveredColumn: setHoveredColumn }));
+            fireEvent.mouseOver(screen.getByRole('cell', { name: columnValue['attributes.FirstName'] }));
+            expect(setHoveredColumn).toHaveBeenCalledWith(columnValue);
+            return [2 /*return*/];
         });
-        expect(setHoveredColumn).toHaveBeenCalledWith(columnValue);
-    });
-    it('should pass ".hidden" classname to div wrapper correctly if "someRowIsDragging" prop is true', function () {
-        var rowData = {
-            id: 'attributes.FirstName',
-            label: 'FirstName'
-        };
-        var component = shallow(React.createElement(TableCell, { rowData: rowData, columnValue: columnValue, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn, someRowIsDragging: true }));
-        expect(component.find('.hidden')).toHaveLength(1);
+    }); });
+    it('resetHoveredColumn handler should work correctly', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var resetHoveredColumn;
+        return __generator(this, function (_a) {
+            resetHoveredColumn = jest.fn();
+            setUp(__assign(__assign({}, defaultProps), { resetHoveredColumn: resetHoveredColumn }));
+            fireEvent.mouseLeave(screen.getByRole('cell', { name: columnValue['attributes.FirstName'] }));
+            expect(resetHoveredColumn).toHaveBeenCalled();
+            return [2 /*return*/];
+        });
+    }); });
+    it('should pass ".hidden" classname to div wrapper correctly if "rowIsDragging" prop is true', function () {
+        setUp(__assign(__assign({}, defaultProps), { rowIsDragging: true }));
+        expect(screen.getByText(columnValue['attributes.FirstName'])).toHaveClass('hidden');
     });
-    it('should not pass ".hidden" classname to div wrapper if "someRowIsDragging" prop is false', function () {
-        var rowData = {
-            id: 'attributes.FirstName',
-            label: 'FirstName'
-        };
-        var component = shallow(React.createElement(TableCell, { rowData: rowData, columnValue: columnValue, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn, someRowIsDragging: false }));
-        expect(component.find('.hidden')).toHaveLength(0);
+    it('should not pass ".hidden" classname to div wrapper if "rowIsDragging" prop is false', function () {
+        setUp();
+        expect(screen.getByText(columnValue['attributes.FirstName'])).not.toHaveClass('hidden');
     });
 });

package/VerticalHeadingsTable/components/TableCellWithDnd/ColumnDragIndicator.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { ColumnData, RowData } from '../../types';
+type Props = {
+    columnValue: ColumnData;
+    rowData: RowData;
+    index: number;
+    getColumnWidth: () => number;
+};
+export declare const ColumnDragIndicator: ({ columnValue, rowData, index, getColumnWidth }: Props) => React.JSX.Element;
+export {};

package/VerticalHeadingsTable/components/TableCellWithDnd/ColumnDragIndicator.js

@@ -0,0 +1,32 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import React from 'react';
+import DragIndicatorIcon from '@mui/icons-material/DragIndicator';
+import { useDraggable } from '@dnd-kit/core';
+import { DndItemTypes } from '../../types';
+import { useStyles } from './styles';
+export var ColumnDragIndicator = function (_a) {
+    var columnValue = _a.columnValue, rowData = _a.rowData, index = _a.index, getColumnWidth = _a.getColumnWidth;
+    var styles = useStyles();
+    var _b = useDraggable({
+        id: columnValue.id,
+        data: {
+            type: DndItemTypes.Column,
+            getColumnWidth: getColumnWidth,
+            columnValue: columnValue,
+            rowData: rowData,
+            index: index
+        }
+    }), setDraggableNodeRef = _b.setNodeRef, attributes = _b.attributes, listeners = _b.listeners;
+    return (React.createElement("div", __assign({ ref: setDraggableNodeRef, className: styles.dragIndicator }, attributes, listeners),
+        React.createElement(DragIndicatorIcon, { className: styles.dragIndicatorIcon })));
+};

package/VerticalHeadingsTable/components/TableCellWithDnd/TableCellWithDnd.d.ts

@@ -4,12 +4,10 @@ type Props = {
     columnValue: ColumnData;
     rowData: RowData;
     index: number;
-    onMoveColumn: (dragId: string, hoverId: string) => void;
-    onDropColumn?: () => void;
     shouldRenderDragIndicator: boolean;
     setHoveredColumn: (columnValue: ColumnData) => void;
     resetHoveredColumn: () => void;
-    someRowIsDragging?: boolean;
+    rowIsDragging?: boolean;
 };
-export declare const TableCellWithDnd: ({ columnValue, rowData, index, onMoveColumn, onDropColumn, shouldRenderDragIndicator, setHoveredColumn, resetHoveredColumn, someRowIsDragging }: Props) => React.JSX.Element;
+export declare const TableCellWithDnd: ({ columnValue, rowData, index, shouldRenderDragIndicator, setHoveredColumn, resetHoveredColumn, rowIsDragging }: Props) => React.JSX.Element;
 export {};

package/VerticalHeadingsTable/components/TableCellWithDnd/TableCellWithDnd.js

@@ -1,71 +1,42 @@
-import React, { useEffect } from 'react';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
 import classnames from 'classnames';
-import DragIndicatorIcon from '@mui/icons-material/DragIndicator';
-import { useDrag, useDrop } from 'react-dnd';
-import { getEmptyImage } from 'react-dnd-html5-backend';
 import { DndItemTypes } from '../../types';
 import { DefaultCellRenderer } from '../../helpers';
 import { useStyles } from './styles';
+import { useDndMonitor, useDroppable } from '@dnd-kit/core';
+import { ColumnDragIndicator } from './ColumnDragIndicator';
 export var TableCellWithDnd = function (_a) {
     var _b;
-    var columnValue = _a.columnValue, rowData = _a.rowData, index = _a.index, onMoveColumn = _a.onMoveColumn, onDropColumn = _a.onDropColumn, shouldRenderDragIndicator = _a.shouldRenderDragIndicator, setHoveredColumn = _a.setHoveredColumn, resetHoveredColumn = _a.resetHoveredColumn, someRowIsDragging = _a.someRowIsDragging;
+    var columnValue = _a.columnValue, rowData = _a.rowData, index = _a.index, shouldRenderDragIndicator = _a.shouldRenderDragIndicator, setHoveredColumn = _a.setHoveredColumn, resetHoveredColumn = _a.resetHoveredColumn, rowIsDragging = _a.rowIsDragging;
     var styles = useStyles();
-    var dropRef = React.useRef(null);
-    var dragRef = React.useRef(null);
-    var getColumnWidth = function () { var _a; return (_a = dropRef === null || dropRef === void 0 ? void 0 : dropRef.current) === null || _a === void 0 ? void 0 : _a.offsetWidth; };
-    var CellRenderer = rowData.cellRenderer || DefaultCellRenderer;
-    var _c = useDrop({
-        accept: DndItemTypes.Column,
-        hover: function (item, monitor) {
-            var _a;
-            if (!dropRef.current) {
-                return;
-            }
-            var dragIndex = item.index;
-            var hoverIndex = index;
-            if (dragIndex === hoverIndex) {
-                return;
-            }
-            var hoverBoundingRect = (_a = dropRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
-            var hoverMiddleX = (hoverBoundingRect.right - hoverBoundingRect.left) / 2;
-            var clientOffset = monitor.getClientOffset();
-            var hoverClientX = clientOffset.x - hoverBoundingRect.left;
-            if (dragIndex < hoverIndex && hoverClientX < hoverMiddleX) {
-                return;
-            }
-            if (dragIndex > hoverIndex && hoverClientX > hoverMiddleX) {
-                return;
+    var _c = useState(false), enableDropForColumn = _c[0], setEnableDropForColumn = _c[1];
+    var _d = useState(false), isColumnDragging = _d[0], setIsColumnDragging = _d[1];
+    useDndMonitor({
+        onDragStart: function (event) {
+            if (event.active.data.current.type === DndItemTypes.Column) {
+                setEnableDropForColumn(true);
+                setIsColumnDragging(event.active.id === columnValue.id);
             }
-            onMoveColumn(item.columnValue.id, columnValue.id);
-            item.index = hoverIndex;
         },
-        drop: function () {
-            if (onDropColumn)
-                onDropColumn();
-        },
-        collect: function (monitor) { return ({
-            targetId: monitor.getHandlerId()
-        }); }
-    }), targetId = _c[0].targetId, drop = _c[1];
-    var _d = useDrag({
-        item: { type: DndItemTypes.Column, index: index, getColumnWidth: getColumnWidth, columnValue: columnValue, rowData: rowData },
-        isDragging: function (monitor) {
-            return monitor.getItem().index === index;
-        },
-        collect: function (monitor) { return ({
-            opacity: monitor.isDragging() ? 0 : 1,
-            sourceId: monitor.getHandlerId()
-        }); }
-    }), _e = _d[0], opacity = _e.opacity, sourceId = _e.sourceId, drag = _d[1], preview = _d[2];
-    useEffect(function () {
-        preview(getEmptyImage(), { captureDraggingState: true });
-        drop(dropRef);
-        drag(dragRef);
-    }, []);
+        onDragEnd: function () {
+            setEnableDropForColumn(false);
+            setIsColumnDragging(false);
+        }
+    });
+    var setDroppableNodeRef = useDroppable({
+        id: columnValue.id
+    }).setNodeRef;
+    var columnRef = useRef(null);
+    var setColumnRef = useCallback(function (elem) {
+        setDroppableNodeRef(elem);
+        columnRef.current = elem;
+    }, [setDroppableNodeRef]);
+    var getColumnWidth = function () { var _a; return (_a = columnRef === null || columnRef === void 0 ? void 0 : columnRef.current) === null || _a === void 0 ? void 0 : _a.offsetWidth; };
+    var CellRenderer = rowData.cellRenderer || DefaultCellRenderer;
     var onMouseOver = setHoveredColumn ? function () { return setHoveredColumn(columnValue); } : undefined;
-    return (React.createElement("td", { style: { opacity: opacity }, ref: dropRef, className: styles.tableData, "data-source-id": sourceId, "data-target-id": targetId, onMouseOver: onMouseOver, onMouseLeave: resetHoveredColumn },
-        React.createElement("div", { className: classnames((_b = {}, _b[styles.hidden] = someRowIsDragging, _b)) },
-            shouldRenderDragIndicator && (React.createElement("div", { ref: dragRef, className: styles.dragIndicator },
-                React.createElement(DragIndicatorIcon, { className: styles.dragIndicatorIcon }))),
+    var draggingColumnStyle = useMemo(function () { return ({ opacity: isColumnDragging ? 0 : 1 }); }, [isColumnDragging]);
+    return (React.createElement("td", { style: draggingColumnStyle, ref: enableDropForColumn ? setColumnRef : undefined, className: styles.tableData, onMouseOver: onMouseOver, onMouseLeave: resetHoveredColumn },
+        React.createElement("div", { className: classnames((_b = {}, _b[styles.hidden] = rowIsDragging, _b)) },
+            shouldRenderDragIndicator && (React.createElement(ColumnDragIndicator, { columnValue: columnValue, rowData: rowData, index: index, getColumnWidth: getColumnWidth })),
             React.createElement(CellRenderer, { value: columnValue[rowData.id] }))));
 };