@inseefr/lunatic 2.4.6-beta → 2.4.6-decla

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

@@ -134,6 +134,7 @@
 				fill: white;
 				width: 16px;
 				height: 16px;
+				margin: auto;
 			}
 		}
 	}

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

@@ -19,9 +19,6 @@ var renderers = function renderers(otherProps) {
   return {
     p: function p(props) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
-        style: {
-          margin: '0'
-        },
         children: props.children
       });
     },

package/lib/components/sequence/html/sequence.js

@@ -14,11 +14,13 @@ function Sequence(_ref) {
     id = _ref.id,
     style = _ref.style,
     description = _ref.description;
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: "sequence-lunatic",
-    id: "sequence-".concat(id),
-    style: style,
-    children: [label, /*#__PURE__*/(0, _jsxRuntime.jsx)(_description["default"], {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "sequence-lunatic",
+      id: "sequence-".concat(id),
+      style: style,
+      children: label
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_description["default"], {
       value: description
     })]
   });

package/lib/components/sequence/html/sequence.scss

@@ -7,4 +7,18 @@
 		border: 0;
 		height: 1.875rem;
 	}
+// deccription
 }
+
+.HELP p {
+	margin: 10px;
+}
+.INSTRUCTION p {
+	margin: 10px;
+}
+.COMMENT p {
+	margin: 10px;
+}
+.STATEMENT p {
+	margin: 10px;
+}

package/lib/stories/sequence/afterInSeq.json

@@ -0,0 +1,293 @@
+{
+  "cleaning": {},
+  "variables": [
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "COMMENT_QE"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q1"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q2"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q3"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q4"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q5"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q6"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q7"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q8"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q9"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q10"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "MIX1"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "MIX2"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "MIX3"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "MIX4"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q1",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q2",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q3",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q4",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q5",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q6",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q7",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q8",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q9",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q10",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_MIX1",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_MIX2",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_MIX3",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_MIX4",
+      "inFilter": "false"
+    }
+  ],
+  "components": [
+    {
+      "componentType": "Sequence",
+      "hierarchy": {
+        "sequence": {
+          "id": "kanya0cm",
+          "page": "1",
+          "label": {
+            "type": "VTL|MD",
+            "value": "\"I - \" || \"Séquence - questions comportant des déclarations de différents types\""
+          }
+        }
+      },
+      "conditionFilter": { "type": "VTL", "value": "true" },
+      "id": "kanya0cm",
+      "page": "1",
+      "label": {
+        "type": "VTL|MD",
+        "value": "\"I - \" || \"Séquence - questions comportant des déclarations de différents types\""
+      },
+      "declarations": [
+        {
+          "declarationType": "INSTRUCTION",
+          "id": "kanya0cm-kanzilet",
+          "label": {
+            "type": "VTL|MD",
+            "value": "\"consigne de séquence cawi\""
+          },
+          "position": "AFTER_QUESTION_TEXT"
+        },
+        {
+          "declarationType": "HELP",
+          "id": "kanya0cm-kzfdtx2b",
+          "label": { "type": "VTL|MD", "value": "\"aide de séquence cawi\"" },
+          "position": "AFTER_QUESTION_TEXT"
+        }
+      ]
+    }
+  ]
+}

package/lib/stories/sequence/sequence.stories.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.WithDeclarations = void 0;
+exports["default"] = exports.afterSeq = exports.WithDeclarations = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
 var _sourceDeclarations = _interopRequireDefault(require("./source-declarations.json"));
+var _afterInSeq = _interopRequireDefault(require("./afterInSeq.json"));
 var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -15,7 +16,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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); }
+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); } // import sourceQuestions from './source-questions.json';
 var stories = {
   title: 'Components/Sequence',
   component: _orchestrator["default"],
@@ -31,4 +32,14 @@ exports.WithDeclarations = WithDeclarations;
 WithDeclarations.args = {
   id: 'sequence-declarations',
   source: _sourceDeclarations["default"]
+};
+
+// export const WithQuestions = Template.bind({});
+// WithQuestions.args = { id: 'sequence-questions', source: sourceQuestions };
+
+var afterSeq = Template.bind({});
+exports.afterSeq = afterSeq;
+afterSeq.args = {
+  id: 'sequence-after',
+  source: _afterInSeq["default"]
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.4.6-beta",
+	"version": "2.4.6-decla",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {