Skip to content

Feature/integrate animations #892

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
90fcdb7
animation added
MenamAfzal May 13, 2024
7c438a6
animation package
MenamAfzal May 13, 2024
664a011
animation configurations
MenamAfzal May 14, 2024
6009284
fix stringExposingStateControl exposed methods
raheeliftikhar5 May 14, 2024
4db4036
fixed empty table text column isn't editabled
raheeliftikhar5 May 14, 2024
3af3766
animation delay and duration added
MenamAfzal May 14, 2024
d10f19b
opacity added
MenamAfzal May 14, 2024
8c6917e
box shadow added
MenamAfzal May 14, 2024
649410d
box shadow color added
MenamAfzal May 15, 2024
cebca5c
animation iteration count added
MenamAfzal May 15, 2024
0c3e340
rotation added to label
MenamAfzal May 15, 2024
7093a6e
switch component styling adjusted
MenamAfzal May 14, 2024
f55bc6e
other component styling adjusted
MenamAfzal May 14, 2024
7fa7b87
rotation added
MenamAfzal May 16, 2024
c910778
rotation added to input and slider
MenamAfzal May 16, 2024
96f83e6
rotation added to container
MenamAfzal May 16, 2024
8be7f70
default values changed
MenamAfzal May 16, 2024
b2ecece
values changed
MenamAfzal May 16, 2024
c3a249e
Merge branch 'lowcoder-org:dev' into dev
MenamAfzal May 16, 2024
d38320e
pull from dev
MenamAfzal May 16, 2024
9f16f3c
pull from dev
MenamAfzal May 16, 2024
f35cb79
configurations
MenamAfzal May 16, 2024
bbd43cd
icons updated
MenamAfzal May 17, 2024
4e98bf6
animation style separated in autocomplete
MenamAfzal May 17, 2024
b0cecdc
animation style added to container
MenamAfzal May 17, 2024
068c8fb
animation styles added
MenamAfzal May 17, 2024
d5f451a
animation styles added to timer
MenamAfzal May 17, 2024
13f7396
animation style
MenamAfzal May 18, 2024
8d276f7
formatting removed
MenamAfzal May 18, 2024
1e16d61
formating removed-1
MenamAfzal May 18, 2024
44427df
formating removed-2
MenamAfzal May 18, 2024
46ebe0f
formating removed-3
MenamAfzal May 18, 2024
6828664
formating removed-4
MenamAfzal May 18, 2024
5bff79f
formating removed-5
MenamAfzal May 18, 2024
32761e8
formating removed-6
MenamAfzal May 18, 2024
ef62a58
formating removed-7
MenamAfzal May 18, 2024
7fbe58f
formating removed-8
MenamAfzal May 18, 2024
956e1ff
formating removed-9
MenamAfzal May 18, 2024
707c149
formating removed-10
MenamAfzal May 18, 2024
fd696d3
formating removed-11
MenamAfzal May 18, 2024
8c092dd
formating removed-12
MenamAfzal May 18, 2024
ff44754
formating removed-13
MenamAfzal May 18, 2024
410df7a
formating removed-14
MenamAfzal May 18, 2024
f2c4de3
formating removed-15
MenamAfzal May 18, 2024
ef93faf
formating removed-16
MenamAfzal May 18, 2024
3fa1b0f
formating removed-17
MenamAfzal May 18, 2024
ab9d93d
formating removed-18
MenamAfzal May 18, 2024
bf3933e
formating removed-19
MenamAfzal May 18, 2024
3241f15
formating removed-20
MenamAfzal May 18, 2024
59429a7
formating removed-22
MenamAfzal May 18, 2024
28634a7
formating removed-23
MenamAfzal May 18, 2024
da6e658
formating removed-24
MenamAfzal May 18, 2024
8136f02
formating removed-25
MenamAfzal May 18, 2024
1f65ed2
formating removed-26
MenamAfzal May 18, 2024
c1c3222
formating removed-27
MenamAfzal May 18, 2024
f648010
formating removed-28
MenamAfzal May 18, 2024
0188dc3
formating removed-29
MenamAfzal May 18, 2024
86b8080
formating removed-30
MenamAfzal May 18, 2024
9b7730d
formating removed-31
MenamAfzal May 18, 2024
e41fccd
formating removed-32
MenamAfzal May 18, 2024
26fcd2e
formating removed-33
MenamAfzal May 18, 2024
b97caf0
formating removed-34
MenamAfzal May 18, 2024
1d1b80d
formating removed-35
MenamAfzal May 18, 2024
db2c65d
formating removed-36
MenamAfzal May 18, 2024
f128518
formating removed-37
MenamAfzal May 18, 2024
f027b6f
formating removed-38
MenamAfzal May 18, 2024
7569518
formating removed-39
MenamAfzal May 18, 2024
260cd88
formating removed-40
MenamAfzal May 18, 2024
bc89577
formating removed-41
MenamAfzal May 18, 2024
741202f
formating removed-42
MenamAfzal May 18, 2024
3b49aad
formating removed-43
MenamAfzal May 18, 2024
e24c276
formating removed-44
MenamAfzal May 18, 2024
1b812ee
formating removed-45
MenamAfzal May 18, 2024
9ed0c52
formating removed-46
MenamAfzal May 18, 2024
a5304e1
formating removed-47
MenamAfzal May 18, 2024
d841787
formating removed-48
MenamAfzal May 18, 2024
41e67aa
formating removed-49
MenamAfzal May 18, 2024
9911ed5
formating removed-50
MenamAfzal May 18, 2024
d4429d7
formating removed-51
MenamAfzal May 18, 2024
5660006
formating removed-52
MenamAfzal May 18, 2024
01b9b3b
formating removed-53
MenamAfzal May 18, 2024
f1ae8d2
formating removed-54
MenamAfzal May 18, 2024
75057d8
formating removed-55
MenamAfzal May 18, 2024
bcb94be
formating removed-56
MenamAfzal May 18, 2024
1fb7633
formating removed-57
MenamAfzal May 18, 2024
e3f1895
formating removed-58
MenamAfzal May 18, 2024
b1f554c
formating removed-59
MenamAfzal May 18, 2024
695137a
formating removed-60
MenamAfzal May 18, 2024
0bdf34f
formating removed-61
MenamAfzal May 18, 2024
fc7c125
formating removed-62
MenamAfzal May 18, 2024
c2ad3aa
formating removed-63
MenamAfzal May 18, 2024
79a7d59
formating removed-64
MenamAfzal May 18, 2024
ea63385
formating removed-65
MenamAfzal May 18, 2024
d2e9ac8
formating removed-66
MenamAfzal May 18, 2024
45364c1
formating removed-67
MenamAfzal May 18, 2024
187c060
formating removed-68
MenamAfzal May 18, 2024
c96a0ed
formating removed-69
MenamAfzal May 18, 2024
0a60384
formating removed-70
MenamAfzal May 18, 2024
534e45c
formating removed-71
MenamAfzal May 18, 2024
a6a9ecb
formating removed-72
MenamAfzal May 18, 2024
b320839
formating removed-73
MenamAfzal May 18, 2024
aaeb3c6
formating removed-74
MenamAfzal May 18, 2024
698c72f
formating removed-75
MenamAfzal May 18, 2024
23ed72f
formating removed-76
MenamAfzal May 18, 2024
0b94808
formating removed-77
MenamAfzal May 18, 2024
169deb3
formating removed-78
MenamAfzal May 18, 2024
a93891c
formating removed-79
MenamAfzal May 18, 2024
691a340
formating removed-80
MenamAfzal May 18, 2024
5d3a8ad
formating removed-81
MenamAfzal May 18, 2024
295ebdd
formating removed-82
MenamAfzal May 18, 2024
5c333da
formating removed-83
MenamAfzal May 18, 2024
239d914
formating removed-84
MenamAfzal May 18, 2024
d3d2ac2
formating removed-85
MenamAfzal May 18, 2024
378abcf
formating removed-86
MenamAfzal May 18, 2024
2bb1441
formating removed-87
MenamAfzal May 18, 2024
04c9f2d
formating removed-88
MenamAfzal May 18, 2024
209d248
formating removed-89
MenamAfzal May 18, 2024
07ab330
formating removed-90
MenamAfzal May 18, 2024
6262cc7
formating removed-91
MenamAfzal May 18, 2024
2b6c276
formating removed-92
MenamAfzal May 18, 2024
0b35086
formating removed-93
MenamAfzal May 18, 2024
5ee318e
formating removed-94
MenamAfzal May 18, 2024
e361bf7
formating removed-95
MenamAfzal May 18, 2024
01b27f4
formating removed-96
MenamAfzal May 18, 2024
bee0f23
formating removed-97
MenamAfzal May 18, 2024
8293a18
formating removed-98
MenamAfzal May 18, 2024
17072d3
formating removed-99
MenamAfzal May 18, 2024
29bedc8
formating removed-100
MenamAfzal May 18, 2024
516151e
formating removed-101
MenamAfzal May 18, 2024
c17a1f3
formating removed-102
MenamAfzal May 18, 2024
e607eca
formating removed-103
MenamAfzal May 18, 2024
111b296
formating removed-104
MenamAfzal May 18, 2024
14fc69a
formating removed-105
MenamAfzal May 18, 2024
d5a896d
formating removed-106
MenamAfzal May 18, 2024
f05195b
formating removed-107
MenamAfzal May 18, 2024
43bde2c
formating removed-108
MenamAfzal May 18, 2024
546affe
formating removed-109
MenamAfzal May 18, 2024
673919a
formating removed-110
MenamAfzal May 18, 2024
89d70ff
formating removed-111
MenamAfzal May 18, 2024
0148e43
formating removed-112
MenamAfzal May 18, 2024
6e961e3
formating removed-113
MenamAfzal May 18, 2024
6b9c5ed
formating removed-114
MenamAfzal May 18, 2024
98c62d0
formating removed-115
MenamAfzal May 18, 2024
8b639e2
formating removed-116
MenamAfzal May 18, 2024
d494e31
formating removed-117
MenamAfzal May 18, 2024
ce90cd9
formating removed-118
MenamAfzal May 18, 2024
7ceb293
formating removed-119
MenamAfzal May 18, 2024
9a363b3
formating removed-120
MenamAfzal May 18, 2024
2e04e18
formating removed-121
MenamAfzal May 18, 2024
83ed699
formating removed-122
MenamAfzal May 18, 2024
ccfdd0b
formating removed-123
MenamAfzal May 18, 2024
8311782
formating removed-125
MenamAfzal May 18, 2024
b0d79c4
formating removed-126
MenamAfzal May 18, 2024
79555b0
formating removed-127
MenamAfzal May 18, 2024
26cd6b9
constants added
MenamAfzal May 19, 2024
ca8d9cd
constants added
MenamAfzal May 18, 2024
dfd25d9
placeholders added
MenamAfzal May 19, 2024
8bc684b
icons adjusted
MenamAfzal May 19, 2024
03fdbd8
icons adjusted
MenamAfzal May 19, 2024
ad40b5f
Merge branch 'lowcoder-org:dev' into dev
MenamAfzal May 19, 2024
7b22680
pull from dev
MenamAfzal May 19, 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
1 change: 1 addition & 0 deletions client/packages/lowcoder-design/src/components/Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ export const sectionNames = {
layout: trans("prop.layout"),
style: trans("prop.style"),
labelStyle:trans("prop.labelStyle"),
animationStyle:trans("prop.animationStyle"),
data: trans("prop.data"),
meetings: trans("prop.meetings"), // added by Falk Wolsky
field: trans("prop.field"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const en = {
advanced: "Advanced",
validation: "Validation",
layout: "Layout",
animationStyle:"Animation Style",
labelStyle: "Label Style",
style: "Style",
meetings: "Meeting Settings",
Expand Down
4 changes: 4 additions & 0 deletions client/packages/lowcoder-design/src/icons/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ export { ReactComponent as ResetIcon } from "./icon-style-reset.svg";
export { ReactComponent as EditIcon } from "./icon-edit.svg";
export { ReactComponent as EditableIcon } from "./icon-editable.svg";
export { ReactComponent as LeftStateIcon } from "./remix/node-tree.svg";
export {ReactComponent as StarSmileIcon} from "./remix/star-smile-line.svg";
export {ReactComponent as Timer2Icon} from "./remix/timer-2-line.svg";
export {ReactComponent as TimerFlashIcon} from "./remix/timer-flash-line.svg";
export {ReactComponent as RefreshLineIcon} from "./remix/refresh-line.svg";
export { ReactComponent as LeftSettingIcon } from "./remix/tools-fill.svg";
export { ReactComponent as LeftLayersIcon } from "./remix/stack-line.svg";
export { ReactComponent as LeftHelpIcon } from "./icon-left-help.svg";
Expand Down
1 change: 1 addition & 0 deletions client/packages/lowcoder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"@types/react-signature-canvas": "^1.0.2",
"@types/react-test-renderer": "^18.0.0",
"@types/react-virtualized": "^9.21.21",
"animate.css": "^4.1.1",
"antd": "5.13.2",
"axios": "^1.6.2",
"buffer": "^6.0.3",
Expand Down
9 changes: 8 additions & 1 deletion client/packages/lowcoder/src/api/commonSettingApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,17 @@ export interface ThemeDetail {
primarySurface: string; // comp bg-color
borderRadius: string;
chart?: string;
margin?: string;
margin?: string;
padding?: string;
gridColumns?: string; //Added By Aqib Mirza
textSize?: string;
animation?: string;
animationDelay?: string;
animationDuration?: string;
opacity?: string;
boxShadow?: string;
boxShadowColor?: string;
animationIterationCount?: string;
}

export function getThemeDetailName(key: keyof ThemeDetail) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Input, Section, sectionNames } from "lowcoder-design";
import { BoolControl } from "comps/controls/boolControl";
import { styleControl } from "comps/controls/styleControl";
import {
AnimationStyle,
InputFieldStyle,
InputLikeStyle,
InputLikeStyleType,
Expand Down Expand Up @@ -62,6 +63,7 @@ const InputStyle = styled(Input)<{ $style: InputLikeStyleType }>`
${getStyle(props.$style)}
input {
padding: ${props.style?.padding};
rotate: ${props?.$style?.rotation};
}
.ant-select-single {
width: 100% !important;
Expand Down Expand Up @@ -89,6 +91,7 @@ const childrenMap = {
componentSize: dropdownControl(componentSize, "small"),
valueInItems: booleanExposingStateControl("valueInItems"),
inputFieldStyle: styleControl(InputLikeStyle),
animationStyle: styleControl(AnimationStyle),
};

const getValidate = (value: any): "" | "warning" | "error" | undefined => {
Expand Down Expand Up @@ -283,6 +286,7 @@ let AutoCompleteCompBase = (function () {
style: props.style,
labelStyle: props.labelStyle,
inputFieldStyle:props.inputFieldStyle,
animationStyle: props.animationStyle,
...validateState,
});
})
Expand Down Expand Up @@ -347,6 +351,9 @@ let AutoCompleteCompBase = (function () {
<Section name={sectionNames.inputFieldStyle}>
{children.inputFieldStyle.getPropertyView()}
</Section>
<Section name={sectionNames.animationStyle}>
{children.animationStyle.getPropertyView()}
</Section>
</>
);
})
Expand Down
15 changes: 12 additions & 3 deletions client/packages/lowcoder/src/comps/comps/buttonComp/linkComp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ButtonCompWrapper, buttonRefMethods } from "comps/comps/buttonComp/butt
import { BoolCodeControl, StringControl } from "comps/controls/codeControl";
import { ButtonEventHandlerControl } from "comps/controls/eventHandlerControl";
import { styleControl } from "comps/controls/styleControl";
import { LinkStyle, LinkStyleType } from "comps/controls/styleControlConstants";
import { AnimationStyle, AnimationStyleType, LinkStyle, LinkStyleType } from "comps/controls/styleControlConstants";
import { withDefault } from "comps/generators";
import { migrateOldData } from "comps/generators/simpleGenerators";
import { UICompBuilder } from "comps/generators/uiCompBuilder";
Expand All @@ -23,7 +23,11 @@ import { RefControl } from "comps/controls/refControl";
import { EditorContext } from "comps/editorState";
import React, { useContext } from "react";

const Link = styled(Button) <{ $style: LinkStyleType }>`
const Link = styled(Button)<{
$style: LinkStyleType;
$animationStyle: AnimationStyleType;
}>`
${(props) => props.$animationStyle}
${(props) => `
color: ${props.$style.text};
margin: ${props.$style.margin};
Expand Down Expand Up @@ -81,6 +85,7 @@ const LinkTmpComp = (function () {
disabled: BoolCodeControl,
loading: BoolCodeControl,
style: migrateOldData(styleControl(LinkStyle), fixOldData),
animationStyle:styleControl(AnimationStyle),
prefixIcon: IconControl,
suffixIcon: IconControl,
viewRef: RefControl<HTMLElement>,
Expand All @@ -91,6 +96,7 @@ const LinkTmpComp = (function () {
return (
<ButtonCompWrapper disabled={props.disabled}>
<Link
$animationStyle={props.animationStyle}
ref={props.viewRef}
$style={props.style}
loading={props.loading}
Expand Down Expand Up @@ -130,7 +136,10 @@ const LinkTmpComp = (function () {
)}

{(useContext(EditorContext).editorModeStatus === "layout" || useContext(EditorContext).editorModeStatus === "both") && (
<><Section name={sectionNames.style}>{children.style.getPropertyView()}</Section></>
<>
<Section name={sectionNames.style}>{children.style.getPropertyView()}</Section>
<Section name={sectionNames.animationStyle}>{children.animationStyle.getPropertyView()}</Section>
</>
)}
</>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ import { Button100, ButtonCompWrapper, buttonRefMethods } from "./buttonCompCons
import { IconControl } from "comps/controls/iconControl";
import { AlignWithStretchControl, LeftRightControl } from "comps/controls/dropdownControl";
import { booleanExposingStateControl } from "comps/controls/codeStateControl";
import { ToggleButtonStyle } from "comps/controls/styleControlConstants";
import {
AnimationStyle,
AnimationStyleType,
ToggleButtonStyle,
} from "comps/controls/styleControlConstants";
import { styleControl } from "comps/controls/styleControl";
import { BoolControl } from "comps/controls/boolControl";
import { RefControl } from "comps/controls/refControl";
Expand All @@ -29,7 +33,9 @@ const IconWrapper = styled.div`
const ButtonCompWrapperStyled = styled(ButtonCompWrapper)<{
$align: "left" | "center" | "right" | "stretch";
$showBorder: boolean;
$animationStyle: AnimationStyleType;
}>`
${(props) => props.$animationStyle}
width: 100%;
display: flex;
justify-content: ${(props) => props.$align};
Expand All @@ -55,7 +61,8 @@ const ToggleTmpComp = (function () {
iconPosition: LeftRightControl,
alignment: AlignWithStretchControl,
style: styleControl(ToggleButtonStyle),
showBorder: withDefault(BoolControl, true),
animationStyle: styleControl(AnimationStyle),
showBorder: withDefault(BoolControl, true),
viewRef: RefControl<HTMLElement>,
};
return new UICompBuilder(childrenMap, (props) => {
Expand All @@ -67,6 +74,7 @@ const ToggleTmpComp = (function () {
disabled={props.disabled}
$align={props.alignment}
$showBorder={props.showBorder}
$animationStyle={props.animationStyle}
>
<Button100
ref={props.viewRef}
Expand Down Expand Up @@ -122,13 +130,21 @@ const ToggleTmpComp = (function () {
</>
)}

{(useContext(EditorContext).editorModeStatus === "layout" || useContext(EditorContext).editorModeStatus === "both") && (
<><Section name={sectionNames.style}>
{children.showBorder.propertyView({ label: trans("toggleButton.showBorder") })}
{children.style.getPropertyView()}
</Section></>
)}

{(useContext(EditorContext).editorModeStatus === "layout" ||
useContext(EditorContext).editorModeStatus === "both") && (
<>
<Section name={sectionNames.style}>
{children.showBorder.propertyView({
label: trans("toggleButton.showBorder"),
})}
{children.style.getPropertyView()}
</Section>
<Section name={sectionNames.animationStyle}>
{children.animationStyle.getPropertyView()}
</Section>
</>
)}

</>
))
.setExposeMethodConfigs(buttonRefMethods)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { EditorContext } from "comps/editorState";

// Introducing styles
import {
AnimationStyle,
CommentStyle,
heightCalculator,
widthCalculator,
Expand Down Expand Up @@ -100,6 +101,7 @@ const childrenMap = {
}),
onEvent: eventHandlerControl(EventOptions),
style: styleControl(CommentStyle),
animationStyle: styleControl(AnimationStyle),
commentList: jsonValueExposingStateControl("commentList", []),
deletedItem: jsonValueExposingStateControl("deletedItem", []),
submitedItem: jsonValueExposingStateControl("submitedItem", []),
Expand All @@ -125,6 +127,7 @@ const CommentCompBase = (
userInfo,
placeholder,
deleteAble,
animationStyle,
} = props;
type PrefixType = "@" | keyof typeof mentionList;
// Used to save the consolidated list of mentions
Expand Down Expand Up @@ -233,7 +236,11 @@ const CommentCompBase = (
width: widthCalculator(style.margin ?? "3px"),
height: heightCalculator(style.margin ?? "3px"),
background: style.background,
borderRadius: style.radius,
borderRadius: style.radius,
animation: animationStyle.animation,
animationDelay: animationStyle.animationDelay,
animationDuration: animationStyle.animationDuration,
animationIterationCount:animationStyle.animationIterationCount
}}>
<div
style={{
Expand Down Expand Up @@ -413,8 +420,12 @@ let CommentBasicComp = (function () {
{children.placeholder.propertyView({
label: trans("comment.placeholderDec"),
})}
</Section><Section name={sectionNames.style}>
</Section>
<Section name={sectionNames.style}>
{children.style.getPropertyView()}
</Section>
<Section name={sectionNames.animationStyle}>
{children.animationStyle.getPropertyView()}
</Section></>
)}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { useContext, useEffect, useRef, useState } from "react";
import { EditorContext } from "comps/editorState";
import { Card } from "antd";
import styled from "styled-components";
import { CardHeaderStyle, CardHeaderStyleType, CardStyle, CardStyleType } from "comps/controls/styleControlConstants";
import { AnimationStyle, AnimationStyleType, CardHeaderStyle, CardHeaderStyleType, CardStyle, CardStyleType } from "comps/controls/styleControlConstants";
import { MultiCompBuilder, withDefault } from "comps/generators";
import { IconControl } from "comps/controls/iconControl";
import { ButtonEventHandlerControl, CardEventHandlerControl, clickEvent, refreshEvent } from "comps/controls/eventHandlerControl";
Expand All @@ -22,7 +22,14 @@ import { dropdownControl } from "comps/controls/dropdownControl";
import { styleControl } from "comps/controls/styleControl";
const { Meta } = Card;

const Warpper = styled.div<{ $style: CardStyleType | undefined, $showMate: boolean, $cardType: string, $headerStyle:CardHeaderStyleType, $bodyStyle:CardHeaderStyleType }>`
const Warpper = styled.div<{
$style: CardStyleType | undefined;
$showMate: boolean;
$cardType: string;
$headerStyle: CardHeaderStyleType;
$bodyStyle: CardHeaderStyleType;
$animationStyle:AnimationStyleType;
}>`
height: 100%;
width: 100%;
.ant-card-small >.ant-card-head {
Expand Down Expand Up @@ -70,6 +77,7 @@ const Warpper = styled.div<{ $style: CardStyleType | undefined, $showMate: boole
border-style: ${props => props.$style?.borderStyle};
border-radius: ${props => props.$style?.radius};
border-width: ${props => props.$style?.borderWidth};
${props=>props.$animationStyle}
}
.ant-card-body {
display: ${props => props.$showMate ? '' : 'none'};
Expand Down Expand Up @@ -173,6 +181,7 @@ export const ContainerBaseComp = (function () {
style: styleControl(CardStyle),
headerStyle: styleControl(CardHeaderStyle),
bodyStyle: styleControl(CardHeaderStyle),
animationStyle: styleControl(AnimationStyle),
};

return new ContainerCompBuilder(childrenMap, (props, dispatch) => {
Expand Down Expand Up @@ -202,6 +211,7 @@ export const ContainerBaseComp = (function () {
<Warpper
ref={conRef}
$style={props.style}
$animationStyle={props.animationStyle}
$headerStyle={props.headerStyle}
$bodyStyle={props.bodyStyle}
$showMate={props.showMeta || props.cardType == 'custom'}
Expand Down Expand Up @@ -321,6 +331,9 @@ export const ContainerBaseComp = (function () {
<Section name={sectionNames.bodyStyle}>
{children.bodyStyle.getPropertyView()}
</Section>
<Section name={sectionNames.animationStyle}>
{children.animationStyle.getPropertyView()}
</Section>
</>
)}
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ import { BoolCodeControl } from "comps/controls/codeControl";
import { DisabledContext } from "comps/generators/uiCompBuilder";
import React, { useContext } from "react";
import { EditorContext } from "comps/editorState";
import { AnimationStyle, styleControl } from "@lowcoder-ee/index.sdk";

export const ContainerBaseComp = (function () {
const childrenMap = {
disabled: BoolCodeControl,
animationStyle: styleControl(AnimationStyle),
};
return new ContainerCompBuilder(childrenMap, (props, dispatch) => {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ import {
ContainerCompBuilder,
} from "../pageLayoutComp/pageLayoutCompBuilder";
import { PageLayout } from "../pageLayoutComp/pageLayout";

import { AnimationStyle, styleControl } from "@lowcoder-ee/index.sdk";

export const ContainerBaseComp = (function () {
const childrenMap = {
disabled: BoolCodeControl
const childrenMap = {
disabled: BoolCodeControl,
animationStyle: styleControl(AnimationStyle),
};

return new ContainerCompBuilder(childrenMap, (props, dispatch) => {
Expand Down Expand Up @@ -52,7 +53,10 @@ export const ContainerBaseComp = (function () {
</Section>
<Section name={sectionNames.style}>
{ children.container.stylePropertyView() }
</Section>
</Section>
<Section name={sectionNames.animationStyle}>
{children.animationStyle.getPropertyView()}
</Section>
{children.container.children.showHeader.getView() && (
<Section name={"Header Style"}>
{ children.container.headerStylePropertyView() }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { TriContainer } from "../triContainerComp/triFloatTextContainer";
import { dropdownControl } from "comps/controls/dropdownControl";
import { withDefault } from "comps/generators/simpleGenerators";
import { styleControl } from "comps/controls/styleControl";
import { TextStyle } from "comps/controls/styleControlConstants";
import { AnimationStyle, TextStyle } from "comps/controls/styleControlConstants";
import { useContext } from "react";
import { EditorContext } from "comps/editorState";
import { alignWithJustifyControl } from "comps/controls/alignControl";
Expand Down Expand Up @@ -63,6 +63,7 @@ export const ContainerBaseComp = (function () {
horizontalAlignment: alignWithJustifyControl(),
width: withDefault(StringControl, "40"),
style: styleControl(TextStyle),
animationStyle: styleControl(AnimationStyle),
};
return new ContainerCompBuilder(childrenMap, (props, dispatch) => {
return <TriContainer {...props} />;
Expand Down Expand Up @@ -95,6 +96,9 @@ export const ContainerBaseComp = (function () {
<Section name={"Floating Text Style"}>
{children.style.getPropertyView()}
</Section>
<Section name={sectionNames.animationStyle}>
{children.animationStyle.getPropertyView()}
</Section>
<Section name={"Container Style"}>
{children.container.stylePropertyView()}
</Section>
Expand Down
Loading
Loading