From cd16cb6eed9f2efda538555ba3d8ab6381d94735 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Wed, 16 Jan 2019 07:14:31 +0000
Subject: [PATCH] Layout issues regarding fieldLength prop.
---
borgbutler-webapp/src/components/general/forms/FormSelect.jsx | 9 +++++++--
borgbutler-webapp/src/components/general/forms/FormComponents.jsx | 7 +++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/borgbutler-webapp/src/components/general/forms/FormComponents.jsx b/borgbutler-webapp/src/components/general/forms/FormComponents.jsx
index c92b6f1..62b578b 100644
--- a/borgbutler-webapp/src/components/general/forms/FormComponents.jsx
+++ b/borgbutler-webapp/src/components/general/forms/FormComponents.jsx
@@ -80,10 +80,14 @@
</UncontrolledTooltip>;
}
const {fieldLength, className, hint, hintPlacement, id, ...other} = props;
+ let myClassName = className;
+ if (fieldLength > 0) {
+ myClassName = classNames(`col-sm-${props.fieldLength}`, className);
+ }
return (
<React.Fragment>
<Input id={targetId}
- className={classNames(`col-sm-${props.fieldLength}`, className)}
+ className={myClassName}
{...other}
/>
{tooltip}
@@ -113,7 +117,6 @@
name: '',
hint: null,
hintPlacement: 'top',
- fieldLength: 10,
value: '',
min: null,
max: null,
diff --git a/borgbutler-webapp/src/components/general/forms/FormSelect.jsx b/borgbutler-webapp/src/components/general/forms/FormSelect.jsx
index 6b0bd21..906fcae 100644
--- a/borgbutler-webapp/src/components/general/forms/FormSelect.jsx
+++ b/borgbutler-webapp/src/components/general/forms/FormSelect.jsx
@@ -12,11 +12,15 @@
{props.hint}
</UncontrolledTooltip>;
}
- const {className, hint, hintPlacement, id, ...other} = props;
+ const {fieldLength, className, hint, hintPlacement, id, ...other} = props;
+ let myClassName = className;
+ if (fieldLength > 0) {
+ myClassName = classNames(`col-sm-${props.fieldLength}`, className);
+ }
return (
<React.Fragment>
<select id={targetId}
- className={classNames('custom-select form-control form-control-sm mr-1', className)}
+ className={classNames('custom-select form-control form-control-sm mr-1', myClassName)}
{...other}
>
{props.children}
@@ -31,6 +35,7 @@
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool]),
name: PropTypes.string,
onChange: PropTypes.func,
+ fieldLength: PropTypes.number,
hint: PropTypes.string,
hintPlacement: PropTypes.oneOf(['right', 'top']),
children: PropTypes.node,
--
Gitblit v1.10.0