@inseefr/lunatic 2.6.14 → 2.6.16

package/lib/components/lunatic-components.js

@@ -16,27 +16,40 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 : 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); }
+var LunaticComponentsConatainer = /*#__PURE__*/(0, _react.forwardRef)(function Container(_ref, ref) {
+  var children = _ref.children,
+    autoFocusKey = _ref.autoFocusKey;
+  if (autoFocusKey) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      ref: ref,
+      children: children
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: children
+  });
+});
 /**
  * Entry point for orchestrators, this component display the list of fields
  */
-function LunaticComponents(_ref) {
-  var components = _ref.components,
-    autoFocusKey = _ref.autoFocusKey,
-    componentProps = _ref.componentProps,
-    _ref$wrapper = _ref.wrapper,
-    wrapper = _ref$wrapper === void 0 ? function (_ref2) {
-      var children = _ref2.children;
+function LunaticComponents(_ref2) {
+  var components = _ref2.components,
+    autoFocusKey = _ref2.autoFocusKey,
+    componentProps = _ref2.componentProps,
+    _ref2$wrapper = _ref2.wrapper,
+    wrapper = _ref2$wrapper === void 0 ? function (_ref3) {
+      var children = _ref3.children;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "lunatic lunatic-component",
         children: children
       });
-    } : _ref$wrapper;
+    } : _ref2$wrapper;
   var wrapperRef = (0, _react.useRef)(null);
   var hasComponents = components.length > 0;
-  var WrapperComponent = autoFocusKey ? 'div' : _react.Fragment;
   (0, _useAutoFocus.useAutoFocus)(wrapperRef, hasComponents ? autoFocusKey : undefined);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(WrapperComponent, {
-    ref: WrapperComponent === _react.Fragment ? undefined : wrapperRef,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(LunaticComponentsConatainer, {
+    ref: wrapperRef,
+    autoFocusKey: autoFocusKey,
     children: components.map(function (component, k) {
       var props = _objectSpread(_objectSpread({}, component), componentProps === null || componentProps === void 0 ? void 0 : componentProps(component));
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, {

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

@@ -16,7 +16,8 @@ function LunaticModal(props) {
     label = props.label,
     description = props.description,
     goNextPage = props.goNextPage,
-    goPreviousPage = props.goPreviousPage;
+    goPreviousPage = props.goPreviousPage,
+    backPage = props.backPage;
   var dialogRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
     var _dialogRef$current;
@@ -54,7 +55,8 @@ function LunaticModal(props) {
       onClick: handleDialogClick,
       id: id,
       label: label,
-      description: description
+      description: description,
+      backPage: backPage
     })
   });
 }

package/lib/components/suggester/html/suggester.js

@@ -38,7 +38,10 @@ function Suggester(_ref) {
     searching = _ref.searching,
     label = _ref.label,
     description = _ref.description,
-    errors = _ref.errors;
+    errors = _ref.errors,
+    _ref$arbitrary = _ref.arbitrary,
+    arbitrary = _ref$arbitrary === void 0 ? true : _ref$arbitrary,
+    focused = _ref.focused;
   var _useState = (0, _react.useState)(''),
     _useState2 = _slicedToArray(_useState, 2),
     search = _useState2[0],
@@ -72,7 +75,9 @@ function Suggester(_ref) {
               setOptions(results);
               setSearch(search);
               // if a user does not select an option in the list, their search term is saved
-              onSelect(search);
+              if (arbitrary) {
+                onSelect(search);
+              }
             }
             _context.next = 13;
             break;
@@ -89,7 +94,7 @@ function Suggester(_ref) {
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [searching, onSelect]);
+  }(), [searching, arbitrary, onSelect]);
   var defaultSearch = getSearch(search, value);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.ComboBox, {
     id: id,
@@ -108,7 +113,8 @@ function Suggester(_ref) {
     placeholder: placeholder,
     label: label,
     description: description,
-    errors: errors
+    errors: errors,
+    focused: focused
   });
 }
 function getSearch(search, value) {

package/lib/components/suggester/idb-suggester/check-store.js

@@ -91,7 +91,7 @@ function CheckStore(_ref) {
   if (ready === 0) {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "lunatic-suggester-in-progress",
-      children: ["Le store ", storeName, " est en cours de chargement."]
+      children: ["La liste ", storeName, " est en cours de chargement."]
     });
   }
   if (ready === 200) {

package/lib/components/suggester/idb-suggester/idb-suggester.js

@@ -33,7 +33,9 @@ function IDBSuggester(_ref) {
     getSuggesterStatus = _ref.getSuggesterStatus,
     errors = _ref.errors,
     readOnly = _ref.readOnly,
-    workersBasePath = _ref.workersBasePath;
+    workersBasePath = _ref.workersBasePath,
+    arbitrary = _ref.arbitrary,
+    focused = _ref.focused;
   var _useState = (0, _react.useState)(undefined),
     _useState2 = _slicedToArray(_useState, 2),
     store = _useState2[0],
@@ -65,7 +67,9 @@ function IDBSuggester(_ref) {
         value: value,
         label: label,
         description: description,
-        errors: errors
+        errors: errors,
+        arbitrary: arbitrary,
+        focused: focused
       })
     })
   });

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

@@ -16,7 +16,6 @@ function LunaticSuggester(_ref) {
     optionRenderer = _ref.optionRenderer,
     labelRenderer = _ref.labelRenderer,
     idbVersion = _ref.idbVersion,
-    focused = _ref.focused,
     value = _ref.value,
     handleChange = _ref.handleChange,
     disabled = _ref.disabled,
@@ -32,7 +31,9 @@ function LunaticSuggester(_ref) {
     response = _ref.response,
     className = _ref.className,
     getSuggesterStatus = _ref.getSuggesterStatus,
-    workersBasePath = _ref.workersBasePath;
+    workersBasePath = _ref.workersBasePath,
+    arbitrary = _ref.arbitrary,
+    focused = _ref.focused;
   var onChange = (0, _useOnHandleChange["default"])({
     handleChange: handleChange,
     response: response,
@@ -62,7 +63,9 @@ function LunaticSuggester(_ref) {
       getSuggesterStatus: getSuggesterStatus,
       className: className,
       readOnly: readOnly,
-      workersBasePath: workersBasePath
+      workersBasePath: workersBasePath,
+      arbitrary: arbitrary,
+      focused: focused
     })
   });
 }

package/lib/src/components/modal/html/modal.d.ts

@@ -1,7 +1,7 @@
 import type { MouseEventHandler, ReactEventHandler, RefObject } from 'react';
 import type { LunaticComponentProps } from '../../type';
 import './modal.scss';
-type Props = Pick<LunaticComponentProps<'ConfirmationModal'>, 'id' | 'label' | 'description'> & {
+type Props = Pick<LunaticComponentProps<'ConfirmationModal'>, 'id' | 'label' | 'description' | 'backPage'> & {
     onClose: ReactEventHandler<HTMLDialogElement>;
     onCancel: ReactEventHandler<HTMLDialogElement>;
     onClick: MouseEventHandler<HTMLDialogElement>;

package/lib/src/components/suggester/html/suggester.d.ts

@@ -21,6 +21,8 @@ type Props = {
     label?: ReactNode;
     description?: ReactNode;
     errors?: LunaticError[];
+    arbitrary?: boolean;
+    focused?: boolean;
 };
 declare const _default: import("react").ComponentType<Props>;
 export default _default;

package/lib/src/components/suggester/idb-suggester/idb-suggester.d.ts

@@ -1,9 +1,9 @@
 import type { LunaticError } from '../../../use-lunatic/type';
 import type { LunaticComponentProps } from '../../type';
-type Props = Pick<LunaticComponentProps<'Suggester'>, 'storeName' | 'idbVersion' | 'id' | 'className' | 'optionRenderer' | 'labelRenderer' | 'disabled' | 'readOnly' | 'value' | 'label' | 'description' | 'getSuggesterStatus'> & {
+type Props = Pick<LunaticComponentProps<'Suggester'>, 'storeName' | 'idbVersion' | 'id' | 'className' | 'optionRenderer' | 'labelRenderer' | 'disabled' | 'readOnly' | 'value' | 'label' | 'description' | 'getSuggesterStatus' | 'arbitrary' | 'focused'> & {
     errors?: LunaticError[];
     onSelect: (v: string | null) => void;
     workersBasePath?: string;
 };
-export declare function IDBSuggester({ storeName, idbVersion, id, className, optionRenderer, labelRenderer, onSelect, disabled, value, label, description, getSuggesterStatus, errors, readOnly, workersBasePath, }: Props): import("react/jsx-runtime").JSX.Element;
+export declare function IDBSuggester({ storeName, idbVersion, id, className, optionRenderer, labelRenderer, onSelect, disabled, value, label, description, getSuggesterStatus, errors, readOnly, workersBasePath, arbitrary, focused, }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/src/components/suggester/lunatic-suggester.d.ts

@@ -1,3 +1,3 @@
 import type { LunaticComponentProps } from '../type';
-declare function LunaticSuggester({ id, storeName, optionRenderer, labelRenderer, idbVersion, focused, value, handleChange, disabled, readOnly, errors, label, description, preferences, declarations, missing, missingResponse, management, response, className, getSuggesterStatus, workersBasePath, }: LunaticComponentProps<'Suggester'>): import("react/jsx-runtime").JSX.Element;
+declare function LunaticSuggester({ id, storeName, optionRenderer, labelRenderer, idbVersion, value, handleChange, disabled, readOnly, errors, label, description, preferences, declarations, missing, missingResponse, management, response, className, getSuggesterStatus, workersBasePath, arbitrary, focused, }: LunaticComponentProps<'Suggester'>): import("react/jsx-runtime").JSX.Element;
 export default LunaticSuggester;

package/lib/src/components/type.d.ts

@@ -257,6 +257,7 @@ type ComponentPropsByType = {
         response: {
             name: string;
         };
+        arbitrary?: boolean;
     };
     Summary: LunaticBaseProps<string | null> & {
         sections: Array<{
@@ -275,6 +276,7 @@ type ComponentPropsByType = {
         page: string;
         goNextPage: () => void;
         goPreviousPage: () => void;
+        backPage?: string;
     };
     RemoteComponent: LunaticBaseProps<string | null> & {
         components: LunaticComponentDefinition[];

package/lib/use-lunatic/use-suggesters.js

@@ -114,19 +114,27 @@ function useSuggesters(_ref) {
                   setTimestamp(Date.now());
                 }
               case 10:
+                _context.next = 15;
+                break;
+              case 12:
+                _context.prev = 12;
+                _context.t0 = _context["catch"](4);
+                console.warn("Error during suggester's cleaning ".concat(name), _context.t0);
+              case 15:
+                _context.prev = 15;
                 if (!(current[name] === SuggesterStatus.pending)) {
-                  _context.next = 20;
+                  _context.next = 26;
                   break;
                 }
-                _context.next = 13;
+                _context.next = 19;
                 return getReferentiel(name);
-              case 13:
+              case 19:
                 data = _context.sent;
                 _createAppendTask = (0, _createAppendTask3.createAppendTask)(store, 1, nothing, workersBasePath), _createAppendTask2 = _slicedToArray(_createAppendTask, 2), append = _createAppendTask2[0], abort = _createAppendTask2[1];
                 aborts.current.push(abort);
-                _context.next = 18;
+                _context.next = 24;
                 return append(data);
-              case 18:
+              case 24:
                 result = _context.sent;
                 if (result) {
                   setStatus(status, name, SuggesterStatus.success);
@@ -135,20 +143,20 @@ function useSuggesters(_ref) {
                   setStatus(status, name, SuggesterStatus.error);
                   setTimestamp(Date.now());
                 }
-              case 20:
-                _context.next = 27;
+              case 26:
+                _context.next = 33;
                 break;
-              case 22:
-                _context.prev = 22;
-                _context.t0 = _context["catch"](4);
-                console.error(_context.t0);
+              case 28:
+                _context.prev = 28;
+                _context.t1 = _context["catch"](15);
+                console.error("Error during suggester's loading ".concat(name), _context.t1);
                 setStatus(status, name, SuggesterStatus.error);
                 setTimestamp(Date.now());
-              case 27:
+              case 33:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[4, 22]]);
+          }, _callee, null, [[4, 12], [15, 28]]);
         }));
         return function (_x) {
           return _ref3.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.6.14",
+	"version": "2.6.16",
 	"workersVersion": "0.3.0-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -133,7 +133,7 @@
 		"damerau-levenshtein": "^1.0.7",
 		"eslint": "7.30.0",
 		"eslint-config-prettier": "^9.0.0",
-		"eslint-config-react-app": "^6.0.0",
+		"eslint-config-react-app": "^7.0.0",
 		"eslint-plugin-flowtype": "^8.0.0",
 		"eslint-plugin-import": "^2.19.1",
 		"eslint-plugin-jsx-a11y": "^6.1.1",