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

fix: filter child widgets from autolayout calc

Browse source
This commit is contained in:
Johnson Cherian 2024-01-17 01:06:43 +05:30
parent 82ad26ce09
commit 46e5e41f0f
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
frontend/src/Editor/Container.jsx
View file

@ -106,20 +106,24 @@ export const Container = ({
useEffect(() => {
if (currentLayout === 'mobile' && appDefinition.pages[currentPageId]?.autoComputeLayout) {
const mobLayouts = Object.keys(boxes).map((key) => {
return { ...cloneDeep(boxes[key]?.layouts?.desktop), i: key };
});
const mobLayouts = Object.keys(boxes)
.filter((key) => !boxes[key]?.component?.parent)
.map((key) => {
return { ...cloneDeep(boxes[key]?.layouts?.desktop), i: key };
});
const updatedBoxes = cloneDeep(boxes);
let newmMobLayouts = correctBounds(mobLayouts, { cols: 43 });
newmMobLayouts = compact(newmMobLayouts, 'vertical', 43);
Object.keys(boxes).forEach((id) => {
const mobLayout = newmMobLayouts.find((layout) => layout.i === id);
updatedBoxes[id].layouts.mobile = {
left: mobLayout.left,
height: mobLayout.height,
top: mobLayout.top,
width: mobLayout.width,
};
updatedBoxes[id].layouts.mobile = mobLayout
? {
left: mobLayout.left,
height: mobLayout.height,
top: mobLayout.top,
width: mobLayout.width,
}
: updatedBoxes[id].layouts.desktop;
});
setBoxes({ ...updatedBoxes });
// console.log('currentLayout', data);