@inseefr/lunatic 2.6.0 → 2.6.2-rc.1

package/lib/components/commons/components/md-label/md-label.js

@@ -7,6 +7,7 @@ exports["default"] = void 0;
 var _reactMarkdown = _interopRequireDefault(require("react-markdown"));
 var _link = _interopRequireDefault(require("./link"));
 var _function = require("../../../../utils/function");
+var _react = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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); }
@@ -15,18 +16,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-var renderers = function renderers(otherProps) {
-  return {
-    p: function p(props) {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
-        children: props.children
-      });
-    },
-    a: function a(props) {
-      return (0, _link["default"])(_objectSpread(_objectSpread({}, otherProps), props));
-    }
-  };
-};
 var DEFAULT_LOG_FUNCTION = _function.voidFunction;
 var MdLabel = function MdLabel(_ref) {
   var expression = _ref.expression,
@@ -34,10 +23,25 @@ var MdLabel = function MdLabel(_ref) {
     logFunction = _ref$logFunction === void 0 ? DEFAULT_LOG_FUNCTION : _ref$logFunction;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactMarkdown["default"], {
     children: expression,
-    components: renderers({
+    components: renderComponentsFor(expression, {
       logFunction: logFunction
     })
   });
 };
+var renderComponentsFor = function renderComponentsFor(expression, extraProps) {
+  var components = {
+    p: _react.Fragment,
+    br: 'br',
+    a: function a(props) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_link["default"], _objectSpread({}, _objectSpread(_objectSpread({}, extraProps), props)));
+    }
+  };
+  if (/\n\n/.test(expression)) {
+    return _objectSpread(_objectSpread({}, components), {}, {
+      p: 'p'
+    });
+  }
+  return components;
+};
 var _default = MdLabel;
 exports["default"] = _default;

package/lib/components/commons/components/md-label/md-label.spec.js

@@ -6,10 +6,22 @@ var _mdLabel = _interopRequireDefault(require("./md-label"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 (0, _vitest.describe)('md-label', function () {
-  (0, _vitest.it)('should handle emoticon', function () {
+  (0, _vitest.it)('should handle simple text', function () {
     var obj = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_mdLabel["default"], {
-      expression: "**Demo** of a"
+      expression: "This **is** a simple test"
     }));
-    return (0, _vitest.expect)(obj.container.firstChild).toMatchInlineSnapshot("\n      <p>\n        <strong>\n          Demo\n        </strong>\n         of a\n      </p>\n    ");
+    return (0, _vitest.expect)(obj.container).toMatchInlineSnapshot("\n\t\t\t<div>\n\t\t\t  This \n\t\t\t  <strong>\n\t\t\t    is\n\t\t\t  </strong>\n\t\t\t   a simple test\n\t\t\t</div>\n\t\t");
+  });
+  (0, _vitest.it)('should handle line break', function () {
+    var obj = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_mdLabel["default"], {
+      expression: 'This **is** a simple test\non multiple line'
+    }));
+    return (0, _vitest.expect)(obj.container).toMatchInlineSnapshot("\n\t\t\t<div>\n\t\t\t  This \n\t\t\t  <strong>\n\t\t\t    is\n\t\t\t  </strong>\n\t\t\t   a simple test\n\t\t\ton multiple line\n\t\t\t</div>\n\t\t");
+  });
+  (0, _vitest.it)('should handle paragraphs break', function () {
+    var obj = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_mdLabel["default"], {
+      expression: 'This **is** a simple test\n\nwith multiple paragraphs'
+    }));
+    return (0, _vitest.expect)(obj.container).toMatchInlineSnapshot("\n\t\t\t<div>\n\t\t\t  <p>\n\t\t\t    This \n\t\t\t    <strong>\n\t\t\t      is\n\t\t\t    </strong>\n\t\t\t     a simple test\n\t\t\t  </p>\n\t\t\t  \n\n\t\t\t  <p>\n\t\t\t    with multiple paragraphs\n\t\t\t  </p>\n\t\t\t</div>\n\t\t");
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.6.0",
+	"version": "2.6.2-rc.1",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -57,7 +57,7 @@
 		"library"
 	],
 	"dependencies": {
-		"@inseefr/trevas": "^0.1.19",
+		"@inseefr/trevas": "^0.1.20",
 		"@inseefr/vtl-2.0-antlr-tools": "^0.1.0-bundle",
 		"antlr4": "4.11.0",
 		"classnames": "^2.3.1",