@inseefr/lunatic 0.4.10-v2 → 0.4.13-v2

package/lib/components/checkbox/checkbox-group/checkbox-group.js

@@ -11,6 +11,8 @@ var _commons = require("../../commons");
 
 var _commons2 = require("../commons");
 
+require("./checkbox.scss");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function onClick() {}
@@ -70,10 +72,7 @@ function CheckboxGroup(_ref3) {
         var labelId = "lunatic-checkbox-label-".concat(id, "-").concat(name);
         return /*#__PURE__*/_react["default"].createElement(CheckboxGroupContainer, {
           key: checkboxId
-        }, /*#__PURE__*/_react["default"].createElement(_commons.Label, {
-          id: labelId,
-          htmlFor: checkboxId
-        }, label), /*#__PURE__*/_react["default"].createElement(CheckBoxOptionWrapper, {
+        }, /*#__PURE__*/_react["default"].createElement(CheckBoxOptionWrapper, {
           checkboxId: checkboxId,
           labelId: labelId,
           checked: optionValue,
@@ -81,7 +80,10 @@ function CheckboxGroup(_ref3) {
           onKeyDown: onClick,
           response: response,
           handleChange: handleChange
-        }));
+        }), /*#__PURE__*/_react["default"].createElement(_commons.Label, {
+          id: labelId,
+          htmlFor: checkboxId
+        }, label));
       }
     }
 

package/lib/components/checkbox/checkbox-group/checkbox.scss

@@ -0,0 +1,3 @@
+.lunatic-checkbox-group-option {
+	display: flex;
+}

package/lib/components/commons/icons/lunatic-icon.scss

@@ -1,4 +1,4 @@
 .lunatic-icon {
 	display: flex;
-	justify-content: center;
+	// justify-content: center;
 }

package/lib/components/index.scss

@@ -61,7 +61,7 @@
 		padding: 0;
 		font-size: 0.75rem;
 		font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif;
-		line-height: 0.75rem;
+		// line-height: 0.75rem;
 		font-weight: bold;
 		margin-bottom: 0.375rem;
 	}
@@ -121,13 +121,11 @@
 		display: inline;
 	}
 
-
 	.field {
 		width: 100%;
 		position: relative;
 	}
 
-
 	.link-md .field-md {
 		border-bottom: dashed 0.1em var(--color-primary-dark);
 		&:hover {

package/lib/components/input/input.scss

@@ -1,7 +1,8 @@
 .lunatic-component {
 	.lunatic-input,
 	.lunatic-datepicker,
-	.lunatic-textarea {
+	.lunatic-textarea,
+	.lunatic-input-number {
 		font: inherit;
 		border: 0;
 		border-bottom: 0.125rem double rgba(0, 0, 0, 0.42);

package/lib/components/input-number/input-number.js

@@ -29,14 +29,17 @@ function InputNumber(_ref) {
       labelId = _ref.labelId,
       min = _ref.min,
       max = _ref.max,
-      step = _ref.step;
-  var valueEffective = value !== null && value !== void 0 ? value : '';
+      step = _ref.step,
+      unit = _ref.unit;
+  var valueEffective = value !== null && value !== void 0 ? value : NaN;
   var handleChange = (0, _react.useCallback)(function (e) {
     var val = e.target.valueAsNumber;
     onChange(val);
   }, [onChange]);
-  return /*#__PURE__*/_react["default"].createElement("input", {
-    className: (0, _classnames["default"])('lunatic-input', {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "lunatic-input-number-container"
+  }, /*#__PURE__*/_react["default"].createElement("input", {
+    className: (0, _classnames["default"])('lunatic-input-number', {
       disabled: disabled,
       readOnly: readOnly
     }),
@@ -49,7 +52,7 @@ function InputNumber(_ref) {
     min: min,
     max: max,
     step: step
-  });
+  }), unit && /*#__PURE__*/_react["default"].createElement("span", null, unit));
 }
 
 var _default = (0, _commons.createCustomizableLunaticField)(InputNumber);

package/lib/components/input-number/input-number.scss

@@ -0,0 +1,7 @@
+// see input.scss
+
+.lunatic-component {
+	.lunatic-input-number {
+		display: inline-block;
+	}
+}

package/lib/components/loop/block-for-loop/block-for-loop.js

@@ -71,16 +71,22 @@ function BlockForLoop(_ref) {
       custom = _ref.custom,
       paginatedLoop = _ref.paginatedLoop,
       errors = _ref.errors;
+  var min = lines === null || lines === void 0 ? void 0 : lines.min;
+  var max = lines === null || lines === void 0 ? void 0 : lines.max;
 
   var _useState = (0, _react.useState)(function () {
-    return Number.parseInt(iterations) ? iterations : (0, _getInitLength["default"])(valueMap);
+    if (iterations) {
+      //This should be an Integer
+      return Number.parseInt(iterations);
+    }
+
+    var initLength = (0, _getInitLength["default"])(valueMap);
+    return Math.max(initLength, min);
   }),
       _useState2 = _slicedToArray(_useState, 2),
       nbRows = _useState2[0],
       setNbRows = _useState2[1];
 
-  var min = lines === null || lines === void 0 ? void 0 : lines.min;
-  var max = lines === null || lines === void 0 ? void 0 : lines.max;
   var addRow = (0, _react.useCallback)(function () {
     if (nbRows < max) {
       setNbRows(nbRows + 1);

package/lib/components/radio/radio-group.js

@@ -29,10 +29,7 @@ function Radio(_ref) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       key: radioId,
       className: "lunatic-radio-group-option"
-    }, /*#__PURE__*/_react["default"].createElement(_commons.Label, {
-      id: labelId,
-      htmlFor: radioId
-    }, label), /*#__PURE__*/_react["default"].createElement(_radioOption["default"], {
+    }, /*#__PURE__*/_react["default"].createElement(_radioOption["default"], {
       id: radioId,
       labelledBy: labelId,
       index: index,
@@ -41,7 +38,10 @@ function Radio(_ref) {
       value: valueOption,
       onKeyDown: onKeyDown,
       checkboxStyle: checkboxStyle
-    }));
+    }), /*#__PURE__*/_react["default"].createElement(_commons.Label, {
+      id: labelId,
+      htmlFor: radioId
+    }, label));
   });
 }
 

package/lib/components/radio/radio.scss

@@ -57,3 +57,7 @@
 	// 	margin-top: 0.325em;
 	// }
 }
+
+.lunatic-radio-group-option {
+	display: flex;
+}

package/lib/stories/input-number/input-number.stories.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Default = void 0;
+exports["default"] = exports.UnitEuros = exports.Default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -13,6 +13,8 @@ var _source = _interopRequireDefault(require("./source"));
 
 var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
 
+var _sourceEuros = _interopRequireDefault(require("./source-euros"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var stories = {
@@ -32,4 +34,10 @@ exports.Default = Default;
 Default.args = {
   id: 'input-number',
   source: _source["default"]
+};
+var UnitEuros = Template.bind({});
+exports.UnitEuros = UnitEuros;
+UnitEuros.args = {
+  id: 'input-number-euro',
+  source: _sourceEuros["default"]
 };

package/lib/stories/input-number/source-euros.json

@@ -0,0 +1,38 @@
+{
+	"components": [
+		{
+			"id": "kze792d8",
+			"componentType": "InputNumber",
+			"mandatory": false,
+			"page": "2",
+			"min": 0,
+			"max": 10,
+			"decimals": 0,
+			"unit":"€",
+			"label": { "value": "\"➡ 1. \" || \"NB \"", "type": "VTL|MD" },
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"hierarchy": {
+				"sequence": {
+					"id": "ksyjs7vy",
+					"page": "1",
+					"label": { "value": "S0", "type": "VTL|MD" }
+				}
+			},
+			"bindingDependencies": ["NB"],
+			"response": { "name": "NB" }
+		}
+	],
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"name": "NB",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": null,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTED": null
+			}
+		}
+	]
+}