@reltio/components 1.4.2018 → 1.4.2020

package/VerticalHeadingsTable/components/TableHeadCell/TableHeadCell.d.ts

@@ -1,16 +1,16 @@
 import React from 'react';
-import { RowData } from '../../types';
+import { ColumnData, RowData } from '../../types';
 type BasicProps = {
     rowData: RowData;
 };
 type PropsWithDnd = BasicProps & {
     isDraggable: true;
-    dragRef: React.Ref<HTMLDivElement>;
+    columnsData: ColumnData[];
 };
 type PropsWithoutDnd = BasicProps & {
     isDraggable?: false;
-    dragRef?: React.Ref<HTMLDivElement>;
+    columnsData?: ColumnData[];
 };
 type Props = PropsWithDnd | PropsWithoutDnd;
-export declare const TableHeadCell: ({ rowData, isDraggable, dragRef }: Props) => React.JSX.Element;
+export declare const TableHeadCell: ({ rowData, columnsData, isDraggable }: Props) => React.JSX.Element;
 export {};

package/VerticalHeadingsTable/components/TableHeadCell/TableHeadCell.js

@@ -10,15 +10,14 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import React from 'react';
-import DragIndicatorIcon from '@mui/icons-material/DragIndicator';
 import { DefaultHeadCellRenderer } from '../../helpers';
 import { useStyles } from './styles';
+import { RowDragIndicator } from './RowDragIndicator';
 export var TableHeadCell = function (_a) {
-    var rowData = _a.rowData, isDraggable = _a.isDraggable, dragRef = _a.dragRef;
+    var rowData = _a.rowData, columnsData = _a.columnsData, isDraggable = _a.isDraggable;
     var styles = useStyles();
     var HeadCellRenderer = rowData.headCellRenderer || DefaultHeadCellRenderer;
     return (React.createElement("th", { className: styles.tableHead },
-        isDraggable && (React.createElement("div", { ref: dragRef, className: styles.dragIndicator },
-            React.createElement(DragIndicatorIcon, { className: styles.dragIndicatorIcon }))),
+        isDraggable && React.createElement(RowDragIndicator, { id: rowData.id, rowData: rowData, columnsData: columnsData }),
         React.createElement(HeadCellRenderer, __assign({}, rowData))));
 };

package/VerticalHeadingsTable/components/TableHeadCell/TableHeadCell.test.js

@@ -1,45 +1,60 @@
-import React, { createRef } from 'react';
-import { shallow } from 'enzyme';
-import DragIndicatorIcon from '@mui/icons-material/DragIndicator';
-import { DefaultHeadCellRenderer } from '../../helpers';
+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 { TableHeadCell } from './TableHeadCell';
+import { render, screen } from '@testing-library/react';
+import { getMuiIconByName } from '../../../test-utils';
+var defaultProps = {
+    rowData: {
+        id: 'attributes.FirstName',
+        label: 'FirstName'
+    },
+    columnsData: [
+        {
+            id: 'column1',
+            isDraggable: true
+        }
+    ]
+};
+var setUp = function (props) {
+    if (props === void 0) { props = defaultProps; }
+    return render(React.createElement(TableHeadCell, __assign({}, props)));
+};
 describe('TableHeadCell tests', function () {
     it('should render drag indicator correctly if isDraggable prop is true', function () {
-        var rowData = {
-            id: 'attributes.FirstName',
-            label: 'FirstName'
-        };
-        var dragRef = createRef();
-        var component = shallow(React.createElement(TableHeadCell, { rowData: rowData, isDraggable: true, dragRef: dragRef }));
-        var dragIndicator = component.find('.dragIndicator');
-        expect(dragIndicator).toHaveLength(1);
-        expect(dragIndicator.getElement().ref).toBe(dragRef);
-        expect(dragIndicator.find(DragIndicatorIcon)).toHaveLength(1);
+        setUp(__assign(__assign({}, defaultProps), { isDraggable: true }));
+        expect(getMuiIconByName('DragIndicator')).toBeInTheDocument();
     });
     it('should not render dragIndicator if isDraggable prop is false', function () {
-        var rowData = {
-            id: 'attributes.FirstName',
-            label: 'FirstName'
-        };
-        var component = shallow(React.createElement(TableHeadCell, { rowData: rowData, isDraggable: false }));
-        expect(component.find('.dragIndicator')).toHaveLength(0);
+        setUp();
+        expect(getMuiIconByName('DragIndicator')).not.toBeInTheDocument();
     });
     it('should render headCellRenderer from rowData correctly', function () {
-        var HeadCellRenderer = function () { return null; };
+        var HeadCellRenderer = function (_a) {
+            var label = _a.label;
+            return React.createElement("div", null,
+                "headCell-",
+                label);
+        };
         var rowData = {
             id: 'attributes.FirstName',
             label: 'FirstName',
             headCellRenderer: HeadCellRenderer
         };
-        var component = shallow(React.createElement(TableHeadCell, { rowData: rowData, isDraggable: false }));
-        expect(component.find(HeadCellRenderer).props()).toEqual(rowData);
+        setUp(__assign(__assign({}, defaultProps), { rowData: rowData }));
+        expect(screen.getByText("headCell-".concat(rowData.label))).toBeInTheDocument();
     });
     it('should render DefaultHeadCellRenderer if headCellRenderer is missing in rowData', function () {
-        var rowData = {
-            id: 'attributes.FirstName',
-            label: 'FirstName'
-        };
-        var component = shallow(React.createElement(TableHeadCell, { rowData: rowData, isDraggable: false }));
-        expect(component.find(DefaultHeadCellRenderer).props()).toEqual(rowData);
+        setUp();
+        expect(screen.getByText(defaultProps.rowData.label)).toBeInTheDocument();
     });
 });

package/VerticalHeadingsTable/components/TableRow/TableRow.d.ts

@@ -4,10 +4,9 @@ type Props = {
     rowData: RowData;
     columnsData: ColumnData[];
     index: number;
-    onMoveColumn?: (dragId: string, hoverId: string) => void;
-    onDropColumn?: () => void;
-    setHoveredColumn: (columnValue: ColumnData) => void;
-    resetHoveredColumn: () => void;
+    isMoveColumnEnabled?: boolean;
+    setHoveredColumn?: (columnValue: ColumnData) => void;
+    resetHoveredColumn?: () => void;
 };
-export declare const TableRow: ({ rowData, columnsData, index, onMoveColumn, onDropColumn, setHoveredColumn, resetHoveredColumn }: Props) => React.JSX.Element;
+export declare const TableRow: ({ rowData, columnsData, index, isMoveColumnEnabled, setHoveredColumn, resetHoveredColumn }: Props) => React.JSX.Element;
 export {};

package/VerticalHeadingsTable/components/TableRow/TableRow.js

@@ -3,13 +3,13 @@ import { TableCell } from '../TableCell';
 import { TableCellWithDnd } from '../TableCellWithDnd';
 import { TableHeadCell } from '../TableHeadCell';
 export var TableRow = function (_a) {
-    var rowData = _a.rowData, columnsData = _a.columnsData, index = _a.index, onMoveColumn = _a.onMoveColumn, onDropColumn = _a.onDropColumn, setHoveredColumn = _a.setHoveredColumn, resetHoveredColumn = _a.resetHoveredColumn;
+    var rowData = _a.rowData, columnsData = _a.columnsData, index = _a.index, isMoveColumnEnabled = _a.isMoveColumnEnabled, setHoveredColumn = _a.setHoveredColumn, resetHoveredColumn = _a.resetHoveredColumn;
     var isFirstRow = index === 0;
     return (React.createElement("tr", { className: rowData.rowClassName },
-        React.createElement(TableHeadCell, { rowData: rowData, isDraggable: false }),
+        React.createElement(TableHeadCell, { rowData: rowData, isDraggable: false, columnsData: columnsData }),
         columnsData.map(function (columnValue, index) {
             var isDraggableColumn = columnValue.isDraggable;
             var shouldRenderDragIndicator = isFirstRow && isDraggableColumn;
-            return onMoveColumn ? (React.createElement(TableCellWithDnd, { key: columnValue.id || index, columnValue: columnValue, rowData: rowData, index: index, onMoveColumn: onMoveColumn, onDropColumn: onDropColumn, shouldRenderDragIndicator: shouldRenderDragIndicator, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn })) : (React.createElement(TableCell, { key: columnValue.id || index, rowData: rowData, columnValue: columnValue, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
+            return isMoveColumnEnabled ? (React.createElement(TableCellWithDnd, { key: columnValue.id || index, columnValue: columnValue, rowData: rowData, index: index, shouldRenderDragIndicator: shouldRenderDragIndicator, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn })) : (React.createElement(TableCell, { key: columnValue.id || index, rowData: rowData, columnValue: columnValue, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
         })));
 };

package/VerticalHeadingsTable/components/TableRow/TableRow.test.js

@@ -10,73 +10,51 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import React from 'react';
-import { shallow } from 'enzyme';
-import { TableCell } from '../TableCell';
-import { TableCellWithDnd } from '../TableCellWithDnd';
-import { TableHeadCell } from '../TableHeadCell';
 import { TableRow } from './TableRow';
+import { render, screen } from '@testing-library/react';
+import { DndContext } from '@dnd-kit/core';
+import { getMuiIconByName } from '../../../test-utils';
 var columnsData = [
-    { 'attributes.FirstName': {}, isDraggable: false, id: 'entities/123' },
-    { 'attributes.FirstName': {}, isDraggable: true, id: 'entities/234' }
+    { 'attributes.FirstName': 'FirstNameValue1', isDraggable: false, id: 'entities/123' },
+    { 'attributes.FirstName': 'FirstNameValue2', isDraggable: true, id: 'entities/234' }
 ];
 var rowData = { id: 'attributes.FirstName', label: 'FirstName' };
-var setHoveredColumn = jest.fn();
-var resetHoveredColumn = jest.fn();
+var defaultProps = {
+    rowData: rowData,
+    columnsData: columnsData,
+    index: 0
+};
+var setUp = function (props) {
+    if (props === void 0) { props = defaultProps; }
+    var Providers = function (_a) {
+        var children = _a.children;
+        return (React.createElement(DndContext, null,
+            React.createElement("table", null,
+                React.createElement("tbody", null, children))));
+    };
+    return render(React.createElement(TableRow, __assign({}, props)), { wrapper: Providers });
+};
 describe('TableRow tests', function () {
     it('should render TableHeadCell correctly', function () {
-        var component = shallow(React.createElement(TableRow, { rowData: rowData, columnsData: columnsData, index: 1, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
-        expect(component.find(TableHeadCell).props()).toEqual({
-            rowData: rowData,
-            isDraggable: false
-        });
-    });
-    it('should render "TableCellWithDnd" cells correctly if "onMoveColumn" exist in props', function () {
-        var onMoveColumn = jest.fn();
-        var onDropColumn = jest.fn();
-        var component = shallow(React.createElement(TableRow, { rowData: rowData, columnsData: columnsData, index: 1, onMoveColumn: onMoveColumn, onDropColumn: onDropColumn, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
-        expect(component.find(TableCellWithDnd)).toHaveLength(2);
-        component.find(TableCellWithDnd).forEach(function (node, index) {
-            expect(node.props()).toMatchObject({
-                rowData: rowData,
-                columnValue: columnsData[index],
-                index: index,
-                onMoveColumn: onMoveColumn,
-                onDropColumn: onDropColumn
-            });
-        });
-    });
-    it('should pass "shouldRenderDragIndicator" prop correctly to "TableCellWithDnd" cells if index === 0', function () {
-        var onMoveColumn = jest.fn();
-        var component = shallow(React.createElement(TableRow, { rowData: rowData, columnsData: columnsData, index: 0, onMoveColumn: onMoveColumn, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
-        expect(component.find(TableCellWithDnd)).toHaveLength(2);
-        component.find(TableCellWithDnd).forEach(function (node, index) {
-            expect(node.prop('shouldRenderDragIndicator')).toBe(columnsData[index].isDraggable);
-        });
+        setUp();
+        expect(screen.getByText(rowData.label)).toBeInTheDocument();
+        expect(screen.getByText(columnsData[0]['attributes.FirstName'])).toBeInTheDocument();
+        expect(screen.getByText(columnsData[1]['attributes.FirstName'])).toBeInTheDocument();
     });
-    it('should pass "shouldRenderDragIndicator" prop correctly to "TableCellWithDnd" cells if index !== 0', function () {
-        var onMoveColumn = jest.fn();
-        var component = shallow(React.createElement(TableRow, { rowData: rowData, columnsData: columnsData, index: 1, onMoveColumn: onMoveColumn, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
-        expect(component.find(TableCellWithDnd)).toHaveLength(2);
-        component.find(TableCellWithDnd).forEach(function (node) {
-            expect(node.prop('shouldRenderDragIndicator')).toBe(false);
-        });
+    it('should render "TableCellWithDnd" cells correctly if "isMoveColumnEnabled" is true in props', function () {
+        setUp(__assign(__assign({}, defaultProps), { isMoveColumnEnabled: true }));
+        expect(screen.getByText(rowData.label)).toBeInTheDocument();
+        expect(screen.getByText(columnsData[0]['attributes.FirstName'])).toBeInTheDocument();
+        expect(screen.getByText(columnsData[1]['attributes.FirstName'])).toBeInTheDocument();
+        expect(getMuiIconByName('DragIndicator')).toBeInTheDocument();
     });
-    it('should render "TableCell" cells correctly if "onMoveColumn" is missing in props', function () {
-        var component = shallow(React.createElement(TableRow, { rowData: rowData, columnsData: columnsData, index: 1, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
-        expect(component.find(TableCell)).toHaveLength(2);
-        component.find(TableCell).forEach(function (node, index) {
-            expect(node.props()).toEqual({
-                rowData: rowData,
-                columnValue: columnsData[index],
-                setHoveredColumn: setHoveredColumn,
-                resetHoveredColumn: resetHoveredColumn
-            });
-        });
+    it('should pass "shouldRenderDragIndicator" prop correctly to "TableCellWithDnd" cells if index not 0', function () {
+        setUp(__assign(__assign({}, defaultProps), { isMoveColumnEnabled: true, index: 1 }));
+        expect(getMuiIconByName('DragIndicator')).not.toBeInTheDocument();
     });
     it('should add rowClassName to tr element', function () {
         var rowClassName = 'class1';
-        var component = shallow(React.createElement(TableRow, { rowData: __assign(__assign({}, rowData), { rowClassName: rowClassName }), columnsData: columnsData, index: 1, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn }));
-        expect(component.find('tr')).toHaveLength(1);
-        expect(component.find('tr').hasClass(rowClassName)).toBe(true);
+        setUp(__assign(__assign({}, defaultProps), { rowData: __assign(__assign({}, rowData), { rowClassName: rowClassName }) }));
+        expect(screen.getByRole('row')).toHaveClass(rowClassName);
     });
 });

package/VerticalHeadingsTable/components/TableRowDragPreview/TableRowDragPreview.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import { ColumnData, RowData } from '../../types';
+type Props = {
+    tableClassName: string;
+    tableWidth: number;
+    draggingRow: {
+        columnsData: ColumnData[];
+        rowData: RowData;
+    };
+};
+export declare const TableRowDragPreview: React.MemoExoticComponent<({ draggingRow, tableClassName, tableWidth }: Props) => React.JSX.Element>;
+export {};

package/VerticalHeadingsTable/components/TableRowDragPreview/TableRowDragPreview.js

@@ -0,0 +1,16 @@
+import React, { memo } from 'react';
+import { TableRow } from '../TableRow/TableRow';
+import { useStyles } from './styles';
+export var TableRowDragPreview = memo(function (_a) {
+    var draggingRow = _a.draggingRow, tableClassName = _a.tableClassName, tableWidth = _a.tableWidth;
+    var styles = useStyles();
+    if (!draggingRow) {
+        return null;
+    }
+    var columnsData = draggingRow.columnsData, rowData = draggingRow.rowData;
+    return (React.createElement("div", { style: { width: tableWidth }, className: styles.root },
+        React.createElement("table", { className: tableClassName },
+            React.createElement("tbody", null,
+                React.createElement(TableRow, { index: 1, key: rowData.id, rowData: rowData, columnsData: columnsData })))));
+});
+TableRowDragPreview.displayName = 'TableRowDragPreview';

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

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

package/VerticalHeadingsTable/components/TableRowDragPreview/index.js

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

package/{cjs/VerticalHeadingsTable/components/TableColumnDragLayer → VerticalHeadingsTable/components/TableRowDragPreview}/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<"root">;

package/VerticalHeadingsTable/components/TableRowDragPreview/styles.js

@@ -0,0 +1,8 @@
+import { makeStyles } from '@mui/styles';
+export var useStyles = makeStyles(function () { return ({
+    root: {
+        overflow: 'hidden',
+        maskImage: 'linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0))',
+        pointerEvents: 'none'
+    }
+}); });

package/VerticalHeadingsTable/components/TableRowWithDnd/TableRowWithDnd.d.ts

@@ -2,16 +2,10 @@ import React from 'react';
 import { RowData, ColumnData } from '../../types';
 type Props = {
     rowData: RowData;
-    index: number;
     columnsData: ColumnData[];
-    onMoveRow: (dragId: string, hoverId: string) => void;
-    onDropRow?: () => void;
-    onMoveColumn?: (dragId: string, hoverId: string) => void;
-    onDropColumn?: () => void;
+    isMoveColumnEnabled?: boolean;
     setHoveredColumn: (columnValue: ColumnData) => void;
     resetHoveredColumn: () => void;
-    someRowIsDragging: boolean;
-    setSomeRowIsDragging: (isDragging: boolean) => void;
 };
-export declare const TableRowWithDnd: ({ rowData, index, columnsData, onMoveRow, onDropRow, onMoveColumn, onDropColumn, setHoveredColumn, resetHoveredColumn, someRowIsDragging, setSomeRowIsDragging }: Props) => React.JSX.Element;
+export declare const TableRowWithDnd: ({ rowData, columnsData, isMoveColumnEnabled, setHoveredColumn, resetHoveredColumn }: Props) => React.JSX.Element;
 export {};

package/VerticalHeadingsTable/components/TableRowWithDnd/TableRowWithDnd.js

@@ -1,63 +1,32 @@
-import React, { useEffect } from 'react';
-import { useDrag, useDrop } from 'react-dnd';
+import React, { useMemo, useState } from 'react';
 import { TableHeadCell } from '../TableHeadCell';
 import { TableCell } from '../TableCell';
 import { TableCellWithDnd } from '../TableCellWithDnd';
 import { DndItemTypes } from '../../types';
+import { useDndMonitor, useDroppable } from '@dnd-kit/core';
 export var TableRowWithDnd = function (_a) {
-    var rowData = _a.rowData, index = _a.index, columnsData = _a.columnsData, onMoveRow = _a.onMoveRow, onDropRow = _a.onDropRow, onMoveColumn = _a.onMoveColumn, onDropColumn = _a.onDropColumn, setHoveredColumn = _a.setHoveredColumn, resetHoveredColumn = _a.resetHoveredColumn, someRowIsDragging = _a.someRowIsDragging, setSomeRowIsDragging = _a.setSomeRowIsDragging;
-    var dropRef = React.useRef(null);
-    var dragRef = React.useRef(null);
-    var _b = useDrop({
-        accept: DndItemTypes.Row,
-        hover: function (item, monitor) {
-            if (!dropRef.current) {
-                return;
+    var rowData = _a.rowData, columnsData = _a.columnsData, isMoveColumnEnabled = _a.isMoveColumnEnabled, setHoveredColumn = _a.setHoveredColumn, resetHoveredColumn = _a.resetHoveredColumn;
+    var setDroppableNodeRef = useDroppable({
+        id: rowData.id
+    }).setNodeRef;
+    var _b = useState(false), enableDropForRow = _b[0], setEnableDropForRow = _b[1];
+    var _c = useState(false), rowIsDragging = _c[0], setRowIsDragging = _c[1];
+    useDndMonitor({
+        onDragStart: function (event) {
+            if (event.active.data.current.type === DndItemTypes.Row) {
+                setEnableDropForRow(true);
+                setRowIsDragging(event.active.id === rowData.id);
             }
-            var dragIndex = item.index;
-            var hoverIndex = index;
-            if (dragIndex === hoverIndex) {
-                return;
-            }
-            var hoverBoundingRect = dropRef.current.getBoundingClientRect();
-            var hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2;
-            var clientOffset = monitor.getClientOffset();
-            var hoverClientY = clientOffset.y - hoverBoundingRect.top;
-            if (dragIndex < hoverIndex && hoverClientY < hoverMiddleY) {
-                return;
-            }
-            if (dragIndex > hoverIndex && hoverClientY > hoverMiddleY) {
-                return;
-            }
-            onMoveRow(item.id, rowData.id);
-            item.index = hoverIndex;
-        },
-        drop: function () {
-            if (onDropRow)
-                onDropRow();
         },
-        collect: function (monitor) { return ({
-            targetId: monitor.getHandlerId()
-        }); }
-    }), targetId = _b[0].targetId, drop = _b[1];
-    var _c = useDrag({
-        item: { type: DndItemTypes.Row, index: index, id: rowData.id },
-        collect: function (monitor) { return ({
-            sourceId: monitor.getHandlerId(),
-            isDragging: monitor.isDragging()
-        }); }
-    }), _d = _c[0], isDragging = _d.isDragging, sourceId = _d.sourceId, drag = _c[1], preview = _c[2];
-    useEffect(function () {
-        preview(drop(dropRef));
-        drag(dragRef);
-    }, []);
-    useEffect(function () {
-        setSomeRowIsDragging(isDragging);
-    }, [isDragging, setSomeRowIsDragging]);
-    var opacity = isDragging ? 0 : 1;
-    return (React.createElement("tr", { className: rowData.rowClassName, style: { opacity: opacity }, ref: dropRef, "data-target-id": targetId, "data-source-id": sourceId },
-        React.createElement(TableHeadCell, { rowData: rowData, isDraggable: true, dragRef: dragRef }),
+        onDragEnd: function () {
+            setRowIsDragging(false);
+            setEnableDropForRow(false);
+        }
+    });
+    var rowStyle = useMemo(function () { return ({ opacity: rowIsDragging ? 0 : 1 }); }, [rowIsDragging]);
+    return (React.createElement("tr", { className: rowData.rowClassName, style: rowStyle, ref: enableDropForRow ? setDroppableNodeRef : undefined },
+        React.createElement(TableHeadCell, { rowData: rowData, isDraggable: true, columnsData: columnsData }),
         columnsData.map(function (columnValue, index) {
-            return onMoveColumn ? (React.createElement(TableCellWithDnd, { key: columnValue.id || index, columnValue: columnValue, rowData: rowData, index: index, onMoveColumn: onMoveColumn, onDropColumn: onDropColumn, shouldRenderDragIndicator: false, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn, someRowIsDragging: someRowIsDragging })) : (React.createElement(TableCell, { key: columnValue.id || index, columnValue: columnValue, rowData: rowData, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn, someRowIsDragging: someRowIsDragging }));
+            return isMoveColumnEnabled ? (React.createElement(TableCellWithDnd, { key: columnValue.id || index, columnValue: columnValue, rowData: rowData, index: index, shouldRenderDragIndicator: false, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn, rowIsDragging: rowIsDragging })) : (React.createElement(TableCell, { key: columnValue.id || index, columnValue: columnValue, rowData: rowData, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn, rowIsDragging: rowIsDragging }));
         })));
 };

package/VerticalHeadingsTable/components/TableRowWithDnd/TableRowWithDnd.test.js

@@ -10,106 +10,76 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import React from 'react';
-import { mount } from 'enzyme';
-import { act } from 'react-dom/test-utils';
-import { DndContext, DndProvider } from 'react-dnd';
-import TestBackend from 'react-dnd-test-backend';
-import { TableCell } from '../TableCell';
-import { TableCellWithDnd } from '../TableCellWithDnd';
-import { TableHeadCell } from '../TableHeadCell';
+import { DndContext, useDndMonitor, useDroppable } from '@dnd-kit/core';
+import { act, render, screen } from '@testing-library/react';
+import { DndItemTypes } from '../../types';
 import { TableRowWithDnd } from './TableRowWithDnd';
+jest.mock('@dnd-kit/core', function () { return (__assign(__assign({}, jest.requireActual('@dnd-kit/core')), { useDndMonitor: jest.fn(), useDroppable: jest.fn().mockReturnValue({ setNodeRef: jest.fn() }) })); });
 var defaultColumnsData = [
     { 'attributes.FirstName': 'FirstName1', isDraggable: false, id: 'entities/123' },
     { 'attributes.FirstName': 'FirstName2', isDraggable: true, id: 'entities/234' }
 ];
 var defaultRowData = { id: 'attributes.FirstName', label: 'FirstName' };
-var setUp = function (_a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.columnsData, columnsData = _c === void 0 ? defaultColumnsData : _c, _d = _b.rowData, rowData = _d === void 0 ? defaultRowData : _d, _e = _b.index, index = _e === void 0 ? 0 : _e, _f = _b.onMoveRow, onMoveRow = _f === void 0 ? jest.fn() : _f, _g = _b.onDropRow, onDropRow = _g === void 0 ? jest.fn() : _g, _h = _b.onMoveColumn, onMoveColumn = _h === void 0 ? jest.fn() : _h, _j = _b.onDropColumn, onDropColumn = _j === void 0 ? jest.fn() : _j, _k = _b.setHoveredColumn, setHoveredColumn = _k === void 0 ? jest.fn() : _k, _l = _b.resetHoveredColumn, resetHoveredColumn = _l === void 0 ? jest.fn() : _l, _m = _b.setSomeRowIsDragging, setSomeRowIsDragging = _m === void 0 ? jest.fn() : _m, _o = _b.someRowIsDragging, someRowIsDragging = _o === void 0 ? false : _o;
-    var manager;
-    var component = mount(React.createElement(DndProvider, { backend: TestBackend },
-        React.createElement(DndContext.Consumer, null, function (_a) {
-            var dragDropManager = _a.dragDropManager;
-            manager = dragDropManager;
-            return (React.createElement("table", null,
-                React.createElement("tbody", null,
-                    React.createElement(TableRowWithDnd, { rowData: rowData, columnsData: columnsData, index: index, onMoveRow: onMoveRow, onDropRow: onDropRow, onMoveColumn: onMoveColumn, onDropColumn: onDropColumn, setHoveredColumn: setHoveredColumn, resetHoveredColumn: resetHoveredColumn, setSomeRowIsDragging: setSomeRowIsDragging, someRowIsDragging: someRowIsDragging }))));
-        })));
-    return [component, manager];
+var rowName = "".concat(defaultRowData.label, " ").concat(defaultColumnsData[0]['attributes.FirstName'], " ").concat(defaultColumnsData[1]['attributes.FirstName']);
+var defaultProps = {
+    columnsData: defaultColumnsData,
+    rowData: defaultRowData,
+    isMoveColumnEnabled: false,
+    setHoveredColumn: jest.fn(),
+    resetHoveredColumn: jest.fn()
+};
+var setUp = function (props) {
+    if (props === void 0) { props = defaultProps; }
+    var Providers = function (_a) {
+        var children = _a.children;
+        return (React.createElement(DndContext, null,
+            React.createElement("table", null,
+                React.createElement("tbody", null, children))));
+    };
+    return render(React.createElement(TableRowWithDnd, __assign({}, props)), { wrapper: Providers });
 };
 describe('TableRow tests', function () {
     it('should render TableHeadCell correctly', function () {
-        var component = setUp()[0];
-        expect(component.find(TableHeadCell).props()).toMatchObject({
-            rowData: defaultRowData,
-            isDraggable: true
-        });
-    });
-    it('should render "TableCellWithDnd" cells correctly if "onMoveColumn" exist in props', function () {
-        var onMoveColumn = jest.fn();
-        var onDropColumn = jest.fn();
-        var props = { onMoveColumn: onMoveColumn, onDropColumn: onDropColumn, someRowIsDragging: true };
-        var component = setUp(props)[0];
-        expect(component.find(TableCellWithDnd)).toHaveLength(2);
-        component.find(TableCellWithDnd).forEach(function (node, index) {
-            expect(node.props()).toMatchObject({
-                rowData: defaultRowData,
-                columnValue: defaultColumnsData[index],
-                index: index,
-                onMoveColumn: onMoveColumn,
-                onDropColumn: onDropColumn,
-                shouldRenderDragIndicator: false,
-                someRowIsDragging: true
-            });
-        });
-    });
-    it('should render "TableCell" cells correctly if "onMoveColumn" is missing in props', function () {
-        var setHoveredColumn = jest.fn();
-        var resetHoveredColumn = jest.fn();
-        var props = {
-            onMoveColumn: null,
-            setHoveredColumn: setHoveredColumn,
-            resetHoveredColumn: resetHoveredColumn,
-            someRowIsDragging: false
-        };
-        var component = setUp(props)[0];
-        expect(component.find(TableCell)).toHaveLength(2);
-        component.find(TableCell).forEach(function (node, index) {
-            expect(node.props()).toEqual({
-                rowData: defaultRowData,
-                columnValue: defaultColumnsData[index],
-                setHoveredColumn: setHoveredColumn,
-                resetHoveredColumn: resetHoveredColumn,
-                someRowIsDragging: false
-            });
-        });
+        setUp();
+        expect(screen.getByText('FirstName1')).toBeInTheDocument();
+        expect(screen.getByText('FirstName2')).toBeInTheDocument();
     });
     it('should add rowClassName to tr element', function () {
         var rowClassName = 'class1';
-        var component = setUp({ rowData: __assign(__assign({}, defaultRowData), { rowClassName: rowClassName }) })[0];
-        expect(component.find('tr')).toHaveLength(1);
-        expect(component.find('tr').hasClass(rowClassName)).toBe(true);
+        setUp(__assign(__assign({}, defaultProps), { rowData: __assign(__assign({}, defaultRowData), { rowClassName: rowClassName }) }));
+        expect(screen.getByRole('row', { name: rowName })).toHaveClass(rowClassName);
     });
-    it('should set someRowIsDragging correctly when dragging was start and dragging was end', function () {
-        var setSomeRowIsDragging = jest.fn();
-        var props = { onMoveColumn: null, onDropRow: null, setSomeRowIsDragging: setSomeRowIsDragging };
-        var _a = setUp(props), component = _a[0], manager = _a[1];
-        var backend = manager.getBackend();
-        var sourceId = component.find('tr').prop('data-source-id');
+    it('should set opacity correctly when dragging was start and dragging was end', function () {
+        var onDragStart, onDragEnd;
+        useDndMonitor.mockImplementation(function (listeners) {
+            onDragStart = listeners.onDragStart;
+            onDragEnd = listeners.onDragEnd;
+        });
+        setUp();
+        var row = screen.getByRole('row', { name: rowName });
+        expect(row).toHaveStyle({ opacity: 1 });
         act(function () {
-            backend.simulateBeginDrag([sourceId], {
-                clientOffset: { x: 0, y: 0 },
-                getSourceClientOffset: function () { return ({ x: 0, y: 0 }); }
+            onDragStart({
+                active: {
+                    id: defaultProps.rowData.id,
+                    data: {
+                        current: {
+                            type: DndItemTypes.Row
+                        }
+                    }
+                }
             });
         });
-        component.update();
-        expect(setSomeRowIsDragging).toHaveBeenCalledWith(true);
-        var targetId = component.find('tr').prop('data-target-id');
+        expect(row).toHaveStyle({ opacity: 0 });
         act(function () {
-            backend.simulateHover([targetId]);
-            backend.simulateDrop();
-            backend.simulateEndDrag();
+            onDragEnd();
         });
-        component.update();
-        expect(setSomeRowIsDragging).toHaveBeenCalledWith(false);
+        expect(row).toHaveStyle({ opacity: 1 });
+    });
+    it('should should use TableCellWithDnd if isMoveColumnEnabled is true', function () {
+        useDroppable.mockClear();
+        setUp(__assign(__assign({}, defaultProps), { isMoveColumnEnabled: true }));
+        expect(useDroppable).toHaveBeenCalledWith({ id: defaultColumnsData[0].id });
+        expect(useDroppable).toHaveBeenCalledWith({ id: defaultColumnsData[1].id });
     });
 });

package/cjs/BarChart/helpers.d.ts

@@ -4,8 +4,8 @@ import { BarChartOptions } from '@reltio/mdm-sdk';
 type BarChartSettings = {
     barChart: React.ComponentProps<typeof BarChart>;
     bar: Omit<BarProps, 'ref'>;
-    xAxis: XAxisProps;
-    yAxis: YAxisProps;
+    xAxis: Omit<XAxisProps, 'ref'>;
+    yAxis: Omit<YAxisProps, 'ref'>;
     cartesianGrid: Omit<CartesianGridProps, 'ref'>;
     tooltip: TooltipProps<number, string>;
 };