@inseefr/lunatic 0.3.18-v2 → 0.4.0-v2

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

@@ -38,6 +38,7 @@ function LunaticComponent(props) {
 
   var content = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsBeforeText, {
     declarations: declarations,
+    id: id,
     custom: custom
   }), /*#__PURE__*/_react["default"].createElement(_label["default"], {
     id: labelId,
@@ -46,6 +47,7 @@ function LunaticComponent(props) {
     custom: custom
   }, (0, _safetyLabel["default"])(label, id)), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsAfterText, {
     declarations: declarations,
+    id: id,
     custom: custom
   }), /*#__PURE__*/_react["default"].createElement(_fieldContainer["default"], {
     value: value,
@@ -54,6 +56,7 @@ function LunaticComponent(props) {
     preferences: preferences
   }, children), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsDetachable, {
     declarations: declarations,
+    id: id,
     custom: custom
   }), missing && missingResponse && /*#__PURE__*/_react["default"].createElement(_missing["default"], props));
 

package/lib/components/commons/components/lunatic-fieldset-component.js

@@ -33,6 +33,7 @@ function LunaticFieldsetComponent(props) {
 
   var content = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsBeforeText, {
     declarations: declarations,
+    id: id,
     custom: custom
   }), /*#__PURE__*/_react["default"].createElement(_fieldContainer["default"], {
     value: value,
@@ -44,9 +45,11 @@ function LunaticFieldsetComponent(props) {
     custom: custom
   }, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsAfterText, {
     declarations: declarations,
+    id: id,
     custom: custom
   }), children)), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsDetachable, {
     declarations: declarations,
+    id: id,
     custom: custom
   }), missing && missingResponse && /*#__PURE__*/_react["default"].createElement(_missing["default"], props));
 

package/lib/components/commons/components/orchestrated-component.js

@@ -44,9 +44,10 @@ function OrchestratedComponent(_ref) {
     }
   });
   var Component = lunatic[componentType];
-  var isFiltered = componentFilled === null || componentFilled === void 0 ? void 0 : componentFilled.conditionFilter;
+  var conditionFilter = componentFilled.conditionFilter;
+  var hasToBeDisplay = conditionFilter !== undefined ? conditionFilter : true;
 
-  if (componentType in lunatic && isFiltered) {
+  if (componentType in lunatic && hasToBeDisplay) {
     return /*#__PURE__*/_react["default"].createElement(Component, _extends({}, componentFilled, {
       id: id,
       handleChange: handleChange,

package/lib/components/declarations/declarations.js

@@ -33,7 +33,7 @@ function Declarations(_ref) {
   if (filtered.length === 0) return null;
   return /*#__PURE__*/_react["default"].createElement("div", {
     id: "declarations-".concat(id, "-").concat(type),
-    className: "lunatic-declarations"
+    className: "declarations-lunatic"
   }, filtered.map(function (_ref3) {
     var idD = _ref3.id,
         label = _ref3.label,

package/lib/components/dropdown/dropdown-simple/simple-label-renderer.js

@@ -15,7 +15,7 @@ function getContent(option, search) {
   if (option) {
     var value = option.value,
         label = option.label;
-    return label ? "".concat(value, " - ").concat(label) : value;
+    return label || value;
   }
 
   if (search && search.trim().length) {

package/lib/components/dropdown/dropdown-simple/simple-option-renderer.js

@@ -35,7 +35,7 @@ function SimpleOptionRenderer(_ref) {
     })
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "id"
-  }, value));
+  }, label));
 }
 
 var _default = SimpleOptionRenderer;

package/lib/components/filter-description/component.js

@@ -11,13 +11,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 var FilterDescription = function FilterDescription(_ref) {
   var id = _ref.id,
-      label = _ref.label,
-      filterDescription = _ref.filterDescription;
-  return filterDescription ? /*#__PURE__*/_react["default"].createElement("div", {
+      label = _ref.label;
+  return /*#__PURE__*/_react["default"].createElement("div", {
     id: "filter-description-".concat(id),
     "aria-label": "filter-description",
     className: "filter-description-lunatic"
-  }, label) : null;
+  }, label);
 };
 
 var _default = FilterDescription;

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

@@ -39,6 +39,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function BlockForLoop(_ref) {
   var declarations = _ref.declarations,
+      id = _ref.id,
       lines = _ref.lines,
       components = _ref.components,
       handleChange = _ref.handleChange,
@@ -50,7 +51,8 @@ function BlockForLoop(_ref) {
       management = _ref.management,
       executeExpression = _ref.executeExpression,
       iterations = _ref.iterations,
-      custom = _ref.custom;
+      custom = _ref.custom,
+      paginatedLoop = _ref.paginatedLoop;
 
   var _useState = (0, _react.useState)(-1),
       _useState2 = _slicedToArray(_useState, 2),
@@ -86,18 +88,27 @@ function BlockForLoop(_ref) {
     }
   }, [min, max, iterations]);
   var handleChangeLoop = (0, _react.useCallback)(function (response, value, args) {
-    handleChange(response, value, _objectSpread(_objectSpread({}, args), {}, {
+    if (!paginatedLoop) {
+      var v = valueMap[response.name];
+      v[args.index] = value;
+      handleChange(response, v, {
+        loop: true,
+        length: nbRows
+      });
+    } else handleChange(response, value, _objectSpread(_objectSpread({}, args), {}, {
       loop: true,
       length: nbRows
     }));
-  }, [handleChange, nbRows]);
+  }, [handleChange, nbRows, paginatedLoop, valueMap]);
 
   if (nbRows > 0) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsBeforeText, {
       declarations: declarations,
+      id: id,
       custom: custom
     }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsAfterText, {
       declarations: declarations,
+      id: id,
       custom: custom
     }), /*#__PURE__*/_react["default"].createElement(_blockForLoopOchestrator["default"], {
       components: components,
@@ -113,6 +124,7 @@ function BlockForLoop(_ref) {
       custom: custom
     }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsDetachable, {
       declarations: declarations,
+      id: id,
       custom: custom
     }));
   }

package/lib/components/loop/loop.js

@@ -36,7 +36,8 @@ function Loop(props) {
       missing = props.missing,
       features = props.features,
       preferences = props.preferences,
-      custom = props.custom;
+      custom = props.custom,
+      paginatedLoop = props.paginatedLoop;
 
   switch (componentType) {
     case LoopTypes.blockForLoop:
@@ -56,7 +57,8 @@ function Loop(props) {
         shortcut: shortcut,
         features: features,
         preferences: preferences,
-        custom: custom
+        custom: custom,
+        paginatedLoop: paginatedLoop
       });
 
     case LoopTypes.rosterForLoop:

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

@@ -15,12 +15,8 @@ var _rosterTable = _interopRequireDefault(require("./roster-table"));
 
 var _handleRowButton = _interopRequireDefault(require("./handle-row-button"));
 
-var _useOnHandleChange = _interopRequireDefault(require("../../commons/use-on-handle-change"));
-
 var _i18n = _interopRequireDefault(require("../../../i18n"));
 
-var _excluded = ["valueMap", "loopDependencies", "lines", "handleChange", "declarations", "label", "components", "executeExpression", "headers", "missing", "shortcut", "id", "management", "custom"];
-
 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); }
@@ -47,10 +43,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 var DEFAULT_MAX_ROWS = 12;
 
 function getTableLength(value) {
@@ -65,7 +57,6 @@ function getTableLength(value) {
 
 function RosterforLoop(_ref) {
   var valueMap = _ref.valueMap,
-      loopDependencies = _ref.loopDependencies,
       lines = _ref.lines,
       handleChange = _ref.handleChange,
       declarations = _ref.declarations,
@@ -77,9 +68,7 @@ function RosterforLoop(_ref) {
       shortcut = _ref.shortcut,
       id = _ref.id,
       management = _ref.management,
-      custom = _ref.custom,
-      props = _objectWithoutProperties(_ref, _excluded);
-
+      custom = _ref.custom;
   var max = (lines === null || lines === void 0 ? void 0 : lines.max) || DEFAULT_MAX_ROWS;
 
   var _useState = (0, _react.useState)(false),
@@ -126,9 +115,11 @@ function RosterforLoop(_ref) {
   if (nbRows > 0) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsBeforeText, {
       declarations: declarations,
+      id: id,
       custom: custom
     }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsAfterText, {
       declarations: declarations,
+      id: id,
       custom: custom
     }), /*#__PURE__*/_react["default"].createElement(_rosterTable["default"], {
       id: id,
@@ -144,6 +135,7 @@ function RosterforLoop(_ref) {
       custom: custom
     }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsDetachable, {
       declarations: declarations,
+      id: id,
       custom: custom
     }), /*#__PURE__*/_react["default"].createElement(_handleRowButton["default"], {
       onClick: addRow,

package/lib/components/pairwise/links/pairwise-links.js

@@ -40,9 +40,11 @@ var PairwiseLinks = function PairwiseLinks(_ref) {
   }, [handleChange]);
   if (nbRows > 0) return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsBeforeText, {
     declarations: declarations,
+    id: id,
     custom: custom
   }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsAfterText, {
     declarations: declarations,
+    id: id,
     custom: custom
   }), /*#__PURE__*/_react["default"].createElement(_linksOrchestrator["default"], {
     id: id,
@@ -60,6 +62,7 @@ var PairwiseLinks = function PairwiseLinks(_ref) {
     xAxisIterations: xAxisIterations
   }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsDetachable, {
     declarations: declarations,
+    id: id,
     custom: custom
   }));
   return null;

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

@@ -49,8 +49,9 @@ function RadioOption(_ref) {
   var Icon = getIcon(checked, checkboxStyle);
   var tabIndex = checked ? '0' : '-1';
   var onClickOption = (0, _react.useCallback)(function () {
-    onClick(value);
-  }, [value, onClick]);
+    // on checkboxStyle, clicking on checked value unchecks it, so it acts as if empty answer was clicked
+    checkboxStyle && checked ? onClick(null) : onClick(value);
+  }, [value, onClick, checked, checkboxStyle]);
   var handleKeyDown = (0, _react.useCallback)(function (e) {
     var key = e.key;
     var current = spanEl.current;

package/lib/components/sequence/sequence.js

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _declarations = require("../declarations");
 
-var _commons = require("../commons");
-
 require("./sequence.scss");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -21,15 +19,18 @@ function Sequence(_ref) {
       id = _ref.id,
       style = _ref.style;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsBeforeText, {
-    declarations: declarations
-  }), /*#__PURE__*/_react["default"].createElement(_commons.Label, {
+    declarations: declarations,
+    id: id
+  }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "sequence-lunatic",
     id: "sequence-".concat(id),
     style: style
-  }, (0, _commons.safetyLabel)(label, id)), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsAfterText, {
-    declarations: declarations
+  }, label), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsAfterText, {
+    declarations: declarations,
+    id: id
   }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsDetachable, {
-    declarations: declarations
+    declarations: declarations,
+    id: id
   }));
 }
 

package/lib/components/subsequence/subsequence.js

@@ -16,15 +16,18 @@ function Subsequence(_ref) {
       declarations = _ref.declarations,
       label = _ref.label;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsBeforeText, {
-    declarations: declarations
+    declarations: declarations,
+    id: id
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    "aria-label": "sequence-".concat(id),
-    className: "sequence-lunatic",
-    id: "sequence-".concat(id)
+    "aria-label": "subsequence-".concat(id),
+    className: "subsequence-lunatic",
+    id: "subsequence-".concat(id)
   }, label), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsAfterText, {
-    declarations: declarations
+    declarations: declarations,
+    id: id
   }), /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsDetachable, {
-    declarations: declarations
+    declarations: declarations,
+    id: id
   }));
 }