@inseefr/lunatic 2.4.7-datePicker → 2.4.7-gotopage

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

@@ -14,12 +14,6 @@ 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 _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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function Datepicker(_ref) {
   var disabled = _ref.disabled,
     readOnly = _ref.readOnly,
@@ -33,21 +27,10 @@ function Datepicker(_ref) {
     errors = _ref.errors,
     description = _ref.description;
   var labelId = "lunatic-datepicker-".concat(id);
-
-  // store the date value in the local date state
-  var _useState = (0, _react.useState)(value || ''),
-    _useState2 = _slicedToArray(_useState, 2),
-    date = _useState2[0],
-    setDate = _useState2[1];
-
-  // custom event handler to update date value
-  var handleDateChange = function handleDateChange(event) {
-    var inputValue = event.target.value;
-    setDate(inputValue);
-    if (onChange) {
-      onChange(inputValue);
-    }
-  };
+  var handleChange = (0, _react.useCallback)(function (e) {
+    var value = e.target.value;
+    onChange(value);
+  }, [onChange]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_datepickerContainer["default"], {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.Label, {
       htmlFor: id,
@@ -59,8 +42,8 @@ function Datepicker(_ref) {
       labelId: labelId,
       readOnly: readOnly,
       disabled: disabled,
-      value: date,
-      onChange: handleDateChange,
+      value: value,
+      onChange: handleChange,
       min: min,
       max: max
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.Errors, {

package/lib/use-lunatic/reducer/reduce-go-to-page.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _actions = require("../actions");
+var _pageTag = require("../commons/page-tag");
 var _commons = require("./commons");
 var _reduceGoNextPage = _interopRequireDefault(require("./reduce-go-next-page"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -15,14 +16,13 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 validateChange(state) {
-  var updatedState = _objectSpread({}, state);
-  if ((0, _commons.isOnEmptyPage)(updatedState)) {
-    return (0, _reduceGoNextPage["default"])(updatedState, {
+  if ((0, _commons.isOnEmptyPage)(state)) {
+    return (0, _reduceGoNextPage["default"])(state, {
       type: _actions.ActionKind.GO_NEXT_PAGE,
       payload: {}
     });
   }
-  return updatedState;
+  return state;
 }
 function resolveSubPage(state, action) {
   var pager = state.pager,
@@ -54,26 +54,42 @@ function resolveSubPage(state, action) {
 function reduceGoToPage(state, action) {
   var isInLoop = state.isInLoop,
     pager = state.pager;
-  var _action$payload2 = action.payload,
-    newPage = _action$payload2.page,
-    iteration = _action$payload2.iteration;
-  if (iteration !== undefined) {
-    return resolveSubPage(state, action);
+  var newState = _objectSpread({}, state);
+
+  // The page contains non digit, extract information from it
+  if (action.payload.page.match(/\D/)) {
+    var _pager = (0, _pageTag.getPagerFromPageTag)(action.payload.page);
+    if (_pager) {
+      action.payload.iteration = _pager.iteration;
+      action.payload.subPage = _pager.subPage;
+      action.payload.page = _pager.page;
+    }
   }
-  if (!isInLoop) return _objectSpread(_objectSpread({}, state), {}, {
-    pager: _objectSpread(_objectSpread({}, pager), {}, {
-      subPage: undefined,
-      nbSubPages: undefined,
-      iteration: undefined,
-      nbIterations: undefined,
-      page: newPage
-    })
-  });
-  // TODO: fix when redirect to loop component
-  // How to calculate nbSubPages & nbIterations?
-  // How to calculate lazy variables we need?
-  // Handle setLoopBindings with the good iteration
-  return validateChange(state);
+
+  // The page is still not a number, cancel the action
+  if (action.payload.page.match(/\D/)) {
+    console.error("Cannot reach page \"".concat(action.payload.page, "\", not a number"));
+    return state;
+  }
+  if (action.payload.iteration !== undefined) {
+    newState = resolveSubPage(state, action);
+  } else if (!isInLoop) {
+    newState = _objectSpread(_objectSpread({}, state), {}, {
+      pager: _objectSpread(_objectSpread({}, pager), {}, {
+        subPage: undefined,
+        nbSubPages: undefined,
+        iteration: undefined,
+        nbIterations: undefined,
+        page: action.payload.page
+      })
+    });
+    // TODO: fix when redirect to loop component
+    // How to calculate nbSubPages & nbIterations?
+    // How to calculate lazy variables we need?
+    // Handle setLoopBindings with the good iteration
+  }
+
+  return validateChange(newState);
 }
 var _default = reduceGoToPage;
 exports["default"] = _default;

package/package.json

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