@inseefr/lunatic 0.4.23-v2 → 0.4.24-v2

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

@@ -18,14 +18,16 @@ function CheckboxBoolean(_ref) {
       id = _ref.id,
       disabled = _ref.disabled,
       onClick = _ref.onClick,
-      labelId = _ref.labelId;
+      labelId = _ref.labelId,
+      label = _ref.label;
   return /*#__PURE__*/_react["default"].createElement(_commons.CheckboxOption, {
     disabled: disabled,
     checked: checked,
     id: id,
     onClick: onClick,
     labelledBy: labelId,
-    value: checked
+    value: checked,
+    label: label
   });
 }
 

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

@@ -24,7 +24,8 @@ function CheckBoxOptionWrapper(_ref) {
       value = _ref.value,
       onKeyDown = _ref.onKeyDown,
       handleChange = _ref.handleChange,
-      response = _ref.response;
+      response = _ref.response,
+      label = _ref.label;
   var booleanValue = value || false;
   var onClickOption = (0, _commons.useOnHandleChange)({
     handleChange: handleChange,
@@ -43,7 +44,8 @@ function CheckBoxOptionWrapper(_ref) {
     checked: checked,
     onClick: onClickOption,
     value: booleanValue,
-    onKeyDown: onKeyDown
+    onKeyDown: onKeyDown,
+    label: label
   });
 }
 
@@ -79,11 +81,9 @@ function CheckboxGroup(_ref3) {
           value: optionValue,
           onKeyDown: onClick,
           response: response,
-          handleChange: handleChange
-        }), /*#__PURE__*/_react["default"].createElement(_commons.Label, {
-          id: labelId,
-          htmlFor: checkboxId
-        }, label));
+          handleChange: handleChange,
+          label: label
+        }));
       }
     }
 

package/lib/components/checkbox/commons/checkbox-option.js

@@ -13,6 +13,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _icons = require("../../commons/icons");
 
+require("./checkbox-option.scss");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -26,7 +28,8 @@ function CheckboxOption(_ref) {
       _ref$value = _ref.value,
       value = _ref$value === void 0 ? false : _ref$value,
       onClick = _ref.onClick,
-      labelledBy = _ref.labelledBy;
+      labelledBy = _ref.labelledBy,
+      label = _ref.label;
   var onClickOption = (0, _react.useCallback)(function () {
     onClick(!value);
   }, [value, onClick]);
@@ -52,7 +55,10 @@ function CheckboxOption(_ref) {
     onClick: onClickOption,
     onKeyDown: handleKeyDown,
     "aria-labelledby": labelledBy
-  }, /*#__PURE__*/_react["default"].createElement(Icon, null)));
+  }, /*#__PURE__*/_react["default"].createElement(Icon, null), /*#__PURE__*/_react["default"].createElement("span", {
+    id: labelledBy,
+    htmlFor: id
+  }, label)));
 }
 
 var _default = CheckboxOption;

package/lib/components/checkbox/commons/checkbox-option.scss

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

package/lib/components/commons/components/combo-box/selection/label-selection.js

@@ -27,7 +27,7 @@ function LabelSelection(_ref) {
       disabled: disabled
     }),
     "aria-labelledby": labelledBy
-  }, console.log('options', options), console.log('option', option), /*#__PURE__*/_react["default"].createElement(Renderer, {
+  }, /*#__PURE__*/_react["default"].createElement(Renderer, {
     option: option,
     placeholder: placeholder,
     search: search

package/lib/components/modal-controls/modal-controls.scss

@@ -1,6 +1,5 @@
 .lunatic-modal-controls {
 	position: fixed;
-
 	top: 0;
 	left: 0;
 	width: 100%;
@@ -9,29 +8,13 @@
 
 	.modal {
 		background-color: snow;
-		height: 200px;
-		width: 60%;
+		height: 25%;
+		width: 50%;
 		margin: auto;
 		margin-top: 20%;
 		position: relative;
 		border-radius: 8px;
-
-		.title {
-			height: 32px;
-			background-color: darkslateblue;
-			color: black;
-			font-size: 18px;
-			font-weight: bolder;
-			line-height: 32px;
-			padding: 0 12px;
-			font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif;
-			border-radius: 8px 8px 0 0;
-		}
-
 		.body {
-			// padding: 0 12px 0 12px;
-			padding: 12px 0 0 12px;
-			height: 60%;
 			color: black;
 			font-size: 16px;
 			font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif;
@@ -41,9 +24,9 @@
 			position: absolute;
 			bottom: 0;
 			right: 0;
-			margin: 0 12px 12px 0;
+			margin: 0 0.2em 0.2em 0;
 			:first-child {
-				margin-right: 10px;
+				margin-right: 0.3em;
 			}
 		}
 	}
@@ -53,16 +36,11 @@
 		li,
 		div,
 		span {
-			margin: 0;
-			padding: 0;
 			border: none;
 			list-style: none;
 		}
-
-		.warn {
-		}
-
-		.info {
-		}
+	}
+	ul {
+		padding: 0.5em;
 	}
 }

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

@@ -37,11 +37,9 @@ function Radio(_ref) {
       onClick: onClick,
       value: valueOption,
       onKeyDown: onKeyDown,
-      checkboxStyle: checkboxStyle
-    }), /*#__PURE__*/_react["default"].createElement(_commons.Label, {
-      id: labelId,
-      htmlFor: radioId
-    }, label));
+      checkboxStyle: checkboxStyle,
+      label: label
+    }));
   });
 }
 

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

@@ -44,7 +44,8 @@ function RadioOption(_ref) {
       onKeyDown = _ref.onKeyDown,
       index = _ref.index,
       labelledBy = _ref.labelledBy,
-      checkboxStyle = _ref.checkboxStyle;
+      checkboxStyle = _ref.checkboxStyle,
+      label = _ref.label;
   var spanEl = (0, _react.useRef)();
   var Icon = getIcon(checked, checkboxStyle);
   var tabIndex = checked ? '0' : '-1';
@@ -83,7 +84,10 @@ function RadioOption(_ref) {
     onKeyDown: handleKeyDown,
     "aria-labelledby": labelledBy,
     ref: spanEl
-  }, /*#__PURE__*/_react["default"].createElement(Icon, null)));
+  }, /*#__PURE__*/_react["default"].createElement(Icon, null), /*#__PURE__*/_react["default"].createElement("span", {
+    id: labelledBy,
+    htmlFor: id
+  }, label)));
 }
 
 var _default = RadioOption;

package/lib/components/radio/radio.scss

@@ -58,7 +58,10 @@
 	// }
 }
 
-.lunatic-radio-group-option {
+// .lunatic-radio-group-option {
+// 	display: flex;
+// 	align-items: center;
+// }
+.lunatic-input-radio {
 	display: flex;
-	align-items: center;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "0.4.23-v2",
+	"version": "0.4.24-v2",
 	"workersVersion": "0.2.4-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {

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

@@ -1,57 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _icons = require("../../commons/icons");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function CheckboxOption(_ref) {
-  var disabled = _ref.disabled,
-      checked = _ref.checked,
-      id = _ref.id,
-      value = _ref.value,
-      onClick = _ref.onClick,
-      labelledBy = _ref.labelledBy;
-  var onClickOption = (0, _react.useCallback)(function () {
-    onClick(value);
-  }, [value, onClick]);
-  var handleKeyDown = (0, _react.useCallback)(function (e) {
-    var key = e.key;
-
-    if (key === 'Space') {// TODO
-    }
-  }, []);
-  var Icon = checked ? _icons.CheckboxChecked : _icons.CheckboxUnchecked;
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])('checkbox-modality', 'checkbox-modality-block', {
-      checked: checked,
-      disabled: disabled
-    })
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    id: id,
-    role: "checkbox",
-    className: "lunatic-input-checkbox",
-    "aria-checked": checked,
-    tabIndex: "0",
-    onClick: onClickOption,
-    onKeyDown: handleKeyDown,
-    "aria-labelledby": labelledBy
-  }, /*#__PURE__*/_react["default"].createElement(Icon, null)));
-}
-
-var _default = CheckboxOption;
-exports["default"] = _default;

package/lib/components/checkbox/checkbox.scss

@@ -1 +0,0 @@
-.lunatic-checkbox-boolean{}