@inseefr/lunatic 2.6.3 → 2.6.4

package/lib/hooks/use-auto-focus.js

@@ -16,7 +16,7 @@ function useAutoFocus(wrapperRef, key) {
     }
 
     // First look for invalid fields, then all fields
-    var firstFocusableElement = (_ref = (_wrapperRef$current = wrapperRef.current) === null || _wrapperRef$current === void 0 ? void 0 : _wrapperRef$current.querySelector('button[aria-invalid], [href][aria-invalid], input[aria-invalid], select[aria-invalid], textarea[aria-invalid], [tabindex][aria-invalid]:not([tabindex="-1"])')) !== null && _ref !== void 0 ? _ref : (_wrapperRef$current2 = wrapperRef.current) === null || _wrapperRef$current2 === void 0 ? void 0 : _wrapperRef$current2.querySelector('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
+    var firstFocusableElement = (_ref = (_wrapperRef$current = wrapperRef.current) === null || _wrapperRef$current === void 0 ? void 0 : _wrapperRef$current.querySelector('button[aria-invalid="true"], [href][aria-invalid="true"], input[aria-invalid="true"], select[aria-invalid="true"], textarea[aria-invalid="true"], [tabindex][aria-invalid="true"]:not([tabindex="-1"])')) !== null && _ref !== void 0 ? _ref : (_wrapperRef$current2 = wrapperRef.current) === null || _wrapperRef$current2 === void 0 ? void 0 : _wrapperRef$current2.querySelector('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
 
     // The first element can be focusable
     if (firstFocusableElement) {

package/lib/src/utils/suggester-workers/searching/meloto-order.d.ts

@@ -1,7 +1,8 @@
 export type Entity = Record<string, unknown> & {
     id: string | number;
     suggestion: {
-        label: string;
+        label?: string;
+        id: string;
     };
     tokensSearch: {};
 };

package/lib/stories/suggester/suggester-workers.stories.js

@@ -43,6 +43,30 @@ function fetchFake() {
     return r.json();
   });
 }
+function fetchPCS2020() {
+  return fetch('/libelles-pcs-2020.json').then(function (r) {
+    return r.json();
+  });
+}
+var infoPCS2020 = {
+  name: 'libelle-pcs2020',
+  fields: [{
+    name: 'id',
+    rules: ['[\\w]+'],
+    language: 'French',
+    min: 2
+  }],
+  queryParser: {
+    type: 'tokenized',
+    params: {
+      language: 'French',
+      pattern: '[\\w]+'
+    }
+  },
+  meloto: true,
+  version: '1',
+  stopWords: ['a', 'au', 'dans', 'de', 'des', 'du', 'en', 'er', 'la', 'le', 'ou', 'sur', 'd', 'l', 'aux', 'dans', 'un', 'une', 'pour', 'avec', 'chez', 'par', 'les']
+};
 var infoFake = {
   name: 'fake',
   fields: [{
@@ -78,7 +102,7 @@ var infoNaf = {
     }
   },
   version: '1',
-  meloto: false
+  meloto: true
 };
 function loadOne(_x, _x2) {
   return _loadOne.apply(this, arguments);
@@ -187,6 +211,17 @@ var Template = function Template(args) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("ul", {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("li", {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
+          type: "button",
+          value: "load PCS2020",
+          onClick: function onClick() {
+            return loadOne(infoPCS2020, fetchPCS2020);
+          }
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Search, {
+          storeInfo: infoPCS2020,
+          defaultValue: "st"
+        })]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("li", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
           type: "button",
           value: "load NAF",

package/lib/stories/suggester/suggester.stories.js

@@ -42,19 +42,23 @@ function _getReferentiel() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.t0 = name;
-          _context.next = _context.t0 === 'naf-rev2-stop' ? 3 : _context.t0 === 'naf-rev2' ? 3 : _context.t0 === 'cog-communes' ? 4 : 5;
+          _context.next = _context.t0 === 'libelle-pcs2020' ? 3 : _context.t0 === 'naf-rev2' ? 4 : _context.t0 === 'cog-communes' ? 5 : 6;
           break;
         case 3:
-          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/naf-rev2.json').then(function (r) {
+          return _context.abrupt("return", fetch('/libelles-pcs-2020.json').then(function (r) {
             return r.json();
           }));
         case 4:
-          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/communes-2019.json').then(function (r) {
+          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/naf-rev2.json').then(function (r) {
             return r.json();
           }));
         case 5:
-          throw new Error("Unkonw r\xE9f\xE9rentiel ".concat(name));
+          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/communes-2019.json').then(function (r) {
+            return r.json();
+          }));
         case 6:
+          throw new Error("Unkonw r\xE9f\xE9rentiel ".concat(name));
+        case 7:
         case "end":
           return _context.stop();
       }

package/lib/utils/suggester-workers/searching/meloto-order.js

@@ -8,16 +8,17 @@ exports.value = value;
 var _prepareStringIndexation = _interopRequireDefault(require("../commons-tokenizer/prepare-string-indexation"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function value(entity) {
+  var _suggestion$label;
   var tokens = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var suggestion = entity.suggestion;
-  var label = suggestion.label;
-  var prepared = (0, _prepareStringIndexation["default"])(label);
-  if (label && label.length) {
+  var used = (_suggestion$label = suggestion.label) !== null && _suggestion$label !== void 0 ? _suggestion$label : suggestion.id;
+  var prepared = (0, _prepareStringIndexation["default"])(used);
+  if (used && used.length) {
     return tokens.reduce(function (score, token, i) {
       var index = prepared.search(token);
       if (index >= 0) {
-        var how = label.length - index;
-        how /= label.length;
+        var how = used.length - index;
+        how /= used.length;
         var weight = tokens.length - i;
         weight /= tokens.length;
         return score + how * weight;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.6.3",
+	"version": "2.6.4",
 	"workersVersion": "0.3.0-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {