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

Fix for inconsistency in widget position while switching layouts

Browse source
This commit is contained in:
navaneeth 2021-06-04 18:29:46 +05:30
parent 29dc290757
commit 80371db9bb
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/Editor/DraggableBox.jsx
View file

@ -131,7 +131,7 @@ export const DraggableBox = function DraggableBox({
useEffect(() => {
console.log(layoutData)
setCurrentLayoutOptions(layoutData);
}, [layoutData.height, layoutData.width, layoutData.left, layoutData.top]);
}, [layoutData.height, layoutData.width, layoutData.left, layoutData.top, currentLayout]);
function scaleWidth(width, scaleValue) {
let newWidth = width * scaleValue + 6;
@ -141,7 +141,11 @@ export const DraggableBox = function DraggableBox({
const diff = currentLayoutOptions.left + newWidth - deviceWindowWidth;
if(diff > 0 ) {
currentLayoutOptions.left = currentLayoutOptions.left - diff;
setCurrentLayoutOptions({
...currentLayoutOptions,
left: currentLayoutOptions.left - diff
});
return width;
}
@ -188,7 +192,7 @@ export const DraggableBox = function DraggableBox({
<Box
component={component}
id={id}
width={currentLayoutOptions.width * scaleValue}
width={scaleWidth(currentLayoutOptions.width, scaleValue)}
height={currentLayoutOptions.height}
mode={mode}
changeCanDrag={changeCanDrag}