Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/ColumnLayoutComp layout issues #949

Merged
merged 3 commits into from
Jun 11, 2024
Merged

Fix/ColumnLayoutComp layout issues #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a99e7bb
update comp height calculation on auto/fixed height
raheeliftikhar5 Jun 10, 2024
892fe07
fix column layout comp's layout issues
raheeliftikhar5 Jun 10, 2024
080c631
maintain comp height on dragging
raheeliftikhar5 Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 36 additions & 17 deletions client/packages/lowcoder/src/comps/comps/columnLayout/columnLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,20 @@ import { disabledPropertyView, hiddenPropertyView } from "comps/utils/propertyUt
import { DisabledContext } from "comps/generators/uiCompBuilder";

const ContainWrapper = styled.div<{
$style: ContainerStyleType | undefined;
$style: ContainerStyleType & {
display: string,
gridTemplateColumns: string,
columnGap: string,
gridTemplateRows: string,
rowGap: string,
} | undefined;
}>`
display: ${(props) => props.$style?.display};
grid-template-columns: ${(props) => props.$style?.gridTemplateColumns};
grid-template-rows: ${(props) => props.$style?.gridTemplateRows};
column-gap: ${(props) => props.$style?.columnGap};
row-gap: ${(props) => props.$style?.rowGap};

background-color: ${(props) => props.$style?.background} !important;
border-radius: ${(props) => props.$style?.radius};
border-width: ${(props) => props.$style?.borderWidth};
Expand All @@ -59,7 +71,7 @@ const ColWrapper = styled(Col)<{
$matchColumnsHeight: boolean,
}>`
> div {
height: ${(props) => props.$matchColumnsHeight ? '100%' : 'auto'};
height: ${(props) => props.$matchColumnsHeight ? `calc(100% - ${props.$style?.padding || 0} - ${props.$style?.padding || 0})` : 'auto'};
background-color: ${(props) => props.$style?.background} !important;
border-radius: ${(props) => props.$style?.radius};
border-width: ${(props) => props.$style?.borderWidth};
Expand Down Expand Up @@ -121,17 +133,24 @@ const ColumnLayout = (props: ColumnLayoutProps) => {
} = props;

return (
<BackgroundColorContext.Provider value={"none"}>
<BackgroundColorContext.Provider value={props.style.background}>
<DisabledContext.Provider value={props.disabled}>
<ContainWrapper $style={props.style}>
<div style={{display: "grid", gridTemplateColumns: templateColumns, columnGap, gridTemplateRows: templateRows, rowGap}}>
{columns.map(column => {
const id = String(column.id);
const childDispatch = wrapDispatch(wrapDispatch(dispatch, "containers"), id);
if(!containers[id]) return null
const containerProps = containers[id].children;
const noOfColumns = columns.length;
return (
<ContainWrapper $style={{
...props.style,
display: "grid",
gridTemplateColumns: templateColumns,
columnGap,
gridTemplateRows: templateRows,
rowGap,
}}>
{columns.map(column => {
const id = String(column.id);
const childDispatch = wrapDispatch(wrapDispatch(dispatch, "containers"), id);
if(!containers[id]) return null
const containerProps = containers[id].children;
const noOfColumns = columns.length;
return (
<BackgroundColorContext.Provider value={props.columnStyle.background}>
<ColWrapper
key={id}
$style={props.columnStyle}
Expand All @@ -147,12 +166,12 @@ const ColumnLayout = (props: ColumnLayoutProps) => {
style={columnStyle}
/>
</ColWrapper>
)
})
}
</div>
</BackgroundColorContext.Provider>
)
})
}
</ContainWrapper>
</DisabledContext.Provider>
</DisabledContext.Provider>
</BackgroundColorContext.Provider>
);
};
Expand Down
7 changes: 6 additions & 1 deletion client/packages/lowcoder/src/layout/gridItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,12 @@ export function GridItem(props: GridItemProps) {
cssTransforms: true,
}),
style: {
...setTransform(pos,props.name),
...setTransform(
pos,
props.name,
props.autoHeight,
Boolean(draggingUtils.isDragging())
),
opacity: layoutHide ? 0 : undefined,
pointerEvents: layoutHide ? "none" : "auto",
},
Expand Down
13 changes: 11 additions & 2 deletions client/packages/lowcoder/src/layout/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,21 @@ export function getStatics(layout: Layout): Layout {
return _.pickBy(layout, (l) => l.static);
}

export function setTransform({ top, left, width, height }: Position,name?:string): Record<string, any> {
export function setTransform(
{top, left, width, height }: Position,
name ?: string,
autoHeight?: boolean,
isDragging?: boolean,
): Record<string, any> {
// Replace unitless items with px
const translate = `translate(${left}px,${top}px)`;
function containsChart(str:string) {
return /chart/i.test(str);
}
let updatedHeight = 'auto';
if (isDragging || !autoHeight || (name && containsChart(name))) {
updatedHeight = `${height}px`;
}

return {
transform: translate,
Expand All @@ -213,7 +222,7 @@ export function setTransform({ top, left, width, height }: Position,name?:string
msTransform: translate,
OTransform: translate,
width: `${width}px`,
height: name ?containsChart(name)?`${height}px`:'auto':`${height}px`,
height: updatedHeight,
position: 'absolute',
};
}
Expand Down
Loading