@inseefr/lunatic 3.0.0-rc.1 → 3.0.0-rc.6

package/lib/components/InputNumber/InputNumber.js

@@ -1,39 +1,54 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.InputNumber = void 0;
-var _function = require("../../utils/function");
+exports.CustomInputNumber = void 0;
+exports.InputNumber = InputNumber;
 var _InputNumberThousand = require("./InputNumberThousand");
 require("./InputNumber.scss");
 var _Label = require("../shared/Label/Label");
 var _ComponentErrors = require("../shared/ComponentErrors/ComponentErrors");
-var _customizedComponent = require("../shared/HOC/customizedComponent");
+var _slottableComponent = require("../shared/HOC/slottableComponent");
 var _Declarations = require("../shared/Declarations/Declarations");
 var _jsxRuntime = require("react/jsx-runtime");
-function LunaticInputNumber(_ref) {
-  var id = _ref.id,
-    _ref$value = _ref.value,
-    value = _ref$value === void 0 ? null : _ref$value,
-    _ref$handleChange = _ref.handleChange,
-    handleChange = _ref$handleChange === void 0 ? _function.voidFunction : _ref$handleChange,
-    _ref$disabled = _ref.disabled,
-    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-    _ref$readOnly = _ref.readOnly,
-    readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly,
-    _ref$max = _ref.max,
-    max = _ref$max === void 0 ? 1000000 : _ref$max,
-    _ref$decimals = _ref.decimals,
-    decimals = _ref$decimals === void 0 ? 0 : _ref$decimals,
-    unit = _ref.unit,
-    label = _ref.label,
-    errors = _ref.errors,
+var _excluded = ["handleChange", "response", "errors", "decimals"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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; }
+function InputNumber(_ref) {
+  var handleChange = _ref.handleChange,
     response = _ref.response,
-    _ref$required = _ref.required,
-    required = _ref$required === void 0 ? true : _ref$required,
-    description = _ref.description,
-    declarations = _ref.declarations;
+    errors = _ref.errors,
+    decimals = _ref.decimals,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(CustomInputNumber, _objectSpread(_objectSpread({}, props), {}, {
+    decimals: decimals !== null && decimals !== void 0 ? decimals : 0,
+    onChange: function onChange(v) {
+      return handleChange(response, v);
+    },
+    errors: (0, _ComponentErrors.getComponentErrors)(errors, props.id)
+  }));
+}
+var CustomInputNumber = exports.CustomInputNumber = (0, _slottableComponent.slottableComponent)('InputNumber', function (props) {
+  var id = props.id,
+    value = props.value,
+    onChange = props.onChange,
+    disabled = props.disabled,
+    readOnly = props.readOnly,
+    max = props.max,
+    decimals = props.decimals,
+    unit = props.unit,
+    label = props.label,
+    errors = props.errors,
+    required = props.required,
+    description = props.description,
+    declarations = props.declarations;
   var labelId = "label-".concat(id);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "lunatic-input-number",
@@ -49,12 +64,10 @@ function LunaticInputNumber(_ref) {
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_InputNumberThousand.InputNumberThousand, {
       id: id,
       value: value,
-      onChange: function onChange(v) {
-        return handleChange(response, v);
-      },
-      disabled: disabled,
-      readOnly: readOnly,
-      required: required,
+      onChange: onChange,
+      disabled: !!disabled,
+      readOnly: !!readOnly,
+      required: !!required,
       labelId: labelId,
       max: max,
       decimals: decimals,
@@ -62,9 +75,7 @@ function LunaticInputNumber(_ref) {
     }), unit && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       children: unit
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ComponentErrors.ComponentErrors, {
-      errors: errors,
-      componentId: id
+      errors: errors
     })]
   });
-}
-var InputNumber = exports.InputNumber = (0, _customizedComponent.customizedComponent)('InputNumber', LunaticInputNumber);
+});

package/lib/components/InputNumber/__snapshots__/InputNumber.spec.tsx.snap

@@ -12,7 +12,6 @@ exports[`InputNumber > renders without crashing 1`] = `
       id="number"
       inputmode="numeric"
       lang="en"
-      required=""
       type="text"
       value="10"
     />
@@ -33,7 +32,6 @@ exports[`InputNumber > should handle readOnly 1`] = `
       inputmode="numeric"
       lang="en"
       readonly=""
-      required=""
       type="text"
       value="123"
     />

package/lib/components/Loop/Loop.js

@@ -4,17 +4,20 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Loop = void 0;
+exports.CustomLoop = void 0;
+exports.Loop = Loop;
 var _react = require("react");
 var _i18n = _interopRequireDefault(require("../../i18n"));
 var _array = require("../../utils/array");
 var _LunaticComponents = require("../LunaticComponents");
 var _constant = require("./constant");
-var _customizedComponent = require("../shared/HOC/customizedComponent");
+var _slottableComponent = require("../shared/HOC/slottableComponent");
 var _Label = require("../shared/Label/Label");
 var _Declarations = require("../shared/Declarations/Declarations");
 var _Button = require("../shared/Button/Button");
+var _ComponentErrors = require("../shared/ComponentErrors/ComponentErrors");
 var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["lines", "iterations", "value", "handleChange", "getComponents", "errors"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -26,22 +29,23 @@ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructur
 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); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } /**
+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; }
+/**
  * Loop without specific markup (stack of subcomponents)
  */
-var Loop = exports.Loop = (0, _customizedComponent.customizedComponent)('BlockForLoop', function (props) {
+function Loop(_ref) {
   var _lines$min, _lines$max;
-  var declarations = props.declarations,
-    id = props.id,
-    label = props.label,
-    lines = props.lines,
-    handleChange = props.handleChange,
-    value = props.value,
-    iterations = props.iterations,
-    getComponents = props.getComponents;
+  var lines = _ref.lines,
+    iterations = _ref.iterations,
+    value = _ref.value,
+    handleChange = _ref.handleChange,
+    getComponents = _ref.getComponents,
+    errors = _ref.errors,
+    props = _objectWithoutProperties(_ref, _excluded);
   var min = (_lines$min = lines === null || lines === void 0 ? void 0 : lines.min) !== null && _lines$min !== void 0 ? _lines$min : 0;
   var max = (_lines$max = lines === null || lines === void 0 ? void 0 : lines.max) !== null && _lines$max !== void 0 ? _lines$max : Infinity;
-  var canControlRows = min !== max && Number.isFinite(max);
   var _useState = (0, _react.useState)(function () {
       return Math.max(iterations, min);
     }),
@@ -57,10 +61,10 @@ var Loop = exports.Loop = (0, _customizedComponent.customizedComponent)('BlockFo
     if (nbRows > 1) {
       var newNbRows = nbRows - 1;
       setNbRows(newNbRows);
-      Object.entries(value).forEach(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          k = _ref2[0],
-          v = _ref2[1];
+      Object.entries(value).forEach(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          k = _ref3[0],
+          v = _ref3[1];
         var newValue = v.filter(function (_, i) {
           return i < newNbRows;
         });
@@ -73,16 +77,12 @@ var Loop = exports.Loop = (0, _customizedComponent.customizedComponent)('BlockFo
   if (nbRows <= 0) {
     return null;
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Label.Label, {
-      htmlFor: id,
-      id: "label-".concat(id),
-      children: label
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Declarations.Declarations, {
-      type: "AFTER_QUESTION_TEXT",
-      declarations: declarations,
-      id: id
-    }), (0, _array.times)(nbRows, function (n) {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(CustomLoop, _objectSpread(_objectSpread({}, props), {}, {
+    errors: (0, _ComponentErrors.getComponentErrors)(errors, props.id),
+    addRow: nbRows === max ? undefined : addRow,
+    removeRow: nbRows === 1 ? undefined : removeRow,
+    canControlRows: min !== max && Number.isFinite(max),
+    children: (0, _array.times)(nbRows, function (n) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_LunaticComponents.LunaticComponents, {
         blocklist: _constant.blockedInLoopComponents,
         components: getComponents(n),
@@ -92,14 +92,37 @@ var Loop = exports.Loop = (0, _customizedComponent.customizedComponent)('BlockFo
           });
         }
       }, n);
+    })
+  }));
+}
+var CustomLoop = exports.CustomLoop = (0, _slottableComponent.slottableComponent)('Loop', function (props) {
+  var declarations = props.declarations,
+    id = props.id,
+    label = props.label,
+    canControlRows = props.canControlRows,
+    children = props.children,
+    errors = props.errors,
+    addRow = props.addRow,
+    removeRow = props.removeRow;
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Label.Label, {
+      htmlFor: id,
+      id: "label-".concat(id),
+      children: label
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Declarations.Declarations, {
+      type: "AFTER_QUESTION_TEXT",
+      declarations: declarations,
+      id: id
+    }), children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_ComponentErrors.ComponentErrors, {
+      errors: errors
     }), canControlRows && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.Button, {
         onClick: addRow,
-        disabled: nbRows === max,
+        disabled: !addRow,
         children: _i18n["default"].DEFAULT_BUTTON_ADD
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.Button, {
         onClick: removeRow,
-        disabled: nbRows === 1,
+        disabled: !removeRow,
         children: _i18n["default"].DEFAULT_BUTTON_REMOVE
       })]
     })]

package/lib/components/LunaticComponents.js

@@ -11,6 +11,7 @@ var _component = require("../use-lunatic/commons/component");
 var _ComponentWrapper = require("./shared/ComponentWrapper");
 var _library = require("./library");
 var _reactErrorBoundary = require("react-error-boundary");
+var _slottableComponent = require("./shared/HOC/slottableComponent");
 var _jsxRuntime = require("react/jsx-runtime");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -27,6 +28,7 @@ function LunaticComponents(_ref) {
     componentProps = _ref.componentProps,
     blocklist = _ref.blocklist,
     memo = _ref.memo,
+    slots = _ref.slots,
     _ref$wrapper = _ref.wrapper,
     wrapper = _ref$wrapper === void 0 ? function (_ref2) {
       var children = _ref2.children;
@@ -41,50 +43,53 @@ function LunaticComponents(_ref) {
   (0, _useAutoFocus.useAutoFocus)(wrapperRef, hasComponents ? autoFocusKey : undefined);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(WrapperComponent, {
     ref: WrapperComponent === _react.Fragment ? undefined : wrapperRef,
-    children: components.map(function (component, k) {
-      if ((0, _component.hasComponentType)(component)) {
-        if (blocklist && blocklist.includes(component.componentType)) {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_slottableComponent.SlotsProvider, {
+      slots: slots,
+      children: components.map(function (component, k) {
+        if ((0, _component.hasComponentType)(component)) {
+          if (blocklist && blocklist.includes(component.componentType)) {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, {
+              children: wrapper(_objectSpread({
+                children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+                  style: {
+                    color: 'red'
+                  },
+                  children: ["Component \"", component.componentType, "\" is not allowed here"]
+                }),
+                index: k
+              }, component))
+            }, computeId(component, k));
+          }
+          var _props = _objectSpread(_objectSpread({}, component), componentProps === null || componentProps === void 0 ? void 0 : componentProps(component));
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, {
             children: wrapper(_objectSpread({
-              children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-                style: {
-                  color: 'red'
-                },
-                children: ["Component \"", component.componentType, "\" is not allowed here"]
-              }),
+              children: memo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(LunaticComponentMemo, _objectSpread({}, _props)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(LunaticComponent, _objectSpread({}, _props)),
               index: k
-            }, component))
+            }, _props))
           }, computeId(component, k));
         }
-        var _props = _objectSpread(_objectSpread({}, component), componentProps === null || componentProps === void 0 ? void 0 : componentProps(component));
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, {
-          children: wrapper(_objectSpread({
-            children: memo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(LunaticComponentMemo, _objectSpread({}, _props)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(LunaticComponent, _objectSpread({}, _props)),
-            index: k
-          }, _props))
-        }, computeId(component, k));
-      }
 
-      // In some case (table for instance) we have static component that only have a label (no componentType)
-      if (hasLabel(component)) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, {
-          children: wrapper(_objectSpread(_objectSpread({}, component), {}, {
-            children: component.label,
-            index: k
-          }))
-        }, k);
-      }
+        // In some case (table for instance) we have static component that only have a label (no componentType)
+        if (hasLabel(component)) {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, {
+            children: wrapper(_objectSpread(_objectSpread({}, component), {}, {
+              children: component.label,
+              index: k
+            }))
+          }, k);
+        }
 
-      // Component is a ReactNode
-      if ( /*#__PURE__*/(0, _react.isValidElement)(component)) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, {
-          children: wrapper({
-            children: component,
-            index: k
-          })
-        }, k);
-      }
-      return null;
+        // Component is a ReactNode
+        if ( /*#__PURE__*/(0, _react.isValidElement)(component)) {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, {
+            children: wrapper({
+              children: component,
+              index: k
+            })
+          }, k);
+        }
+        return null;
+      })
     })
   });
 }

package/lib/components/Question/Question.js

@@ -1,22 +1,40 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Question = void 0;
+exports.Question = exports.CustomQuestion = void 0;
 var _LunaticComponents = require("../LunaticComponents");
-var _customizedComponent = require("../shared/HOC/customizedComponent");
+var _slottableComponent = require("../shared/HOC/slottableComponent");
 var _Declarations = require("../shared/Declarations/Declarations");
 var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["components"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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; }
 /**
  * Surround a question giving additional context with label / description / declarations
  */
-var Question = exports.Question = (0, _customizedComponent.customizedComponent)('Question', function (props) {
+var Question = exports.Question = function Question(_ref) {
+  var components = _ref.components,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(CustomQuestion, _objectSpread(_objectSpread({}, props), {}, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_LunaticComponents.LunaticComponents, {
+      components: components
+    })
+  }));
+};
+var CustomQuestion = exports.CustomQuestion = (0, _slottableComponent.slottableComponent)('Question', function (props) {
   var id = props.id,
     description = props.description,
     declarations = props.declarations,
     label = props.label,
-    components = props.components;
+    children = props.children;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("fieldset", {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("legend", {
       id: "question-legend-".concat(id),
@@ -31,15 +49,6 @@ var Question = exports.Question = (0, _customizedComponent.customizedComponent)(
       type: "AFTER_QUESTION_TEXT",
       declarations: declarations,
       id: id
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_LunaticComponents.LunaticComponents, {
-      components: components,
-      wrapper: function wrapper(_ref) {
-        var children = _ref.children;
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "question-components",
-          children: children
-        });
-      }
-    })]
+    }), children]
   });
 });

package/lib/components/Radio/Radio.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.Radio = void 0;
 var _ComponentErrors = require("../shared/ComponentErrors/ComponentErrors");
 var _RadioGroup = require("../shared/Radio/RadioGroup");
-var _customizedComponent = require("../shared/HOC/customizedComponent");
+var _slottableComponent = require("../shared/HOC/slottableComponent");
 var _jsxRuntime = require("react/jsx-runtime");
 function LunaticRadio(props) {
   var id = props.id,
@@ -38,4 +38,4 @@ function LunaticRadio(props) {
     readOnly: readOnly
   });
 }
-var Radio = exports.Radio = (0, _customizedComponent.customizedComponent)('LunaticRadio', LunaticRadio);
+var Radio = exports.Radio = (0, _slottableComponent.slottableComponent)('Radio', LunaticRadio);

package/lib/components/RosterForLoop/RosterForLoop.js

@@ -7,19 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.RosterForLoop = void 0;
 var _react = require("react");
 require("./RosterForLoop.scss");
-var _i18n = _interopRequireDefault(require("../../i18n"));
 var _Table = require("../shared/Table");
 var _array = require("../../utils/array");
 var _LunaticComponents = require("../LunaticComponents");
 var _constant = require("../Loop/constant");
 var _ComponentErrors = require("../shared/ComponentErrors/ComponentErrors");
-var _Declarations = require("../shared/Declarations/Declarations");
-var _customizedComponent = require("../shared/HOC/customizedComponent");
-var _Label = require("../shared/Label/Label");
-var _Button = require("../shared/Button/Button");
+var _Loop = require("../Loop/Loop");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["value", "lines", "handleChange", "declarations", "header", "iterations", "id", "getComponents", "label"];
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _excluded = ["value", "lines", "errors", "handleChange", "declarations", "header", "iterations", "id", "getComponents", "label"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -39,9 +34,10 @@ var DEFAULT_MAX_ROWS = 12;
 /**
  * Loop displayed as a table
  */
-var RosterForLoop = exports.RosterForLoop = (0, _customizedComponent.customizedComponent)('RosterforLoop', function (props) {
+var RosterForLoop = exports.RosterForLoop = function RosterForLoop(props) {
   var valueMap = props.value,
     lines = props.lines,
+    errors = props.errors,
     handleChange = props.handleChange,
     declarations = props.declarations,
     header = props.header,
@@ -56,7 +52,6 @@ var RosterForLoop = exports.RosterForLoop = (0, _customizedComponent.customizedC
     _useState2 = _slicedToArray(_useState, 2),
     nbRows = _useState2[0],
     setNbRows = _useState2[1];
-  var showButtons = min && max && min !== max;
   var addRow = (0, _react.useCallback)(function () {
     if (nbRows < max) {
       setNbRows(nbRows + 1);
@@ -84,16 +79,12 @@ var RosterForLoop = exports.RosterForLoop = (0, _customizedComponent.customizedC
     return null;
   }
   var cols = 0;
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Label.Label, {
-      htmlFor: id,
-      id: "label-".concat(id),
-      children: label
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Declarations.Declarations, {
-      type: "AFTER_QUESTION_TEXT",
-      declarations: declarations,
-      id: id
-    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Table.Table, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Loop.CustomLoop, _objectSpread(_objectSpread({}, props), {}, {
+    errors: (0, _ComponentErrors.getComponentErrors)(errors, props.id),
+    addRow: nbRows === max ? undefined : addRow,
+    removeRow: nbRows === 1 ? undefined : removeRow,
+    canControlRows: !!(min && max && min !== max),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Table.Table, {
       id: id,
       children: [header && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Table.TableHeader, {
         header: header,
@@ -140,19 +131,6 @@ var RosterForLoop = exports.RosterForLoop = (0, _customizedComponent.customizedC
           }, n);
         })
       })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ComponentErrors.ComponentErrors, {
-      errors: props.errors,
-      componentId: id
-    }), showButtons && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.Button, {
-        onClick: addRow,
-        disabled: nbRows === max,
-        children: _i18n["default"].DEFAULT_BUTTON_ADD
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.Button, {
-        onClick: removeRow,
-        disabled: nbRows === min,
-        children: _i18n["default"].DEFAULT_BUTTON_REMOVE
-      })]
-    })]
-  });
-});
+    })
+  }));
+};

package/lib/components/Roundabout/CustomRoundabout.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CustomRoundabout = void 0;
 var _RoundaboutItButton = require("./RoundaboutItButton");
-var _customizedComponent = require("../shared/HOC/customizedComponent");
+var _slottableComponent = require("../shared/HOC/slottableComponent");
 var _extra = require("./extra");
 var _jsxRuntime = require("react/jsx-runtime");
 function RoundaboutIteration(_ref) {
@@ -29,7 +29,7 @@ function RoundaboutIteration(_ref) {
     })]
   });
 }
-var CustomRoundabout = exports.CustomRoundabout = (0, _customizedComponent.customizedComponent)('Roundabout', function (_ref2) {
+var CustomRoundabout = exports.CustomRoundabout = (0, _slottableComponent.slottableComponent)('Roundabout', function (_ref2) {
   var iterations = _ref2.iterations,
     expressions = _ref2.expressions,
     goToIteration = _ref2.goToIteration,

package/lib/components/Roundabout/RoundaboutItButton.js

@@ -7,13 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.RoundaboutItButton = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _customizedComponent = require("../shared/HOC/customizedComponent");
+var _slottableComponent = require("../shared/HOC/slottableComponent");
 var _Button = require("../shared/Button/Button");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var RoundaboutItButton = exports.RoundaboutItButton = (0, _customizedComponent.customizedComponent)('RoundaboutItButton', function (_ref) {
+var RoundaboutItButton = exports.RoundaboutItButton = (0, _slottableComponent.slottableComponent)('RoundaboutItButton', function (_ref) {
   var complete = _ref.complete,
     partial = _ref.partial,
     iteration = _ref.iteration,

package/lib/components/Roundabout/extra.js

@@ -4,39 +4,39 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RoundaboutPending = exports.RoundaboutLabel = exports.RoundaboutItTitle = exports.RoundaboutItContainer = exports.RoundaboutContainer = void 0;
-var _customizedComponent = require("../shared/HOC/customizedComponent");
+var _slottableComponent = require("../shared/HOC/slottableComponent");
 var _react = _interopRequireDefault(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-var RoundaboutContainer = exports.RoundaboutContainer = (0, _customizedComponent.customizedComponent)('RoundaboutContainer', function (_ref) {
+var RoundaboutContainer = exports.RoundaboutContainer = (0, _slottableComponent.slottableComponent)('RoundaboutContainer', function (_ref) {
   var children = _ref.children;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "lunatic-roundabout",
     children: children
   });
 });
-var RoundaboutLabel = exports.RoundaboutLabel = (0, _customizedComponent.customizedComponent)('RoundaboutLabel', function (_ref2) {
+var RoundaboutLabel = exports.RoundaboutLabel = (0, _slottableComponent.slottableComponent)('RoundaboutLabel', function (_ref2) {
   var value = _ref2.value;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "roundabout-label",
     children: value
   });
 });
-var RoundaboutItTitle = exports.RoundaboutItTitle = (0, _customizedComponent.customizedComponent)('RoundaboutItTitle', function (_ref3) {
+var RoundaboutItTitle = exports.RoundaboutItTitle = (0, _slottableComponent.slottableComponent)('RoundaboutItTitle', function (_ref3) {
   var label = _ref3.label;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "roundabout-it-title",
     children: label
   });
 });
-var RoundaboutItContainer = exports.RoundaboutItContainer = (0, _customizedComponent.customizedComponent)('RoundaboutItContainer', function (_ref4) {
+var RoundaboutItContainer = exports.RoundaboutItContainer = (0, _slottableComponent.slottableComponent)('RoundaboutItContainer', function (_ref4) {
   var children = _ref4.children;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "roundabout-iteration-title",
     children: children
   });
 });
-var RoundaboutPending = exports.RoundaboutPending = (0, _customizedComponent.customizedComponent)('RoundaboutPending', function () {
+var RoundaboutPending = exports.RoundaboutPending = (0, _slottableComponent.slottableComponent)('RoundaboutPending', function () {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "roundabout-pending",
     children: "Pending..."