@inseefr/lunatic 2.4.0 → 2.4.1

package/lib/components/commons/components/lunatic-component-with-label.js

@@ -0,0 +1,88 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _declarations = require("../../declarations");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = _interopRequireWildcard(require("react"));
+var commonPropTypes = _interopRequireWildcard(require("../../commons/prop-types"));
+var _fieldContainer = _interopRequireDefault(require("./field-container"));
+var _label = _interopRequireDefault(require("./label"));
+var _missing = _interopRequireDefault(require("./missing"));
+var _variableStatus = _interopRequireDefault(require("./variable-status"));
+var _jsxRuntime = require("react/jsx-runtime");
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+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); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+/**
+ * This functions returns declartions with "after" position if exist, else return description
+ * @param {declarations, description}
+ * @returns
+ */
+function getDescription(_ref) {
+  var declarations = _ref.declarations,
+    description = _ref.description;
+  if (Array.isArray(declarations)) {
+    var found = declarations.filter(function (v) {
+      return v.position === _declarations.DECLARATION_POSITIONS.after;
+    });
+    if (found.length) {
+      return found;
+    }
+  }
+  return description;
+}
+function LunaticComponentWithLabel(props) {
+  var id = props.id,
+    preferences = props.preferences,
+    label = props.label,
+    declarations = props.declarations,
+    value = props.value,
+    children = props.children,
+    management = props.management,
+    description = props.description;
+  var labelId = "label-".concat(id);
+  var Wrapper = management ? _variableStatus["default"] : _react.Fragment;
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Wrapper, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsBeforeText, {
+      declarations: declarations,
+      id: id
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_fieldContainer["default"], {
+      value: value,
+      id: id,
+      preferences: preferences,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_label["default"], {
+        htmlFor: id,
+        id: labelId,
+        description: getDescription({
+          declarations: declarations,
+          description: description
+        }),
+        children: label
+      }), children]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsDetachable, {
+      declarations: declarations,
+      id: id
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_missing["default"], _objectSpread({}, props))]
+  });
+}
+LunaticComponentWithLabel.propTypes = {
+  id: _propTypes["default"].string.isRequired,
+  preferences: _propTypes["default"].arrayOf(commonPropTypes.valueTypePropTypes),
+  label: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].element]),
+  declarations: commonPropTypes.declarationsPropTypes,
+  value: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number, _propTypes["default"].bool]),
+  children: _propTypes["default"].element,
+  management: _propTypes["default"].bool,
+  description: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].element, _propTypes["default"].array])
+};
+var _default = LunaticComponentWithLabel;
+exports["default"] = _default;

package/lib/components/commons/components/missing/missing.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.MissingPure = void 0;
 require("./missing.scss");
-var _constants = require("../../../../utils/constants");
 var _react = _interopRequireWildcard(require("react"));
-var _button = _interopRequireDefault(require("../../../button"));
+var _constants = require("../../../../utils/constants");
 var _reactKeyboardEventHandler = _interopRequireDefault(require("react-keyboard-event-handler"));
 var _lunaticContext = require("../../../../use-lunatic/lunatic-context");
+var _button = _interopRequireDefault(require("../../../button"));
 var _useOnHandleChange = _interopRequireDefault(require("../../use-on-handle-change"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -72,7 +72,7 @@ var MissingPure = function MissingPure(props) {
       })
     }), shortcut && missingShortcut && missingShortcut.dontKnow && missingShortcut.refused && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactKeyboardEventHandler["default"], {
       handleKeys: Object.values(missingShortcut),
-      handleEventType: "keypress",
+      handleEventType: "keydown",
       onKeyEvent: function onKeyEvent(key, e) {
         e.preventDefault();
         if (key === missingShortcut.dontKnow) onClickDK();

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

@@ -25,7 +25,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function Error(_ref) {
+function ErrorItem(_ref) {
   var criticality = _ref.criticality,
     errorMessage = _ref.errorMessage;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
@@ -36,7 +36,7 @@ function Error(_ref) {
 function ComponentErrors(_ref2) {
   var errors = _ref2.errors;
   var content = errors.map(function (error, index) {
-    return /*#__PURE__*/(0, _react.createElement)(Error, _objectSpread(_objectSpread({}, error), {}, {
+    return /*#__PURE__*/(0, _react.createElement)(ErrorItem, _objectSpread(_objectSpread({}, error), {}, {
       key: index
     }));
   }, []);

package/lib/components/table/lunatic-table.js

@@ -5,16 +5,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = _interopRequireWildcard(require("react"));
+var _commons = require("../commons");
 var _htmlTable = require("../commons/components/html-table");
+var _lunaticComponentWithLabel = _interopRequireDefault(require("../commons/components/lunatic-component-with-label"));
 var _header = _interopRequireDefault(require("./header"));
-var _lunaticComponentWithoutLabel = _interopRequireDefault(require("../commons/components/lunatic-component-without-label"));
 var _tableOrchestrator = _interopRequireDefault(require("./table-orchestrator"));
 var _jsxRuntime = require("react/jsx-runtime");
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -35,7 +36,8 @@ function LunaticTable(props) {
     declarations = props.declarations,
     missingResponse = props.missingResponse,
     management = props.management,
-    description = props.description;
+    description = props.description,
+    label = props.label;
   var _useState = (0, _react.useState)(undefined),
     _useState2 = _slicedToArray(_useState, 2),
     nbRows = _useState2[0],
@@ -46,9 +48,10 @@ function LunaticTable(props) {
       setNbRows(length);
     }
   }, [body]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_lunaticComponentWithoutLabel["default"], {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_lunaticComponentWithLabel["default"], {
     id: id,
     preferences: preferences,
+    label: label,
     declarations: declarations,
     value: value,
     missing: missing,
@@ -56,7 +59,7 @@ function LunaticTable(props) {
     management: management,
     description: description,
     handleChange: handleChange,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_htmlTable.Table, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_htmlTable.Table, {
       id: id,
       header: header,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_header["default"], {
@@ -70,11 +73,13 @@ function LunaticTable(props) {
           handleChange: handleChange,
           iteration: iteration,
           nbRows: nbRows,
-          valueMap: value,
-          errors: errors
+          valueMap: value
         })
       })]
-    })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.Errors, {
+      errors: errors,
+      activeId: id
+    })]
   });
 }
 LunaticTable.propTypes = {

package/lib/components/table/table-orchestrator.js

@@ -20,7 +20,6 @@ function TableOrchestrator(_ref) {
     preferences = _ref.preferences,
     management = _ref.management,
     missing = _ref.missing,
-    errors = _ref.errors,
     paths = _ref.paths;
   if (Array.isArray(body)) {
     return body.map(function (components, index) {
@@ -39,8 +38,7 @@ function TableOrchestrator(_ref) {
         preferences: preferences,
         management: management
         /* */,
-        missing: missing,
-        errors: errors
+        missing: missing
       }, index);
     });
   }

package/lib/stories/utils/orchestrator.js

@@ -198,8 +198,8 @@ function OrchestratorForStories(_ref3) {
     var _compileControls = compileControls(),
       currentErrors = _compileControls.currentErrors,
       isCritical = _compileControls.isCritical;
+    setErrorActive(_objectSpread(_objectSpread({}, errorActive), {}, _defineProperty({}, pageTag, currentErrors || {})));
     if (currentErrors && Object.keys(currentErrors).length > 0) {
-      setErrorActive(_objectSpread(_objectSpread({}, errorActive), {}, _defineProperty({}, pageTag, currentErrors)));
       setErrorsForModal({
         currentErrors: currentErrors,
         isCritical: isCritical

package/lib/use-lunatic/reducer/validate-controls/validation-utils.js

@@ -30,8 +30,7 @@ function resolveControl(state, control) {
       linksIterations: linksIterations
     });
     if (!result) {
-      var labelValue = errorMessage.value;
-      var label = executeExpression(labelValue, {
+      var label = executeExpression(errorMessage, {
         iteration: iteration,
         linksIterations: linksIterations
       });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.4.0",
+	"version": "2.4.1",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {