Skip to content

Commit 31f1cac

Browse files
authored
Merge pull request #1225 from MenamAfzal/fix/stepControl
Added Min-Width in Step control
2 parents 8393147 + 4a9e441 commit 31f1cac

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

client/packages/lowcoder/src/comps/comps/selectInputComp/stepControl.tsx

+14-14
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const StepsChildrenMap = {
9595
style: styleControl(StepsStyle , 'style'),
9696
viewRef: RefControl<HTMLDivElement>,
9797
animationStyle: styleControl(AnimationStyle ,'animationStyle' ),
98-
showVerticalScrollbar: withDefault(BoolControl, false),
98+
showScrollBars: withDefault(BoolControl, false),
9999
minHorizontalWidth: withDefault(RadiusControl, ''),
100100
};
101101

@@ -182,7 +182,7 @@ let StepControlBasicComp = (function () {
182182
padding: "0px",
183183
}}
184184
overflow="scroll"
185-
hideScrollbar={!props.showVerticalScrollbar}>
185+
hideScrollbar={!props.showScrollBars}>
186186
<Steps
187187
initial={props.initialValue.value -1}
188188
current={current}
@@ -197,6 +197,7 @@ let StepControlBasicComp = (function () {
197197
>
198198
{props.options.map((option, index) => (
199199
<Steps.Step
200+
style={{minWidth:props.minHorizontalWidth || '100%'}}
200201
key={index}
201202
title={option.label}
202203
subTitle={option.subTitle}
@@ -234,15 +235,6 @@ let StepControlBasicComp = (function () {
234235
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
235236
<Section name={sectionNames.layout}>
236237
{children.autoHeight.getPropertyView()}
237-
{!children.autoHeight.getView() && (
238-
children.showVerticalScrollbar.propertyView({
239-
label: trans("prop.showVerticalScrollbar"),
240-
})
241-
)}
242-
{children.minHorizontalWidth.propertyView({
243-
label: trans("prop.minHorizontalWidth"),
244-
placeholder: '100px',
245-
})}
246238
{children.size.propertyView({
247239
label: trans("step.size"),
248240
radioButton: true,
@@ -261,15 +253,23 @@ let StepControlBasicComp = (function () {
261253
radioButton: true,
262254
})
263255
}
256+
{children.direction.getView() == "horizontal" && (
257+
children.minHorizontalWidth.propertyView({
258+
label: trans("prop.minHorizontalWidth"),
259+
placeholder: '100px',
260+
})
261+
)}
262+
{!children.autoHeight.getView() && (
263+
children.showScrollBars.propertyView({
264+
label: trans("prop.scrollbar"),
265+
})
266+
)}
264267
{ children.displayType.getView() != "inline" && !children.showIcons.getView() && (
265268
children.showDots.propertyView({label: trans("step.showDots")}
266269
))}
267270
{ children.displayType.getView() != "inline" && !children.showDots.getView() && (
268271
children.showIcons.propertyView({label: trans("step.showIcons")}
269272
))}
270-
{!children.autoHeight.getView() && (
271-
children.showVerticalScrollbar.propertyView({label: trans("prop.showVerticalScrollbar")})
272-
)}
273273
</Section>
274274
)}
275275

0 commit comments

Comments
 (0)