Skip to content
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

Feature/update styles #935

Merged
merged 2 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const commonChildren = {
hourStep: RangeControl.closed(1, 24, 1),
minuteStep: RangeControl.closed(1, 60, 1),
secondStep: RangeControl.closed(1, 60, 1),
style: styleControl(InputFieldStyle),
style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}),
animationStyle: styleControl(AnimationStyle),
labelStyle: styleControl(LabelStyle.filter((style) => ['accent', 'validate'].includes(style.name) === false)),
suffixIcon: withDefault(IconControl, "/icon:regular/calendar"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ import { omit } from "lodash";

const { RangePicker } = DatePicker;

const RangePickerStyled = styled(RangePicker)<{ $style: DateTimeStyleType }>`
const RangePickerStyled = styled(RangePicker)<{$style: DateTimeStyleType}>`
width: 100%;
box-shadow: ${(props) =>
`${props.$style.boxShadow} ${props.$style.boxShadowColor}`};
${(props) => props.$style && getStyle(props.$style)}
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { default as DatePicker } from "antd/es/date-picker";

const DatePickerStyled = styled(DatePicker)<{ $style: DateTimeStyleType }>`
width: 100%;
box-shadow: ${props=>`${props.$style.boxShadow} ${props.$style.boxShadowColor}`};
${(props) => props.$style && getStyle(props.$style)}
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ import { SelectInputInvalidConfig, useSelectInputValidate } from "./selectInputC

import { PaddingControl } from "../../controls/paddingControl";
import { MarginControl } from "../../controls/marginControl";
import { migrateOldData } from "comps/generators/simpleGenerators";
import { migrateOldData, withDefault } from "comps/generators/simpleGenerators";
import { fixOldInputCompData } from "../textInputComp/textInputConstants";

let MultiSelectBasicComp = (function () {
const childrenMap = {
...SelectChildrenMap,
defaultValue: arrayStringExposingStateControl("defaultValue", ["1", "2"]),
value: arrayStringExposingStateControl("value"),
style: styleControl(InputFieldStyle),
style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}),
labelStyle:styleControl(LabelStyle),
inputFieldStyle:styleControl(MultiSelectStyle),
inputFieldStyle:withDefault(styleControl(MultiSelectStyle),{borderWidth:'1px'}),
childrenInputFieldStyle:styleControl(ChildrenMultiSelectStyle),
margin: MarginControl,
padding: PaddingControl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ import {
import { useRef } from "react";
import { RecordConstructorToView } from "lowcoder-core";
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
import { migrateOldData } from "comps/generators/simpleGenerators";
import { migrateOldData, withDefault } from "comps/generators/simpleGenerators";

let SelectBasicComp = (function () {
const childrenMap = {
...SelectChildrenMap,
defaultValue: stringExposingStateControl("defaultValue"),
value: stringExposingStateControl("value"),
style: styleControl(InputFieldStyle),
style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}),
labelStyle: styleControl(LabelStyle),
inputFieldStyle: styleControl(SelectStyle),
inputFieldStyle: withDefault(styleControl(SelectStyle),{borderWidth:'1px'}),
childrenInputFieldStyle: styleControl(ChildrenMultiSelectStyle)
};
return new UICompBuilder(childrenMap, (props, dispatch) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export const getStyle = (
background-color: ${style.background};
border-color: ${style.border};
border-width:${(style as SelectStyleType).borderWidth};
box-shadow:${(style as SelectStyleType).boxShadow} ${(style as SelectStyleType).boxShadowColor};
}

&.ant-select-focused,
Expand Down Expand Up @@ -181,10 +182,9 @@ const getDropdownStyle = (style: MultiSelectStyleType) => {
`;
};

const Select = styled(AntdSelect) <{ $style: SelectStyleType & MultiSelectStyleType }>`
const Select = styled(AntdSelect) <{ $style: SelectStyleType & MultiSelectStyleType,$inputFieldStyle:SelectStyleType }>`
width: 100%;

${(props) => props.$style && getStyle(props.$style)}
${(props) => props.$inputFieldStyle && getStyle(props.$inputFieldStyle)}
`;

const DropdownStyled = styled.div<{ $style: ChildrenMultiSelectStyleType }>`
Expand Down Expand Up @@ -246,13 +246,15 @@ export const SelectUIView = (
value: any;
style: SelectStyleType | MultiSelectStyleType;
childrenInputFieldStyle: ChildrenMultiSelectStyleType;
inputFieldStyle: SelectStyleType;
onChange: (value: any) => void;
dispatch: DispatchType;
}
) => {
return <Select
ref={props.viewRef}
mode={props.mode}
$inputFieldStyle={props.inputFieldStyle}
$style={props.style as SelectStyleType & MultiSelectStyleType}
disabled={props.disabled}
allowClear={props.allowClear}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1192,6 +1192,8 @@ export const SelectStyle = [
...replaceAndMergeMultipleStyles(STYLING_FIELDS_SEQUENCE.filter(style=>style.name!=='rotation'), "border", [
...getStaticBgBorderRadiusByBg(SURFACE_COLOR, "pc"),
]),
BOXSHADOW,
BOXSHADOWCOLOR,
...ACCENT_VALIDATE,
] as const;

Expand Down Expand Up @@ -1225,6 +1227,8 @@ export const MultiSelectStyle = [
transformer: toSelf,
platform: "pc",
},
BOXSHADOW,
BOXSHADOWCOLOR,
...ACCENT_VALIDATE,
] as const;

Expand Down Expand Up @@ -1584,6 +1588,8 @@ export const DateTimeStyle = [
PADDING,
BORDER_STYLE,
BORDER_WIDTH,
BOXSHADOW,
BOXSHADOWCOLOR,
...ACCENT_VALIDATE,
] as const;

Expand Down
Loading