@inseefr/lunatic 2.7.0-rc.5 → 2.7.2

package/lib/components/datepicker/html/__snapshots__/datepicker.spec.tsx.snap

@@ -1,34 +1,226 @@
 // Vitest Snapshot v1
 
-exports[`Datepicker > renders without crashing 1`] = `
+exports[`Datepicker > should render properly with format YYYY 1`] = `
 <div>
   <div
     class="lunatic-input"
   >
-    <input
-      aria-labelledby="lunatic-datepicker-datepicker"
-      class="lunatic-datepicker"
-      id="datepicker"
-      type="date"
-      value="1999-01-01"
-    />
+    <div
+      class="lunaticDatepickerFields"
+    >
+      <div
+        class="lunaticDatepickerField"
+      >
+        <label
+          for="datepickerday"
+        >
+          Jour
+          <span
+            class="lunaticDatepickerHint"
+          >
+            Exemple: 14
+          </span>
+        </label>
+        <input
+          id="datepickerday"
+          max="31"
+          min="1"
+          type="number"
+          value="1"
+        />
+      </div>
+      <div
+        class="lunaticDatepickerField"
+      >
+        <label
+          for="datepickermonth"
+        >
+          Mois
+          <span
+            class="lunaticDatepickerHint"
+          >
+            Exemple: 07
+          </span>
+        </label>
+        <input
+          id="datepickermonth"
+          max="12"
+          min="1"
+          type="number"
+          value="1"
+        />
+      </div>
+      <div
+        class="lunaticDatepickerField lunaticDatepickerFieldLarge"
+      >
+        <label
+          for="datepickeryear"
+        >
+          Année
+          <span
+            class="lunaticDatepickerHint"
+          >
+            Exemple: 2023
+          </span>
+        </label>
+        <input
+          id="datepickeryear"
+          min="1"
+          type="number"
+          value="1999"
+        />
+      </div>
+    </div>
   </div>
 </div>
 `;
 
-exports[`Datepicker > should handle readOnly 1`] = `
+exports[`Datepicker > should render properly with format YYYY-MM 1`] = `
 <div>
   <div
     class="lunatic-input"
   >
-    <input
-      aria-labelledby="lunatic-datepicker-Datepicker"
-      class="lunatic-datepicker readOnly"
-      id="Datepicker"
-      readonly=""
-      type="date"
-      value="1980-01-19"
-    />
+    <div
+      class="lunaticDatepickerFields"
+    >
+      <div
+        class="lunaticDatepickerField"
+      >
+        <label
+          for="datepickerday"
+        >
+          Jour
+          <span
+            class="lunaticDatepickerHint"
+          >
+            Exemple: 14
+          </span>
+        </label>
+        <input
+          id="datepickerday"
+          max="31"
+          min="1"
+          type="number"
+          value="1"
+        />
+      </div>
+      <div
+        class="lunaticDatepickerField"
+      >
+        <label
+          for="datepickermonth"
+        >
+          Mois
+          <span
+            class="lunaticDatepickerHint"
+          >
+            Exemple: 07
+          </span>
+        </label>
+        <input
+          id="datepickermonth"
+          max="12"
+          min="1"
+          type="number"
+          value="1"
+        />
+      </div>
+      <div
+        class="lunaticDatepickerField lunaticDatepickerFieldLarge"
+      >
+        <label
+          for="datepickeryear"
+        >
+          Année
+          <span
+            class="lunaticDatepickerHint"
+          >
+            Exemple: 2023
+          </span>
+        </label>
+        <input
+          id="datepickeryear"
+          min="1"
+          type="number"
+          value="1999"
+        />
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Datepicker > should render properly with format YYYY-MM-DD 1`] = `
+<div>
+  <div
+    class="lunatic-input"
+  >
+    <div
+      class="lunaticDatepickerFields"
+    >
+      <div
+        class="lunaticDatepickerField"
+      >
+        <label
+          for="datepickerday"
+        >
+          Jour
+          <span
+            class="lunaticDatepickerHint"
+          >
+            Exemple: 14
+          </span>
+        </label>
+        <input
+          id="datepickerday"
+          max="31"
+          min="1"
+          type="number"
+          value="1"
+        />
+      </div>
+      <div
+        class="lunaticDatepickerField"
+      >
+        <label
+          for="datepickermonth"
+        >
+          Mois
+          <span
+            class="lunaticDatepickerHint"
+          >
+            Exemple: 07
+          </span>
+        </label>
+        <input
+          id="datepickermonth"
+          max="12"
+          min="1"
+          type="number"
+          value="1"
+        />
+      </div>
+      <div
+        class="lunaticDatepickerField lunaticDatepickerFieldLarge"
+      >
+        <label
+          for="datepickeryear"
+        >
+          Année
+          <span
+            class="lunaticDatepickerHint"
+          >
+            Exemple: 2023
+          </span>
+        </label>
+        <input
+          id="datepickeryear"
+          min="1"
+          type="number"
+          value="1999"
+        />
+      </div>
+    </div>
   </div>
 </div>
 `;

package/lib/components/datepicker/html/datepicker.js

@@ -1,52 +1,135 @@
 "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["default"] = void 0;
 var _react = require("react");
 var _commons = require("../../commons");
-var _datepickerInput = _interopRequireDefault(require("./datepicker-input"));
-var _datepickerContainer = _interopRequireDefault(require("./datepicker-container"));
+var _DatepickerField = require("./DatepickerField");
 require("./datepicker.scss");
 var _jsxRuntime = require("react/jsx-runtime");
-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; }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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); }
+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 Datepicker(_ref) {
   var disabled = _ref.disabled,
     readOnly = _ref.readOnly,
     _ref$value = _ref.value,
     value = _ref$value === void 0 ? '' : _ref$value,
+    _ref$format = _ref.format,
+    format = _ref$format === void 0 ? 'YYYY-MM-DD' : _ref$format,
     onChange = _ref.onChange,
     id = _ref.id,
-    min = _ref.min,
-    max = _ref.max,
     label = _ref.label,
     errors = _ref.errors,
     description = _ref.description;
   var labelId = "lunatic-datepicker-".concat(id);
-  var handleChange = (0, _react.useCallback)(function (e) {
-    var value = e.target.value;
-    onChange(value);
-  }, [onChange]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_datepickerContainer["default"], {
+  var showDay = format.includes('DD');
+  var showMonth = format.includes('MM');
+
+  // Raw state, we allow invalid dates to be typed
+  var _useState = (0, _react.useState)(function () {
+      return numbersFromDateString(value);
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    numbers = _useState2[0],
+    setNumbers = _useState2[1];
+  var setNumber = function setNumber(index) {
+    return function (value) {
+      var newNumbers = _toConsumableArray(numbers);
+      newNumbers[index] = value;
+      setNumbers(newNumbers);
+      handleChange(newNumbers);
+    };
+  };
+  var handleChange = function handleChange(numbers) {
+    var formatParts = format.split('-');
+    var hasNaNIndex = numbers.findIndex(function (v) {
+      return Number.isNaN(v);
+    });
+
+    // Date has a missing part
+    if (hasNaNIndex > -1 && hasNaNIndex <= formatParts.length - 1) {
+      onChange(null);
+      return;
+    }
+
+    // Date is not valid
+    if (format === 'YYYY-MM-DD' && !isDateValid(numbers)) {
+      onChange(null);
+      return;
+    }
+    var result = formatParts.map(function (v, k) {
+      return numbers[k].toString().padStart(v.length, '0');
+    }).join('-');
+    onChange(result);
+  };
+  var extraProps = {
+    readOnly: readOnly,
+    disabled: disabled
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "lunatic-input",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.Label, {
       htmlFor: id,
       id: labelId,
       description: description,
       children: label
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_datepickerInput["default"], {
-      id: id,
-      labelId: labelId,
-      readOnly: readOnly,
-      disabled: disabled,
-      value: value,
-      onChange: handleChange,
-      min: min,
-      max: max
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "lunaticDatepickerFields",
+      children: [showDay && /*#__PURE__*/(0, _jsxRuntime.jsx)(_DatepickerField.DatepickerField, _objectSpread({
+        id: id + 'day',
+        label: "Jour",
+        description: "Exemple: 14",
+        max: 31,
+        value: numbers[2],
+        onChange: setNumber(2)
+      }, extraProps)), showMonth && /*#__PURE__*/(0, _jsxRuntime.jsx)(_DatepickerField.DatepickerField, _objectSpread({
+        id: id + 'month',
+        label: "Mois",
+        description: "Exemple: 07",
+        max: 12,
+        value: numbers[1],
+        onChange: setNumber(1)
+      }, extraProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_DatepickerField.DatepickerField, _objectSpread({
+        id: id + 'year',
+        label: "Ann\xE9e",
+        description: "Exemple: 2023",
+        value: numbers[0],
+        onChange: setNumber(0)
+      }, extraProps))]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.Errors, {
-      errors: errors,
-      activeId: id
+      errors: errors
     })]
   });
 }
+function numbersFromDateString(s) {
+  if (!s) {
+    return [NaN, NaN, NaN];
+  }
+  var parts = s.split('-');
+  return [parseInt(parts[0], 10), parseInt(parts[1], 10), parseInt(parts[2], 10)];
+}
+function isDateValid(dateArray) {
+  var _dateArray = _slicedToArray(dateArray, 3),
+    year = _dateArray[0],
+    month = _dateArray[1],
+    day = _dateArray[2];
+  var date = new Date(year, month - 1, day);
+  return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day;
+}
 var _default = exports["default"] = (0, _commons.createCustomizableLunaticField)(Datepicker, 'Datepicker');

package/lib/components/datepicker/html/datepicker.scss

@@ -1 +1,19 @@
-// see input.scss
+.lunaticDatepickerFields {
+  display: flex;
+  align-items: flex-end;
+  gap: 1rem;
+}
+
+.lunaticDatepickerField input {
+  width: 3.5em;
+}
+
+.lunaticDatepickerFieldLarge input {
+  width: 4.5em;
+}
+
+.lunaticDatepickerHint {
+  display: block;
+  font-weight: 400;
+  font-size: .9em;
+}

package/lib/components/datepicker/html/datepicker.spec.js

@@ -10,29 +10,77 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
   (0, _vitest.beforeEach)(function () {
     mockOnChange.mockClear();
   });
-  (0, _vitest.it)('renders without crashing', function () {
-    var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_datepicker["default"], {
-        value: '1999-01-01',
-        id: "datepicker",
-        "aria-labelledby": "datepicker",
-        onChange: mockOnChange
-      })),
-      container = _render.container;
-    (0, _vitest.expect)(container).toMatchSnapshot();
+  ['YYYY-MM-DD', 'YYYY-MM', 'YYYY'].forEach(function (format) {
+    (0, _vitest.it)('should render properly with format ' + format, function () {
+      var _render = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_datepicker["default"], {
+          value: '1999-01-01',
+          id: "datepicker",
+          "aria-labelledby": "datepicker",
+          onChange: mockOnChange
+        })),
+        container = _render.container;
+      (0, _vitest.expect)(container).toMatchSnapshot();
+    });
   });
-  (0, _vitest.it)('should handle readOnly', function () {
-    var _render2 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_datepicker["default"], {
-        id: "Datepicker",
-        value: '1980-01-19',
-        readOnly: true,
-        onChange: mockOnChange
-      })),
-      container = _render2.container;
-    (0, _vitest.expect)(container).toMatchSnapshot();
-    var input = container.querySelector('input[type="date"]');
-    (0, _vitest.expect)(input).toHaveAttribute('readonly');
-    input.focus();
-    (0, _vitest.expect)(input).toHaveFocus();
-    (0, _vitest.expect)(input).toHaveValue('1980-01-19');
+  (0, _vitest.it)('handle change correctly for format YYYY-MM-DD', function () {
+    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_datepicker["default"], {
+      value: '1999-01-01',
+      id: "datepicker",
+      "aria-labelledby": "datepicker",
+      onChange: mockOnChange
+    }));
+    _react.fireEvent.change(_react.screen.getByLabelText(/Année/), {
+      target: {
+        valueAsNumber: 2023
+      }
+    });
+    (0, _vitest.expect)(mockOnChange).toHaveBeenLastCalledWith('2023-01-01');
+    _react.fireEvent.change(_react.screen.getByLabelText(/Mois/), {
+      target: {
+        valueAsNumber: 2
+      }
+    });
+    _react.fireEvent.change(_react.screen.getByLabelText(/Jour/), {
+      target: {
+        valueAsNumber: 30
+      }
+    });
+    (0, _vitest.expect)(mockOnChange).toHaveBeenLastCalledWith(null);
+  });
+  (0, _vitest.it)('handle change correctly for format YYYY-MM', function () {
+    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_datepicker["default"], {
+      format: "YYYY-MM",
+      value: "1999-01",
+      id: "datepicker",
+      "aria-labelledby": "datepicker",
+      onChange: mockOnChange
+    }));
+    _react.fireEvent.change(_react.screen.getByLabelText(/Année/), {
+      target: {
+        valueAsNumber: 2023
+      }
+    });
+    (0, _vitest.expect)(mockOnChange).toHaveBeenLastCalledWith('2023-01');
+    _react.fireEvent.change(_react.screen.getByLabelText(/Mois/), {
+      target: {
+        valueAsNumber: 10
+      }
+    });
+    (0, _vitest.expect)(mockOnChange).toHaveBeenLastCalledWith('2023-10');
+  });
+  (0, _vitest.it)('handle change correctly for year YYYY', function () {
+    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_datepicker["default"], {
+      format: "YYYY",
+      value: "1999",
+      id: "datepicker",
+      "aria-labelledby": "datepicker",
+      onChange: mockOnChange
+    }));
+    _react.fireEvent.change(_react.screen.getByLabelText(/Année/), {
+      target: {
+        valueAsNumber: 2023
+      }
+    });
+    (0, _vitest.expect)(mockOnChange).toHaveBeenLastCalledWith('2023');
   });
 });

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

@@ -8,6 +8,7 @@ var _datepicker = _interopRequireDefault(require("./html/datepicker"));
 var _commons = require("../commons");
 var _lunaticComponentWithoutLabel = _interopRequireDefault(require("../commons/components/lunatic-component-without-label"));
 var _useOnHandleChange = _interopRequireDefault(require("../commons/use-on-handle-change"));
+var _errors = require("../commons/components/errors/errors");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 var LunaticDatepicker = function LunaticDatepicker(props) {
@@ -26,7 +27,8 @@ var LunaticDatepicker = function LunaticDatepicker(props) {
     declarations = props.declarations,
     missing = props.missing,
     missingResponse = props.missingResponse,
-    management = props.management;
+    management = props.management,
+    format = props.format;
   var onChange = (0, _useOnHandleChange["default"])({
     handleChange: handleChange,
     response: response,
@@ -43,6 +45,7 @@ var LunaticDatepicker = function LunaticDatepicker(props) {
     description: description,
     handleChange: handleChange,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_datepicker["default"], {
+      format: format,
       disabled: disabled,
       readOnly: readOnly,
       value: value !== null && value !== void 0 ? value : '',
@@ -52,7 +55,7 @@ var LunaticDatepicker = function LunaticDatepicker(props) {
       max: max,
       label: label,
       description: description,
-      errors: errors
+      errors: (0, _errors.getComponentErrors)(errors, id)
     })
   });
 };

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

@@ -8,6 +8,7 @@ var _lunaticComponentWithoutLabel = _interopRequireDefault(require("../commons/c
 var _useOnHandleChange = _interopRequireDefault(require("../commons/use-on-handle-change"));
 var _dropdown = _interopRequireDefault(require("./html/dropdown"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _errors = require("../commons/components/errors/errors");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function LunaticDropdown(_ref) {
@@ -51,7 +52,7 @@ function LunaticDropdown(_ref) {
       onSelect: onChange,
       value: value,
       className: (0, _classnames["default"])(className, 'lunatic-dropdown'),
-      errors: errors,
+      errors: (0, _errors.getComponentErrors)(errors, id),
       label: label,
       readOnly: readOnly
     })

package/lib/components/duration/duration.js

@@ -38,13 +38,12 @@ function Duration(props) {
     management: management,
     description: description,
     handleChange: handleChange,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "container",
-      children: [label, /*#__PURE__*/(0, _jsxRuntime.jsx)(_durationInput["default"], {
-        value: value,
-        format: format,
-        onChange: onChange
-      })]
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_durationInput["default"], {
+      id: id,
+      label: label,
+      value: value,
+      format: format,
+      onChange: onChange
     })
   });
 }

package/lib/components/duration/duration.scss

@@ -1,17 +1,9 @@
-.input-field {
-  width: 100px;
-  margin-right: 10px
-}
-.field-group {
+.duration-fields,
+.duration-field {
   display: flex;
+  align-items: center;
+  gap: 1rem;
 }
-
-.input-field-group {
-  display: flex;
-  align-items: first baseline;
-  margin: 5px;
+.duration-field {
+  gap: .5rem;
 }
-
-.input-label {
-  margin-right: 5px;
-}