@reltio/components 1.4.2018 → 1.4.2019

package/cjs/features/crosswalks/AttributesTable/AttributesTable.test.js

@@ -62,13 +62,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var react_2 = require("@testing-library/react");
 var user_event_1 = __importDefault(require("@testing-library/user-event"));
-var react_dnd_1 = require("react-dnd");
-var react_dnd_html5_backend_1 = __importDefault(require("react-dnd-html5-backend"));
 var react_transition_group_1 = require("react-transition-group");
+var dndKit_1 = require("../../../test-utils/dndKit");
+var core_1 = require("@dnd-kit/core");
 var test_utils_1 = require("../../../test-utils");
 var MdmModuleContext_1 = require("../../../contexts/MdmModuleContext");
 var AttributesTable_test_data_1 = require("./AttributesTable.test-data");
 var AttributesTable_1 = __importDefault(require("./AttributesTable"));
+jest.mock('@dnd-kit/core', function () { return dndKit_1.mockDndKit; });
 jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { debounce: function (x) { return x; } })); });
 var visibleColumns = ['ovValues', 'values'];
 var crosswalksMap = {
@@ -121,7 +122,7 @@ var setUp = function (props) {
     var user = user_event_1.default.setup({ delay: null, skipHover: true });
     var Providers = function (_a) {
         var children = _a.children;
-        return (react_1.default.createElement(react_dnd_1.DndProvider, { backend: react_dnd_html5_backend_1.default },
+        return (react_1.default.createElement(core_1.DndContext, null,
             react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: { metadata: metadata } }, children)));
     };
     var renderer = (0, react_2.render)(react_1.default.createElement(AttributesTable_1.default, __assign({}, props)), { wrapper: Providers });
@@ -356,23 +357,29 @@ describe('attribute table tests', function () {
         expect((0, react_2.within)(getCellByIndexes(1, 0)).queryByText('Boolean')).toBeInTheDocument();
         expect((0, react_2.within)(getCellByIndexes(1, 1)).queryByText('Yes')).toBeInTheDocument();
         expect((0, react_2.within)(getCellByIndexes(0, 0)).queryByText('text field value')).toBeInTheDocument();
-        expect((0, react_2.within)(getCellByIndexes(0, 0)).queryByText('<h1>String</h1>')).toBeInTheDocument();
+        expect((0, react_2.within)(getCellByIndexes(0, 0)).queryByText('String Label')).toBeInTheDocument();
         expect((0, react_2.within)(getCellByIndexes(0, 1)).queryByText('text field value')).toBeInTheDocument();
         var dragIndicator = getCellByIndexes(0, 0).querySelector('.dragIndicator');
-        react_2.fireEvent.dragStart(dragIndicator);
+        react_2.fireEvent.mouseDown(dragIndicator);
         jest.runAllTimers();
         expect((0, react_2.within)(getCellByIndexes(1, 0)).queryByText('Yes')).not.toBeInTheDocument();
         expect((0, react_2.within)(getCellByIndexes(1, 0)).queryByText('Boolean')).toBeInTheDocument();
         expect((0, react_2.within)(getCellByIndexes(1, 1)).queryByText('Yes')).not.toBeInTheDocument();
         expect((0, react_2.within)(getCellByIndexes(0, 0)).queryByText('text field value')).not.toBeInTheDocument();
-        expect((0, react_2.within)(getCellByIndexes(0, 0)).queryByText('<h1>String</h1>')).toBeInTheDocument();
+        expect((0, react_2.within)(getCellByIndexes(0, 0)).queryByText('String Label')).toBeInTheDocument();
         expect((0, react_2.within)(getCellByIndexes(0, 1)).queryByText('text field value')).not.toBeInTheDocument();
         var dropRow = getCellByIndexes(1, 0);
-        react_2.fireEvent.dragEnter(dropRow);
+        react_2.fireEvent.mouseOver(dropRow);
         expect((0, react_2.within)(getCellByIndexes(0, 0)).queryByText('Boolean')).toBeInTheDocument();
-        expect((0, react_2.within)(getCellByIndexes(1, 0)).queryByText('<h1>String</h1>')).toBeInTheDocument();
-        react_2.fireEvent.dragEnd(dropRow);
-        expect(onSelectAttributeTypes).toHaveBeenCalledWith([AttributesTable_test_data_1.selectedAttributeTypes[1], AttributesTable_test_data_1.selectedAttributeTypes[0]]);
+        expect((0, react_2.within)(getCellByIndexes(1, 0)).queryByText('String Label')).toBeInTheDocument();
+        react_2.fireEvent.mouseUp(dragIndicator);
+        expect(onSelectAttributeTypes).toHaveBeenCalledWith([
+            AttributesTable_test_data_1.selectedAttributeTypes[1],
+            AttributesTable_test_data_1.selectedAttributeTypes[0],
+            AttributesTable_test_data_1.selectedAttributeTypes[2],
+            AttributesTable_test_data_1.selectedAttributeTypes[3],
+            AttributesTable_test_data_1.selectedAttributeTypes[4]
+        ]);
         unmockTableSizing();
     });
     it('should pin and ignore attributes', function () { return __awaiter(void 0, void 0, void 0, function () {

package/cjs/features/crosswalks/AttributesTable/components/OvValuesRenderer/OvValuesRenderer.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
 import { OvValues } from '../../types';
+import { DraggableProps } from '../../../../../types/basicTable';
 type Props = {
     value: OvValues;
     someRowIsDragging?: boolean;
-    dragRef?: React.Ref<HTMLDivElement>;
+    draggableProps?: DraggableProps;
 };
-export declare const OvValuesRenderer: ({ value: { values, attributeType }, someRowIsDragging, dragRef }: Props) => React.JSX.Element;
+export declare const OvValuesRenderer: ({ value: { values, attributeType }, someRowIsDragging, draggableProps }: Props) => React.JSX.Element;
 export {};

package/cjs/features/crosswalks/AttributesTable/components/OvValuesRenderer/OvValuesRenderer.js

@@ -1,4 +1,15 @@
 "use strict";
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -14,12 +25,12 @@ var MdmModuleContext_1 = require("../../../../../contexts/MdmModuleContext");
 var styles_1 = require("../../styles");
 var styles_2 = require("./styles");
 var OvValuesRenderer = function (_a) {
-    var _b = _a.value, values = _b.values, attributeType = _b.attributeType, someRowIsDragging = _a.someRowIsDragging, dragRef = _a.dragRef;
+    var _b = _a.value, values = _b.values, attributeType = _b.attributeType, someRowIsDragging = _a.someRowIsDragging, draggableProps = _a.draggableProps;
     var styles = (0, styles_2.useStyles)();
     var commonStyles = (0, styles_1.useCommonStyles)();
     var entity = (0, MdmModuleContext_1.useMdmEntity)();
     return (react_1.default.createElement("div", { className: (0, classnames_1.default)(styles.root, commonStyles.basicCell) },
-        react_1.default.createElement("div", { ref: dragRef, className: styles.dragIndicator },
+        react_1.default.createElement("div", __assign({}, draggableProps, { className: styles.dragIndicator }),
             react_1.default.createElement(DragIndicator_1.default, { className: styles.dragIndicatorIcon })),
         react_1.default.createElement(AttributeTitle_1.AttributeTitle, { className: styles.attributeTitle, label: attributeType.label }),
         !someRowIsDragging && (react_1.default.createElement(EntityContext_1.EntityContext.Provider, { value: entity },

package/cjs/features/crosswalks/CrosswalkDndComponent/CrosswalkDndComponent.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import { BasicTable } from '../../../BasicTable';
+type Props = {
+    tableRef: React.ElementRef<typeof BasicTable>;
+    children: React.ReactNode;
+};
+export declare const CrosswalkDndComponent: ({ children, tableRef }: Props) => React.JSX.Element;
+export {};

package/cjs/features/crosswalks/CrosswalkDndComponent/CrosswalkDndComponent.js

@@ -0,0 +1,51 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrosswalkDndComponent = void 0;
+var react_1 = __importStar(require("react"));
+var useDndBasicTableScrollModifier_1 = require("../../../hooks/useDndBasicTableScrollModifier");
+var useDraggingCrosswalk_1 = require("../hooks/useDraggingCrosswalk");
+var modifiers_1 = require("@dnd-kit/modifiers");
+var core_1 = require("@dnd-kit/core");
+var CrosswalkDragPreview_1 = require("../CrosswalkDragPreview");
+var CrosswalkDndComponent = function (_a) {
+    var children = _a.children, tableRef = _a.tableRef;
+    var _b = (0, useDndBasicTableScrollModifier_1.useDndBasicTableScrollModifier)({ tableRef: tableRef }), scrollModifier = _b.scrollModifier, stopScroll = _b.stopScroll;
+    var dragOverlayStyles = (0, react_1.useMemo)(function () { return ({ width: 'max-content' }); }, []);
+    var _c = (0, useDraggingCrosswalk_1.useDraggingCrosswalk)(), draggingCrosswalk = _c.draggingCrosswalk, onDragEndCrosswalk = _c.onDragEnd, onDragStart = _c.onDragStart;
+    var onDragEnd = (0, react_1.useCallback)(function () {
+        onDragEndCrosswalk();
+        stopScroll();
+    }, [onDragEndCrosswalk, stopScroll]);
+    var dndContextModifiers = (0, react_1.useMemo)(function () { return [scrollModifier]; }, [scrollModifier]);
+    var dragOverlayModifiers = (0, react_1.useMemo)(function () { return [modifiers_1.snapCenterToCursor]; }, []);
+    var mouseSensor = (0, core_1.useSensor)(core_1.MouseSensor);
+    var sensors = (0, core_1.useSensors)(mouseSensor);
+    return (react_1.default.createElement(core_1.DndContext, { sensors: sensors, modifiers: dndContextModifiers, autoScroll: false, onDragStart: onDragStart, onDragEnd: onDragEnd },
+        react_1.default.createElement(core_1.DragOverlay, { style: dragOverlayStyles, modifiers: dragOverlayModifiers, dropAnimation: null },
+            react_1.default.createElement(CrosswalkDragPreview_1.CrosswalkDragPreview, { crosswalk: draggingCrosswalk })),
+        children));
+};
+exports.CrosswalkDndComponent = CrosswalkDndComponent;

package/cjs/features/crosswalks/CrosswalkDndComponent/index.d.ts

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

package/cjs/features/crosswalks/CrosswalkDndComponent/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrosswalkDndComponent = void 0;
+var CrosswalkDndComponent_1 = require("./CrosswalkDndComponent");
+Object.defineProperty(exports, "CrosswalkDndComponent", { enumerable: true, get: function () { return CrosswalkDndComponent_1.CrosswalkDndComponent; } });

package/cjs/features/crosswalks/{CrosswalkDragLayer/components/CrosswalkDragPreview → CrosswalkDragPreview}/CrosswalkDragPreview.js

@@ -28,20 +28,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrosswalkDragPreview = void 0;
 var react_1 = __importStar(require("react"));
+var classnames_1 = __importDefault(require("classnames"));
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
+var core_1 = require("@dnd-kit/core");
 var Typography_1 = __importDefault(require("@mui/material/Typography"));
-var MdmModuleContext_1 = require("../../../../../contexts/MdmModuleContext");
-var CrosswalksDisplayContext_1 = require("../../../../../contexts/CrosswalksDisplayContext");
-var SourceIcon_1 = require("../../../../../SourceIcon");
-var ColoredBlock_1 = require("../../../ColoredBlock");
+var MdmModuleContext_1 = require("../../../contexts/MdmModuleContext");
+var CrosswalksDisplayContext_1 = require("../../../contexts/CrosswalksDisplayContext");
+var SourceIcon_1 = require("../../../SourceIcon");
+var ColoredBlock_1 = require("../ColoredBlock");
 var styles_1 = require("./styles");
 exports.CrosswalkDragPreview = (0, react_1.memo)(function (_a) {
+    var _b;
     var crosswalk = _a.crosswalk;
     var styles = (0, styles_1.useStyles)();
     var metadata = (0, MdmModuleContext_1.useMdmMetadata)();
     var color = (0, CrosswalksDisplayContext_1.useCrosswalkColor)(crosswalk);
     var sourceSystemLabel = (0, mdm_sdk_1.getSourceSystemLabel)(metadata, crosswalk.type);
-    return (react_1.default.createElement(ColoredBlock_1.ColoredBlock, { color: color, className: styles.crosswalkPreview },
+    var _c = (0, react_1.useState)(false), canDrop = _c[0], setCanDrop = _c[1];
+    (0, core_1.useDndMonitor)({
+        onDragOver: function (event) {
+            var _a, _b, _c;
+            var attributeType = (_c = (_b = (_a = event.over) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.current) === null || _c === void 0 ? void 0 : _c.attributeType;
+            setCanDrop(!!attributeType && (0, mdm_sdk_1.canAddCrosswalk)(crosswalk, attributeType));
+        }
+    });
+    return (react_1.default.createElement(ColoredBlock_1.ColoredBlock, { color: color, className: (0, classnames_1.default)(styles.crosswalkPreview, (_b = {}, _b[styles.noDrop] = !canDrop, _b)) },
         react_1.default.createElement(SourceIcon_1.SourceIcon, { className: styles.sourceIcon, sourceType: crosswalk.type }),
         react_1.default.createElement(Typography_1.default, { className: styles.sourceLabel, variant: 'body2' }, sourceSystemLabel)));
 });

package/cjs/features/crosswalks/CrosswalkDragPreview/CrosswalkDragPreview.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/features/crosswalks/CrosswalkDragPreview/CrosswalkDragPreview.test.js

@@ -0,0 +1,97 @@
+"use strict";
+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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var CrosswalksDisplay = __importStar(require("../../../contexts/CrosswalksDisplayContext"));
+var MdmModuleContext_1 = require("../../../contexts/MdmModuleContext");
+var CrosswalkDragPreview_1 = require("./CrosswalkDragPreview");
+var react_2 = require("@testing-library/react");
+var core_1 = require("@dnd-kit/core");
+jest.mock('@dnd-kit/core', function () { return (__assign(__assign({}, jest.requireActual('@dnd-kit/core')), { useDndMonitor: jest.fn() })); });
+jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { canAddCrosswalk: jest.fn().mockReturnValue(true) })); });
+var defaultProps = {
+    crosswalk: { uri: 'entities/1/crosswalks/1', type: 'configuration/sources/FB', value: '123' }
+};
+var setUp = function (props) {
+    if (props === void 0) { props = defaultProps; }
+    var metadata = {
+        sources: [
+            {
+                uri: 'configuration/sources/FB',
+                label: 'Facebook'
+            }
+        ]
+    };
+    var Providers = function (_a) {
+        var children = _a.children;
+        return (react_1.default.createElement(core_1.DndContext, null,
+            react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: { metadata: metadata } }, children)));
+    };
+    return (0, react_2.render)(react_1.default.createElement(CrosswalkDragPreview_1.CrosswalkDragPreview, __assign({}, props)), { wrapper: Providers });
+};
+describe('CrosswalkDragPreview tests', function () {
+    beforeAll(function () {
+        jest.spyOn(CrosswalksDisplay, 'useCrosswalkColor').mockImplementation(function (crosswalks) { return crosswalks === null || crosswalks === void 0 ? void 0 : crosswalks.value; });
+    });
+    it('should render correctly', function () {
+        setUp();
+        expect(react_2.screen.getByText('Facebook')).toBeInTheDocument();
+        expect(react_2.screen.getByText('F')).toBeInTheDocument();
+        expect(react_2.screen.getByTestId('cw-colored-block')).toHaveClass('noDrop');
+    });
+    it('should able for drop', function () {
+        var onDragOver;
+        core_1.useDndMonitor.mockImplementation(function (listeners) {
+            onDragOver = listeners.onDragOver;
+        });
+        setUp();
+        (0, react_2.act)(function () {
+            onDragOver({
+                over: {
+                    data: {
+                        current: {
+                            attributeType: 'testAttrTypeUri'
+                        }
+                    }
+                }
+            });
+        });
+        expect(react_2.screen.getByTestId('cw-colored-block')).not.toHaveClass('noDrop');
+    });
+});

package/{features/crosswalks/CrosswalkDragLayer/components → cjs/features/crosswalks}/CrosswalkDragPreview/styles.d.ts

@@ -1 +1 @@
-export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"sourceIcon" | "crosswalkPreview" | "sourceLabel">;
+export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"sourceIcon" | "crosswalkPreview" | "sourceLabel" | "noDrop">;

package/cjs/features/crosswalks/{CrosswalkDragLayer/components/CrosswalkDragPreview → CrosswalkDragPreview}/styles.js

@@ -5,12 +5,14 @@ var styles_1 = require("@mui/styles");
 exports.useStyles = (0, styles_1.makeStyles)({
     crosswalkPreview: {
         height: '28px',
+        width: 'max-content',
         maxWidth: '394px',
         display: 'flex',
         overflow: 'hidden',
         padding: '6px',
         alignItems: 'center',
-        boxSizing: 'border-box'
+        boxSizing: 'border-box',
+        cursor: 'copy'
     },
     sourceLabel: {
         fontSize: '13px',
@@ -22,5 +24,8 @@ exports.useStyles = (0, styles_1.makeStyles)({
         width: '16px',
         height: '16px',
         marginRight: '9px'
+    },
+    noDrop: {
+        cursor: 'no-drop'
     }
 });

package/cjs/features/crosswalks/CrosswalkRow/CrosswalkRow.js

@@ -1,4 +1,15 @@
 "use strict";
+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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -29,8 +40,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrosswalkRow = void 0;
 var react_1 = __importStar(require("react"));
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
-var react_dnd_1 = require("react-dnd");
-var react_dnd_html5_backend_1 = require("react-dnd-html5-backend");
+var core_1 = require("@dnd-kit/core");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var Typography_1 = __importDefault(require("@mui/material/Typography"));
 var Delete_1 = __importDefault(require("@mui/icons-material/Delete"));
@@ -63,17 +73,15 @@ exports.CrosswalkRow = (0, react_1.memo)(function (_a) {
     var crosswalkId = (0, mdm_sdk_1.getLastUriPart)(crosswalk.uri);
     var crosswalkDisabled = (0, mdm_sdk_1.isCrosswalkDisabled)(crosswalk);
     var styles = (0, styles_1.useStyles)({ color: color, isOpaque: !isDimmed, isFocused: isFocused });
-    var _j = (0, react_dnd_1.useDrag)({
-        item: {
+    var _j = (0, core_1.useDraggable)({
+        id: crosswalk.uri,
+        data: {
             type: 'Crosswalk',
             crosswalk: crosswalk
         },
-        canDrag: !crosswalkDisabled
-    }), drag = _j[1], preview = _j[2];
+        disabled: crosswalkDisabled
+    }), setNodeRef = _j.setNodeRef, attributes = _j.attributes, listeners = _j.listeners;
     var canDelete = !crosswalkDisabled && crosswalk.ownerType !== 'relation';
-    (0, react_1.useEffect)(function () {
-        preview((0, react_dnd_html5_backend_1.getEmptyImage)(), { captureDraggingState: true });
-    }, []);
     (0, react_1.useEffect)(function () {
         var _a, _b;
         if (focusable &&
@@ -91,15 +99,16 @@ exports.CrosswalkRow = (0, react_1.memo)(function (_a) {
     return (react_1.default.createElement("div", { className: styles.root, ref: ref },
         react_1.default.createElement(SmallIconButton_1.SmallIconButtonWithTooltip, { size: "XXS", className: styles.focusedIcon, icon: focusable && Visibility_1.default, onClick: function () { return toggleCrosswalkFocus(); }, disabled: !focusable, tooltipTitle: focusable && ui_i18n_1.default.text('Focus') }),
         react_1.default.createElement("div", { className: styles.crosswalkWrapper },
-            react_1.default.createElement(ColoredBlock_1.ColoredBlock, { ref: drag, className: styles.header, color: color, variant: crosswalkDisabled ? 'disabled' : 'standart', onMouseEnter: function () { return highlightCrosswalk(); }, onMouseLeave: function () { return removeHighlight(); } },
+            react_1.default.createElement(ColoredBlock_1.ColoredBlock, { className: styles.header, color: color, variant: crosswalkDisabled ? 'disabled' : 'standart', onMouseEnter: highlightCrosswalk, onMouseLeave: removeHighlight },
                 isDependent && react_1.default.createElement(NestedAttribute_1.default, { className: styles.dependentIcon }),
                 react_1.default.createElement(ArrowExpandButton_1.ArrowExpandButton, { onClick: function () { return setExpanded(function (value) { return !value; }); }, expanded: expanded }),
-                react_1.default.createElement(SourceIcon_1.SourceIcon, { className: styles.sourceIcon, sourceType: crosswalk.type }),
-                react_1.default.createElement(ExpandedValueTooltip_1.ExpandedValueTooltip, { value: sourceSystemLabel },
-                    react_1.default.createElement(Typography_1.default, { variant: 'body2', noWrap: true }, sourceSystemLabel)),
-                react_1.default.createElement(Spacer_1.Spacer, null),
-                react_1.default.createElement(ExpandedValueTooltip_1.ExpandedValueTooltip, { value: crosswalk.value },
-                    react_1.default.createElement(Typography_1.default, { variant: 'body2', className: styles.labelValue, noWrap: true }, crosswalk.value))),
+                react_1.default.createElement("div", __assign({ className: styles.dragWrapper, ref: setNodeRef }, listeners, attributes),
+                    react_1.default.createElement(SourceIcon_1.SourceIcon, { className: styles.sourceIcon, sourceType: crosswalk.type }),
+                    react_1.default.createElement(ExpandedValueTooltip_1.ExpandedValueTooltip, { value: sourceSystemLabel },
+                        react_1.default.createElement(Typography_1.default, { variant: 'body2', noWrap: true }, sourceSystemLabel)),
+                    react_1.default.createElement(Spacer_1.Spacer, null),
+                    react_1.default.createElement(ExpandedValueTooltip_1.ExpandedValueTooltip, { value: crosswalk.value },
+                        react_1.default.createElement(Typography_1.default, { variant: 'body2', className: styles.labelValue, noWrap: true }, crosswalk.value)))),
             expanded && (react_1.default.createElement("div", { className: styles.attributesWrapper },
                 canDelete && (react_1.default.createElement("div", { className: styles.deleteCrosswalkButton },
                     react_1.default.createElement(SmallIconButton_1.SmallIconButtonWithTooltip, { icon: Delete_1.default, disabled: disableDelete, onClick: function () { return setDeleteDialogOpen(true); }, size: "XS", tooltipTitle: disableDelete

package/cjs/features/crosswalks/CrosswalkRow/CrosswalkRow.test.js

@@ -80,14 +80,12 @@ var LocalizationProvider_1 = require("@mui/x-date-pickers/LocalizationProvider")
 var AdapterMoment_1 = require("@mui/x-date-pickers/AdapterMoment");
 var styles_1 = require("@mui/styles");
 var styles_2 = require("@mui/material/styles");
-var reactDnd = __importStar(require("react-dnd"));
-var react_dnd_html5_backend_1 = require("react-dnd-html5-backend");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var CrosswalksDisplay = __importStar(require("../../../contexts/CrosswalksDisplayContext"));
 var MdmModuleContext_1 = require("../../../contexts/MdmModuleContext");
 var CrosswalkRow_1 = require("./CrosswalkRow");
+var core_1 = require("@dnd-kit/core");
 jest.unmock('@mui/styles');
-jest.mock('react-dnd', function () { return (__assign(__assign({}, jest.requireActual('react-dnd')), { useDrag: jest.fn() })); });
 jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { isCrosswalkDisabled: jest.fn() })); });
 var metadata = {
     sources: [
@@ -123,14 +121,16 @@ var defaultProps = {
     onDelete: jest.fn(),
     onEdit: jest.fn()
 };
-var setUp = function (props) {
+var setUp = function (props, dndProps) {
     if (props === void 0) { props = defaultProps; }
+    if (dndProps === void 0) { dndProps = {}; }
     var user = user_event_1.default.setup({ delay: null });
     var Providers = function (_a) {
         var children = _a.children;
-        return (react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: { metadata: metadata } },
-            react_1.default.createElement(LocalizationProvider_1.LocalizationProvider, { dateAdapter: AdapterMoment_1.AdapterMoment },
-                react_1.default.createElement(styles_1.ThemeProvider, { theme: (0, styles_2.createTheme)(mdm_sdk_1.theme) }, children))));
+        return (react_1.default.createElement(core_1.DndContext, __assign({}, dndProps),
+            react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: { metadata: metadata } },
+                react_1.default.createElement(LocalizationProvider_1.LocalizationProvider, { dateAdapter: AdapterMoment_1.AdapterMoment },
+                    react_1.default.createElement(styles_1.ThemeProvider, { theme: (0, styles_2.createTheme)(mdm_sdk_1.theme) }, children)))));
     };
     var renderer = (0, react_2.render)(react_1.default.createElement(CrosswalkRow_1.CrosswalkRow, __assign({}, props)), { wrapper: Providers });
     return __assign(__assign({}, renderer), { user: user });
@@ -139,8 +139,6 @@ describe('CrosswalkRow tests', function () {
     var highlightCrosswalk = jest.fn();
     var removeHighlight = jest.fn();
     var toggleCrosswalkFocus = jest.fn();
-    var preview = jest.fn();
-    var useDragMock = jest.spyOn(reactDnd, 'useDrag').mockReturnValue([undefined, function () { return null; }, preview]);
     var useHighlightedCrosswalksMock = jest.spyOn(CrosswalksDisplay, 'useHighlightedCrosswalks').mockReturnValue([]);
     beforeEach(function () {
         mdm_sdk_1.isCrosswalkDisabled.mockReturnValue(false);
@@ -472,28 +470,4 @@ describe('CrosswalkRow tests', function () {
         rerender(react_1.default.createElement(CrosswalkRow_1.CrosswalkRow, __assign({}, props, { crosswalk: __assign({}, crosswalk) })));
         expect(node.scrollIntoView).toHaveBeenCalled();
     });
-    describe('dnd', function () {
-        afterEach(function () {
-            useDragMock.mockClear();
-        });
-        it('should use correct drag item', function () {
-            setUp();
-            var _a = useDragMock.mock.calls[0][0], item = _a.item, canDrag = _a.canDrag;
-            expect(item).toEqual({
-                type: 'Crosswalk',
-                crosswalk: defaultProps.crosswalk
-            });
-            expect(canDrag).toBe(true);
-        });
-        it('should use empty image preview', function () {
-            setUp();
-            expect(preview).toHaveBeenCalledWith((0, react_dnd_html5_backend_1.getEmptyImage)(), { captureDraggingState: true });
-        });
-        it('should not allow drag if crosswalk is disabled', function () {
-            mdm_sdk_1.isCrosswalkDisabled.mockReturnValue(true);
-            setUp();
-            var canDrag = useDragMock.mock.calls[0][0].canDrag;
-            expect(canDrag).toBe(false);
-        });
-    });
 });

package/cjs/features/crosswalks/CrosswalkRow/DndCrosswalkRow.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/features/crosswalks/CrosswalkRow/DndCrosswalkRow.test.js

@@ -0,0 +1,134 @@
+"use strict";
+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 };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var react_2 = require("@testing-library/react");
+var user_event_1 = __importDefault(require("@testing-library/user-event"));
+var LocalizationProvider_1 = require("@mui/x-date-pickers/LocalizationProvider");
+var AdapterMoment_1 = require("@mui/x-date-pickers/AdapterMoment");
+var styles_1 = require("@mui/styles");
+var styles_2 = require("@mui/material/styles");
+var dndKit_1 = require("../../../test-utils/dndKit");
+var core_1 = require("@dnd-kit/core");
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
+var MdmModuleContext_1 = require("../../../contexts/MdmModuleContext");
+var CrosswalkRow_1 = require("./CrosswalkRow");
+jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { isCrosswalkDisabled: jest.fn() })); });
+jest.mock('@dnd-kit/core', function () { return dndKit_1.mockDndKit; });
+var metadata = {
+    sources: [
+        {
+            uri: 'configuration/sources/Reltio',
+            label: 'Reltio',
+            icon: 'images/source/reltio.png',
+            abbreviation: 'Reltio'
+        },
+        {
+            uri: 'configuration/sources/AHA',
+            label: 'AHA',
+            icon: 'images/source/source_s.png',
+            abbreviation: 'AHA'
+        }
+    ]
+};
+var crosswalk = {
+    uri: 'entities/j8K1vc9/crosswalks/1kQ5cap2n',
+    type: 'configuration/sources/Reltio',
+    value: 'some value',
+    attributes: [],
+    singleAttributeUpdateDates: {},
+    createDate: '2021-05-14T05:21:14.532Z'
+};
+var defaultProps = {
+    crosswalk: crosswalk,
+    focusable: true,
+    isDependent: false,
+    disableEdit: false,
+    disableDelete: false,
+    onToggleFocus: jest.fn(),
+    onDelete: jest.fn(),
+    onEdit: jest.fn()
+};
+var setUp = function (props, dndProps) {
+    if (props === void 0) { props = defaultProps; }
+    if (dndProps === void 0) { dndProps = {}; }
+    var user = user_event_1.default.setup({ delay: null });
+    var Providers = function (_a) {
+        var children = _a.children;
+        return (react_1.default.createElement(core_1.DndContext, __assign({}, dndProps),
+            react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { values: { metadata: metadata } },
+                react_1.default.createElement(LocalizationProvider_1.LocalizationProvider, { dateAdapter: AdapterMoment_1.AdapterMoment },
+                    react_1.default.createElement(styles_1.ThemeProvider, { theme: (0, styles_2.createTheme)(mdm_sdk_1.theme) }, children)))));
+    };
+    var renderer = (0, react_2.render)(react_1.default.createElement(CrosswalkRow_1.CrosswalkRow, __assign({}, props)), { wrapper: Providers });
+    return __assign(__assign({}, renderer), { user: user });
+};
+describe('CrosswalkRow dnd tests', function () {
+    it('should use correct drag item', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var onDragStart;
+        return __generator(this, function (_a) {
+            onDragStart = jest.fn();
+            setUp(defaultProps, { onDragStart: onDragStart });
+            react_2.screen.debug(react_2.screen.getByText('Reltio'));
+            react_2.fireEvent.mouseDown(react_2.screen.getByText('Reltio'));
+            expect(onDragStart.mock.calls[0][0].active.data.current.crosswalk).toBe(defaultProps.crosswalk);
+            return [2 /*return*/];
+        });
+    }); });
+    it('should not allow drag if crosswalk is disabled', function () {
+        mdm_sdk_1.isCrosswalkDisabled.mockReturnValue(true);
+        var onDragStart = jest.fn();
+        setUp(defaultProps, { onDragStart: onDragStart });
+        react_2.fireEvent.mouseDown(react_2.screen.getByText('Reltio'));
+        expect(onDragStart).not.toHaveBeenCalled();
+    });
+});