Skip to content

Feat: margin padding #278

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

Merged
merged 6 commits into from
Jul 12, 2023
Merged

Feat: margin padding #278

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33f2ea7
feat: margin padding changes
Jul 10, 2023
cf3a59e
Merge branch 'main' of https://github.com/aaron1604/lowcoder into fea…
Jul 10, 2023
a4922bd
feat: margin padding and select box options
Jul 12, 2023
5b3b9b8
feat: container fix
Jul 12, 2023
370bd21
feat: additional padding settings for container
Jul 12, 2023
6a20c91
Merge branch 'main' into feat/margin-padding
FalkWolsky Jul 12, 2023
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
Prev Previous commit
Next Next commit
feat: additional padding settings for container
  • Loading branch information
Aqib Mirza committed Jul 12, 2023
commit 370bd215062d720ed1b4b5bd8597a84993428e2b
3 changes: 3 additions & 0 deletions client/packages/lowcoder/src/comps/comps/triContainerComp/triContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export function TriContainer(props: TriContainerProps) {
containerPadding={[paddingWidth, 3]}
showName={{ bottom: showBody || showFooter ? 20 : 0 }}
backgroundColor={style?.headerBackground}
style={{padding: style.containerheaderpadding}}
/>
</BackgroundColorContext.Provider>
)}
Expand All @@ -109,6 +110,7 @@ export function TriContainer(props: TriContainerProps) {
hintPlaceholder={props.hintPlaceholder ?? HintPlaceHolder}
backgroundColor={style?.background}
borderColor={style?.border}
style={{padding: style.containerbodypadding}}
/>
</BackgroundColorContext.Provider>
)}
Expand All @@ -125,6 +127,7 @@ export function TriContainer(props: TriContainerProps) {
showName={{ top: showHeader || showBody ? 20 : 0 }}
backgroundColor={style?.footerBackground}
borderColor={style?.border}
style={{padding: style.containerfooterpadding}}
/>
</BackgroundColorContext.Provider>
)}
Expand Down
12 changes: 9 additions & 3 deletions client/packages/lowcoder/src/comps/controls/styleControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export function styleControl<T extends readonly SingleColorConfig[]>(colorConfig
name === "cardRadius"
) {
childrenMap[name] = StringControl;
} else if (name === "margin" || name === "padding") {
} else if (name === "margin" || name === "padding" || name==="containerheaderpadding" || name==="containerfooterpadding" || name==="containerbodypadding") {
childrenMap[name] = StringControl;
} else {
childrenMap[name] = ColorControl;
Expand Down Expand Up @@ -281,7 +281,10 @@ export function styleControl<T extends readonly SingleColorConfig[]>(colorConfig
if (
name === "radius" ||
name === "margin" ||
name === "padding"
name === "padding" ||
name==="containerheaderpadding" ||
name==="containerfooterpadding" ||
name==="containerbodypadding"
) {
children[name]?.dispatchChangeValueAction("");
} else {
Expand Down Expand Up @@ -338,7 +341,10 @@ export function styleControl<T extends readonly SingleColorConfig[]>(colorConfig
preInputNode: <MarginIcon title="" />,
placeholder: props[name],
})
: name === "padding"
: name === "padding" ||
name === "containerheaderpadding" ||
name === "containerfooterpadding" ||
name === "containerbodypadding"
? (
children[name] as InstanceType<typeof StringControl>
).propertyView({
Expand Down
39 changes: 38 additions & 1 deletion client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,33 @@ export type SimpleColorConfig = CommonColorConfig & {
export type RadiusConfig = CommonColorConfig & {
readonly radius: string;
};

export type ContainerHeaderPaddigConfig = CommonColorConfig & {
readonly containerheaderpadding: string;
};

export type ContainerBodyPaddigConfig = CommonColorConfig & {
readonly containerbodypadding: string;
};

export type ContainerFooterPaddigConfig = CommonColorConfig & {
readonly containerfooterpadding: string;
};

export type MarginConfig = CommonColorConfig & {
readonly margin: string;
};
export type PaddingConfig = CommonColorConfig & {
readonly padding: string;
};

export type DepColorConfig = CommonColorConfig & {
readonly depName?: string;
readonly depTheme?: keyof ThemeDetail;
readonly depType?: DEP_TYPE;
transformer: (color: string, ...rest: string[]) => string;
};
export type SingleColorConfig = SimpleColorConfig | DepColorConfig | RadiusConfig | MarginConfig | PaddingConfig;
export type SingleColorConfig = SimpleColorConfig | DepColorConfig | RadiusConfig | MarginConfig | PaddingConfig | ContainerHeaderPaddigConfig | ContainerFooterPaddigConfig | ContainerBodyPaddigConfig;

export const defaultTheme: ThemeDetail = {
primary: "#3377FF",
Expand Down Expand Up @@ -239,12 +253,32 @@ const MARGIN = {
label: trans("style.margin"),
margin: "margin",
} as const;

const PADDING = {
name: "padding",
label: trans("style.padding"),
padding: "padding",
} as const;

const CONTAINERHEADERPADDING = {
name: "containerheaderpadding",
label: trans("style.containerheaderpadding"),
containerheaderpadding: "padding",
} as const;

const CONTAINERFOOTERPADDING = {
name: "containerfooterpadding",
label: trans("style.containerfooterpadding"),
containerfooterpadding: "padding",
} as const;


const CONTAINERBODYPADDING = {
name: "containerbodypadding",
label: trans("style.containerbodypadding"),
containerbodypadding: "padding",
} as const;

const getStaticBorder = (color: string = SECOND_SURFACE_COLOR) =>
({
name: "border",
Expand Down Expand Up @@ -370,6 +404,9 @@ export const ContainerStyle = [
},
MARGIN,
PADDING,
CONTAINERHEADERPADDING,
CONTAINERFOOTERPADDING,
CONTAINERBODYPADDING
] as const;

export const SliderStyle = [
Expand Down
5 changes: 5 additions & 0 deletions client/packages/lowcoder/src/i18n/locales/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,8 @@ export const en = {
marginDesc: "The default margin is typically used for most components",
padding: "Padding",
paddingDesc: "The default padding is typically used for most components",
containerheaderpadding: "Header Padding",
containerheaderpaddingDesc: "The default headerpadding is typically used for most components",
//Added By Aqib Mirza
gridColumns: "Grid Columns",
gridColumnsDesc:
Expand Down Expand Up @@ -336,6 +338,9 @@ export const en = {
marginRight: "Margin Right",
marginTop: "Margin Top",
marginBottom: "Margin Bottom",
containerheaderpadding: "Header Padding",
containerfooterpadding: "Footer Padding",
containerbodypadding: "Body Padding",
},
export: {
hiddenDesc: "If true, the component is hidden",
Expand Down