@inseefr/lunatic 2.5.2-rc1-beta → 2.5.2

package/lib/components/commons/components/combo-box/combo-box-content.js

@@ -48,6 +48,7 @@ function ComboBoxContent(_ref) {
   }, [onKeyDown]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContentBox["default"], {
     classNamePrefix: classNamePrefix,
+    focused: focused,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: (0, _classnames["default"])("".concat(classNamePrefix !== null && classNamePrefix !== void 0 ? classNamePrefix : 'lunatic', "-combo-box-content"), {
         focused: focused

package/lib/components/commons/components/combo-box/combo-box.js

@@ -120,6 +120,7 @@ function ComboBox(_ref) {
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_comboBoxContainer["default"], {
     id: id,
+    className: className,
     classStyle: classStyle,
     classNamePrefix: classNamePrefix,
     errors: errors,

package/lib/src/utils/get-component-value.d.ts

@@ -2,4 +2,4 @@
  * Extract the value associated with a component
  * If the component expect multiple values (it has a responses property) then extract a map of values
  */
-export declare function getComponentValue<T = unknown>(component: unknown, valueMap: Record<string, unknown>, rowIndex?: number): T;
+export declare function getComponentValue(component: unknown, valueMap: Record<string, unknown>, rowIndex?: number): unknown;

package/lib/src/utils/get-component-value.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/get-component-value.js

@@ -4,31 +4,33 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getComponentValue = getComponentValue;
-var _object = require("./object");
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 /**
  * Extract the value associated with a component
  * If the component expect multiple values (it has a responses property) then extract a map of values
  */
 function getComponentValue(component, valueMap, rowIndex) {
-  var value = undefined;
   if (hasResponse(component)) {
-    var valueArray = valueMap[component.response.name];
-    if (Array.isArray(valueArray)) {
-      value = valueArray[rowIndex !== null && rowIndex !== void 0 ? rowIndex : 0] || '';
+    var value = valueMap[component.response.name];
+    if (Array.isArray(value)) {
+      return value[rowIndex !== null && rowIndex !== void 0 ? rowIndex : 0];
     }
+    return value;
   }
 
   // For checkbox group we need to send the map of values
   if (hasResponses(component)) {
-    value = (0, _object.objectMap)(valueMap, function (k, v) {
-      if (Array.isArray(v)) {
-        return [k, v[rowIndex !== null && rowIndex !== void 0 ? rowIndex : 0]];
+    var _component$responses$, _component$responses;
+    return Object.fromEntries((_component$responses$ = (_component$responses = component.responses) === null || _component$responses === void 0 ? void 0 : _component$responses.map(function (_ref) {
+      var response = _ref.response;
+      var value = valueMap[response.name];
+      if (Array.isArray(value)) {
+        return [response.name, value[rowIndex !== null && rowIndex !== void 0 ? rowIndex : 0]];
       }
-      return [k, v];
-    });
+      return [response.name, value];
+    })) !== null && _component$responses$ !== void 0 ? _component$responses$ : []);
   }
-  return value;
+  return undefined;
 }
 function hasResponse(component) {
   return !!component && _typeof(component) === 'object' && 'response' in component && 'name' in component.response;

package/lib/utils/get-component-value.test.js

@@ -0,0 +1,57 @@
+"use strict";
+
+var _vitest = require("vitest");
+var _getComponentValue = require("./get-component-value");
+(0, _vitest.describe)('getComponentValue', function () {
+  var componentWithResponse = {
+    response: {
+      name: 'prenom'
+    }
+  };
+  var componentWithResponses = {
+    responses: [componentWithResponse, {
+      response: {
+        name: 'nom'
+      }
+    }]
+  };
+  (0, _vitest.it)('Should work with simple response', function () {
+    (0, _vitest.expect)((0, _getComponentValue.getComponentValue)(componentWithResponse, {
+      prenom: 'John'
+    })).toBe('John');
+    (0, _vitest.expect)((0, _getComponentValue.getComponentValue)(componentWithResponse, {})).toBe(undefined);
+    (0, _vitest.expect)((0, _getComponentValue.getComponentValue)({}, {
+      prenom: 'John'
+    })).toBe(undefined);
+  });
+  (0, _vitest.it)('Should work with simple response as Array', function () {
+    (0, _vitest.expect)((0, _getComponentValue.getComponentValue)(componentWithResponse, {
+      prenom: ['John', 'Renaud']
+    }, 1)).toBe('Renaud');
+    (0, _vitest.expect)((0, _getComponentValue.getComponentValue)(componentWithResponse, {
+      prenom: ['John', 'Renaud']
+    }, 3)).toBe(undefined);
+  });
+  (0, _vitest.it)('Should work with responses', function () {
+    (0, _vitest.expect)((0, _getComponentValue.getComponentValue)(componentWithResponses, {
+      prenom: 'John'
+    })).toMatchObject({
+      prenom: 'John',
+      nom: undefined
+    });
+    (0, _vitest.expect)((0, _getComponentValue.getComponentValue)(componentWithResponses, {
+      prenom: ['John', 'Renaud'],
+      nom: ['Insee', 'Metallica']
+    }, 1)).toMatchObject({
+      prenom: 'Renaud',
+      nom: 'Metallica'
+    });
+    (0, _vitest.expect)((0, _getComponentValue.getComponentValue)(componentWithResponses, {
+      prenom: ['John', 'Renaud'],
+      nom: 'Insee'
+    }, 1)).toMatchObject({
+      prenom: 'Renaud',
+      nom: 'Insee'
+    });
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.5.2-rc1-beta",
+	"version": "2.5.2",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -24,6 +24,7 @@
 	],
 	"license": "MIT",
 	"main": "lib/index.js",
+	"types": "lib/src/index.d.ts",
 	"files": [
 		"lib"
 	],