Skip to content

Fix/divider style #1026

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 4 commits into from
Jul 9, 2024
Merged

Fix/divider style #1026

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c106180
applied theme hook for styling
MenamAfzal Jul 8, 2024
e26a9f3
applied vertical type
MenamAfzal Jul 9, 2024
5c92b00
pull origin dev
MenamAfzal Jul 9, 2024
eb7515c
type text changed
MenamAfzal Jul 9, 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
Next Next commit
applied theme hook for styling
  • Loading branch information
@MenamAfzal
MenamAfzal committed Jul 8, 2024
commit c1061804a1a83d3dddaa87e1a7c51c0be0966792
30 changes: 14 additions & 16 deletions client/packages/lowcoder/src/comps/comps/dividerComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import { AutoHeightControl } from "comps/controls/autoHeightControl";

import { useContext } from "react";
import { EditorContext } from "comps/editorState";
import { useMergeCompStyles } from "@lowcoder-ee/index.sdk";

type IProps = DividerProps & {
$style: DividerStyleType;
dashed: boolean;
$animationStyle:AnimationStyleType;
};

Expand Down Expand Up @@ -56,7 +56,6 @@ const StyledDivider = styled(Divider)<IProps>`
.ant-divider-inner-text::before,
.ant-divider-inner-text::after {
border-block-start: ${(props) => props.$style.borderWidth && props.$style.borderWidth !== "0px" ? props.$style.borderWidth : "1px"}
${(props) => props.dashed ? "dashed" : "solid"}
${(props) => props.$style.border} !important;
border-block-start-color: inherit;
border-block-end: 0;
Expand All @@ -81,11 +80,10 @@ const StyledDivider = styled(Divider)<IProps>`

const childrenMap = {
title: StringControl,
dashed: BoolControl,
align: alignControl(),
autoHeight: withDefault(AutoHeightControl, "fixed"),
style: styleControl(DividerStyle),
animationStyle: styleControl(AnimationStyle),
style: styleControl(DividerStyle , 'style'),
animationStyle: styleControl(AnimationStyle , 'animationStyle'),
};

function fixOldStyleData(oldData: any) {
Expand All @@ -104,12 +102,13 @@ function fixOldStyleData(oldData: any) {


// Compatible with historical style data 2022-8-26
const DividerTempComp = migrateOldData(
new UICompBuilder(childrenMap, (props) => {
export const DividerComp = migrateOldData(
new UICompBuilder(childrenMap, (props , dispatch) => {
useMergeCompStyles(props as Record<string, any>, dispatch);

return (
<StyledDivider
orientation={props.align}
dashed={props.dashed}
$style={props.style}
$animationStyle={props.animationStyle}
>
Expand Down Expand Up @@ -138,10 +137,9 @@ const DividerTempComp = migrateOldData(
label: trans("divider.align"),
radioButton: true,
})}
{children.autoHeight.getPropertyView()}
{/* {children.autoHeight.getPropertyView()} */}
</Section>
<Section name={sectionNames.style}>
{children.dashed.propertyView({ label: trans("divider.dashed") })}
{children.style.getPropertyView()}
</Section>
<Section name={sectionNames.animationStyle}hasTooltip={true}>
Expand All @@ -153,7 +151,6 @@ const DividerTempComp = migrateOldData(
);
})
.setExposeStateConfigs([
new NameConfig("dashed", trans("divider.dashedDesc")),
new NameConfig("title", trans("divider.titleDesc")),
new NameConfig("align", trans("divider.alignDesc")),
NameConfigHidden,
Expand All @@ -162,8 +159,9 @@ const DividerTempComp = migrateOldData(
fixOldStyleData
);

export const DividerComp = class extends DividerTempComp {
override autoHeight(): boolean {
return this.children.autoHeight.getView();
}
};
// export const DividerComp
// = class extends DividerTempComp {
// override autoHeight(): boolean {
// return this.children.autoHeight.getView();
// }
// };
6 changes: 6 additions & 0 deletions client/packages/lowcoder/src/constants/themeConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ const qrCode = {
}
};

const divider = {
style: {
radius: "0px"
}
};

export const defaultTheme: ThemeDetail = {
primary: "#3377FF",
Expand Down Expand Up @@ -130,6 +135,7 @@ export const defaultTheme: ThemeDetail = {
qrCode,
treeSelect,
pageLayout,
divider,
password: input,
numberInput: input,
textArea: input,
Expand Down