Skip to content

Fix/component wrapper on rotation #919

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 22 commits into from
Jun 1, 2024
Merged

Fix/component wrapper on rotation #919

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
38311f7
container padding updated
MenamAfzal May 25, 2024
7b1215d
Merge branch 'dev' into fix/component-wrapper-on-rotation
MenamAfzal May 27, 2024
3cedced
rotation improved
MenamAfzal May 28, 2024
d766a34
designed formula to calculate padding dynamically
MenamAfzaal May 29, 2024
a9070fa
childrenMap updated
MenamAfzal May 29, 2024
d4997ee
pull from dev
MenamAfzaal May 29, 2024
ce81b47
rotation edited
MenamAfzal May 29, 2024
6b75817
Merge branch 'fix/component-wrapper-on-rotation' of https://github.co…
MenamAfzal May 29, 2024
790d04d
formatting removed
MenamAfzal May 29, 2024
36d4f06
formatting removed -1
MenamAfzal May 29, 2024
c8ba492
formatting removed -2
MenamAfzal May 29, 2024
17ed925
unused variable removed
MenamAfzal May 29, 2024
0edac5c
rotation fixed
MenamAfzal May 29, 2024
e3f2144
rotation and boxshadow conflict resolved
MenamAfzal May 29, 2024
1facfbc
condition updated
MenamAfzal May 30, 2024
c7ed2c3
condition updated
MenamAfzal May 31, 2024
c984e21
condition updated
MenamAfzal May 31, 2024
af215e7
padding on rotation
MenamAfzal May 31, 2024
380b47e
padding updated
MenamAfzal May 31, 2024
3d0daee
function created
MenamAfzal May 31, 2024
15b4b84
types added
MenamAfzal May 31, 2024
f1ef6f5
padding updated
MenamAfzal May 31, 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
Prev Previous commit
Next Next commit
rotation edited
  • Loading branch information
@MenamAfzal
MenamAfzal committed May 29, 2024
commit ce81b47c446027bcfc44d0404ea2665aae8512be
40 changes: 21 additions & 19 deletions client/packages/lowcoder/src/comps/comps/textComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { UICompBuilder } from "../generators";
import { NameConfig, NameConfigHidden, withExposingConfigs } from "../generators/withExposing";
import { markdownCompCss, TacoMarkDown } from "lowcoder-design";
import { styleControl } from "comps/controls/styleControl";
import { AnimationStyle, AnimationStyleType, TextContainerStyle, TextContainerStyleType, heightCalculator, widthCalculator } from "comps/controls/styleControlConstants";
import { AnimationStyle, AnimationStyleType, TextStyle, TextStyleType, heightCalculator, widthCalculator } from "comps/controls/styleControlConstants";
import { hiddenPropertyView } from "comps/utils/propertyUtils";
import { trans } from "i18n";
import { alignWithJustifyControl } from "comps/controls/alignControl";
Expand All @@ -21,23 +21,24 @@ import { PaddingControl } from "../controls/paddingControl";
import React, { useContext } from "react";
import { EditorContext } from "comps/editorState";

const getStyle = (style: TextContainerStyleType) => {
const getStyle = (style: TextStyleType) => {
return css`
border-radius: ${(style.radius ? style.radius : "4px")};
border: ${(style.borderWidth ? style.borderWidth : "0px")} solid ${style.border};
border-radius: ${style.radius ? style.radius : '4px'};
border: ${style.borderWidth ? style.borderWidth : '0px'} solid
${style.border};
color: ${style.text};
text-transform:${style.textTransform} !important;
text-decoration:${style.textDecoration} !important;
text-transform: ${style.textTransform} !important;
text-decoration: ${style.textDecoration} !important;
background-color: ${style.background};
.markdown-body a {
color: ${style.links};
}
.markdown-body {
margin: ${style.margin} !important;
padding: ${style.padding};
width: ${widthCalculator(style.margin)};
margin: ${style.margin} !important;
padding: ${style.padding};
width: ${widthCalculator(style.margin)};
font-family: ${style.fontFamily} !important;
font-style:${style.fontStyle} !important;
font-style: ${style.fontStyle} !important;
font-size: ${style.textSize} !important;
// height: ${heightCalculator(style.margin)};
h1 {
Expand Down Expand Up @@ -74,15 +75,15 @@ const getStyle = (style: TextContainerStyleType) => {

const TextContainer = styled.div<{
$type: string;
$styleConfig: TextContainerStyleType;
$animationStyle:AnimationStyleType;
$styleConfig: TextStyleType;
$animationStyle: AnimationStyleType;
}>`
height: 100%;
overflow: auto;
margin: 0;
${props=>props.$animationStyle}
${(props) => props.$animationStyle}
${(props) =>
props.$type === "text" && "white-space:break-spaces;line-height: 1.9;"};
props.$type === 'text' && 'white-space:break-spaces;line-height: 1.9;'};
${(props) => props.$styleConfig && getStyle(props.$styleConfig)}
display: flex;
font-size: 13px;
Expand Down Expand Up @@ -123,14 +124,14 @@ let TextTmpComp = (function () {

const childrenMap = {
text: stringExposingStateControl(
"text",
trans("textShow.text", { name: "{{currentUser.name}}" })
'text',
trans('textShow.text', {name: '{{currentUser.name}}'})
),
autoHeight: AutoHeightControl,
type: dropdownControl(typeOptions, "markdown"),
type: dropdownControl(typeOptions, 'markdown'),
horizontalAlignment: alignWithJustifyControl(),
verticalAlignment: dropdownControl(VerticalAlignmentOptions, "center"),
style: styleControl(TextContainerStyle),
verticalAlignment: dropdownControl(VerticalAlignmentOptions, 'center'),
style: styleControl(TextStyle),
animationStyle: styleControl(AnimationStyle),
margin: MarginControl,
padding: PaddingControl,
Expand All @@ -146,6 +147,7 @@ let TextTmpComp = (function () {
justifyContent: props.horizontalAlignment,
alignItems: props.autoHeight ? "center" : props.verticalAlignment,
textAlign: props.horizontalAlignment,
rotate: props.style.rotation
}}
>
{props.type === "markdown" ? <TacoMarkDown>{value}</TacoMarkDown> : value}
Expand Down