Skip to content

feat: horizontal/vertical align with flexbox #119

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 1 commit into from
Oct 14, 2021
Merged

feat: horizontal/vertical align with flexbox #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions src/components/TextWidget/editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,24 @@ class TextWidgetEditor extends Component<Props, TextWidgetProps> {
/>
<TextField
type="text"
label="text align"
label="text horizontal align"
fullWidth
variant="outlined"
onChange={(e) => {
this.setState({ ...this.state, textAlign: e.target.value as Property.TextAlign });
this.setState({ ...this.state, textAlign: e.target.value as Property.JustifyContent });
}}
value={this.state.textAlign}
/>
<TextField
type="text"
label="text vertical align"
fullWidth
variant="outlined"
onChange={(e) => {
this.setState({ ...this.state, verticalAlign: e.target.value as Property.AlignItems });
}}
value={this.state.verticalAlign}
/>
</FormGroup>
<FormGroup>
<TextField
Expand Down
3 changes: 2 additions & 1 deletion src/components/TextWidget/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ type TextWidgetProps = {
text: string;
textColor?: string;
fontSize?: string;
textAlign?: Property.TextAlign;
textAlign?: Property.JustifyContent;
verticalAlign?: Property.AlignItems;
backgroundColor?: string;
edgeWeight?: number; // px
edgeColor?: string;
Expand Down
10 changes: 7 additions & 3 deletions src/components/TextWidget/widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ const calcTextShadow = (weight, color) => {
};

const defaultStyle: CSSProperties = {
display: 'flex',
boxSizing: 'border-box',
whiteSpace: 'pre-wrap',
overflow: 'hidden',
color: '#ffffff',
backgroundColor: 'rgba(0,0,0,0.1)',
textShadow: calcTextShadow(1, '#000000'),
textAlign: 'left',
textAlign: 'start',
verticalAlign: 'start',
width: 320,
height: 540,
padding: '0.25rem 0.5rem',
Expand All @@ -34,6 +36,7 @@ const TextWidget: VFC<TextWidgetProps> = ({
textColor,
fontSize,
textAlign,
verticalAlign,
backgroundColor,
edgeWeight,
edgeColor,
Expand All @@ -55,9 +58,10 @@ const TextWidget: VFC<TextWidgetProps> = ({
color: textColor || '#ffffff',
fontSize: fontSize || '1rem',
textShadow: edge,
textAlign: textAlign || 'left',
justifyContent: textAlign || 'start',
alignItems: verticalAlign || 'start',
backgroundColor: backgroundColor || 'rgba(0,0,0,0.1)',
display: hidden || autoHidden && text.length === 0 ? 'none' : 'block',
display: hidden || autoHidden && text.length === 0 ? 'none' : 'flex',
zIndex,
};

Expand Down