Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 01:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: added restrictions on moving components to subcontainers

Browse source
This commit is contained in:
Johnson Cherian 2023-12-18 11:37:25 +05:30
parent 32509ac9bc
commit b358e84253
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frontend/src/Editor/DragContainer.jsx
View file

@ -6,6 +6,7 @@ import './DragContainer.css';
import DragContainerNested from './DragContainerNested';
import _, { isEmpty } from 'lodash';
import { flushSync } from 'react-dom';
import { restrictedWidgetsObj } from './WidgetManager/restrictedWidgetsConfig';
const NO_OF_GRIDS = 43;
const MouseCustomAble = {
@ -388,14 +389,6 @@ export default function DragContainer({
let draggedOverElemId;
if (document.elementFromPoint(e.clientX, e.clientY)) {
const targetElems = document.elementsFromPoint(e.clientX, e.clientY);
console.log(
'draggedOverElem - list',
targetElems.find(
(ele) =>
ele.id !== e.target.id &&
(ele.classList.contains('target') || ele.classList.contains('nested-target'))
)
);
const draggedOverElem = targetElems.find(
(ele) =>
ele.id !== e.target.id &&
@ -408,7 +401,11 @@ export default function DragContainer({
const parentElem = list.find(({ id }) => id === draggedOverElemId);
let left = e.lastEvent.translate[0];
let top = e.lastEvent.translate[1];
if (parentElem) {
const currentWidget = boxes.find(({ id }) => id === e.target.id)?.component?.component;
const parentWidget = boxes.find(({ id }) => id === parentElem.id)?.component?.component;
const restrictedWidgets = restrictedWidgetsObj[parentWidget];
const isParentChangeAllowed = !restrictedWidgets.includes(currentWidget);
if (parentElem && isParentChangeAllowed) {
left = left - parentElem.left * gridWidth;
top = top - parentElem.top;
} else {
@ -416,12 +413,13 @@ export default function DragContainer({
Math.round(top / 10) * 10
}px)`;
}
onDrag([
{
id: e.target.id,
x: left,
y: Math.round(top / 10) * 10,
parent: draggedOverElemId,
parent: isParentChangeAllowed ? draggedOverElemId : undefined,
},
]);
} catch (error) {