@inseefr/lunatic 2.5.1-panelContainer → 2.5.1-testRoundaboutFix

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

@@ -3,10 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.ComboBoxContainer = ComboBoxContainer;
 var _classnames = _interopRequireDefault(require("classnames"));
-var _createCustomizableField = _interopRequireDefault(require("../../create-customizable-field"));
-var _errors = _interopRequireDefault(require("../errors"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function ComboBoxContainer(_ref) {
@@ -14,16 +12,10 @@ function ComboBoxContainer(_ref) {
     className = _ref.className,
     id = _ref.id,
     _ref$classStyle = _ref.classStyle,
-    classStyle = _ref$classStyle === void 0 ? 'default-style' : _ref$classStyle,
-    errors = _ref.errors;
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    id: "".concat(className !== null && className !== void 0 ? className : 'lunatic', "-combo-box-container-").concat(id),
-    className: (0, _classnames["default"])("".concat(className !== null && className !== void 0 ? className : 'lunatic', "-combo-box-container"), "".concat(className !== null && className !== void 0 ? className : 'lunatic', "-suggester-").concat(classStyle), "lunatic-suggester-default-style", classStyle),
-    children: [children, errors && /*#__PURE__*/(0, _jsxRuntime.jsx)(_errors["default"], {
-      errors: errors,
-      activeId: id
-    })]
+    classStyle = _ref$classStyle === void 0 ? 'default-style' : _ref$classStyle;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    id: "lunatic-combo-box-container-".concat(id),
+    className: (0, _classnames["default"])('lunatic-combo-box-container', className, classStyle),
+    children: children
   });
-}
-var _default = (0, _createCustomizableField["default"])(ComboBoxContainer, 'ComboboxContainer');
-exports["default"] = _default;
+}

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

@@ -2,13 +2,13 @@
 
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@testing-library/react");
-var _comboBoxContainer = _interopRequireDefault(require("./combo-box-container"));
+var _comboBoxContainer = require("./combo-box-container");
 var _vitest = require("vitest");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 (0, _vitest.describe)('ComboBoxContainer', function () {
   (0, _vitest.it)('renders with default styles when no classStyle prop is provided', function () {
-    var _render = (0, _react2.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContainer["default"], {
+    var _render = (0, _react2.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContainer.ComboBoxContainer, {
         id: "test-id",
         children: "Content"
       })),
@@ -16,7 +16,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
     (0, _vitest.expect)(container.firstChild).toHaveClass('default-style');
   });
   (0, _vitest.it)('renders with additional styles when classStyle prop is provided', function () {
-    var _render2 = (0, _react2.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContainer["default"], {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContainer.ComboBoxContainer, {
         id: "test-id",
         classStyle: "custom-style",
         children: "Content"
@@ -26,7 +26,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
     (0, _vitest.expect)(container.firstChild).toHaveClass('custom-style');
   });
   (0, _vitest.it)('renders children inside the component', function () {
-    var _render3 = (0, _react2.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContainer["default"], {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContainer.ComboBoxContainer, {
         id: "test-id",
         children: "Content"
       })),
@@ -34,7 +34,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
     (0, _vitest.expect)(getByText('Content')).toBeInTheDocument();
   });
   (0, _vitest.it)('passes className prop to the component', function () {
-    var _render4 = (0, _react2.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContainer["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContainer.ComboBoxContainer, {
         id: "test-id",
         className: "test-class",
         children: "Content"

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

@@ -10,7 +10,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _keyboardKeyCodes = require("./state-management/reduce-on-keydown/keyboard-key-codes");
 var _index = require("../../index");
-var _comboBoxContentBox = _interopRequireDefault(require("./combo-box-content-box"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -20,8 +19,7 @@ function ComboBoxContent(_ref) {
     focused = _ref.focused,
     onFocus = _ref.onFocus,
     onBlur = _ref.onBlur,
-    onKeyDown = _ref.onKeyDown,
-    className = _ref.className;
+    onKeyDown = _ref.onKeyDown;
   var ref = (0, _react.useRef)(null);
   var onClick = (0, _react.useCallback)(function (e) {
     var _ref$current;
@@ -46,16 +44,19 @@ function ComboBoxContent(_ref) {
 
     onKeyDown(key);
   }, [onKeyDown]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_comboBoxContentBox["default"], {
-    className: className,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: (0, _classnames["default"])('lunatic-combo-box', {
+      focused: focused
+    }),
     onFocus: onFocus,
+    onClick: onFocus,
     onKeyDown: handleKeyDown,
+    ref: ref,
+    tabIndex: 0,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: (0, _classnames["default"])("".concat(className !== null && className !== void 0 ? className : 'lunatic', "-combo-box-content"), {
+      className: (0, _classnames["default"])('lunatic-combo-box-content', {
         focused: focused
       }),
-      ref: ref,
-      tabIndex: 0,
       children: children
     })
   });

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

@@ -12,9 +12,10 @@ var _stateManagement = require("./state-management");
 require("./combo-box.scss");
 var _selection = require("./selection/selection");
 var _panel = require("./panel/panel");
-var _comboBoxContainer = _interopRequireDefault(require("./combo-box-container"));
+var _comboBoxContainer = require("./combo-box-container");
 var _comboBoxContent = _interopRequireDefault(require("./combo-box-content"));
 var _label = _interopRequireDefault(require("../label"));
+var _errors = _interopRequireDefault(require("../errors"));
 var _index = require("../../index");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -102,11 +103,10 @@ function ComboBox(_ref) {
       children: messageError
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_comboBoxContainer["default"], {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_comboBoxContainer.ComboBoxContainer, {
     id: id,
     classStyle: classStyle,
     className: className,
-    errors: errors,
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_label["default"], {
       htmlFor: id,
       id: labelId,
@@ -117,7 +117,6 @@ function ComboBox(_ref) {
       onFocus: onFocus,
       onBlur: onBlur,
       onKeyDown: onKeyDown,
-      className: className,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_selection.Selection, {
         labelRenderer: labelRenderer,
         placeholder: placeholder,
@@ -130,8 +129,7 @@ function ComboBox(_ref) {
         editable: editable,
         selectedIndex: selectedIndex,
         options: options,
-        onChange: handleChange,
-        className: className
+        onChange: handleChange
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_panel.Panel, {
         optionRenderer: optionRenderer,
         options: options,
@@ -149,6 +147,9 @@ function ComboBox(_ref) {
       search: search,
       onClick: onDelete,
       editable: editable
+    }), errors && /*#__PURE__*/(0, _jsxRuntime.jsx)(_errors["default"], {
+      errors: errors,
+      activeId: id
     })]
   });
 }

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

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.PanelContainer = PanelContainer;
 var _classnames = _interopRequireDefault(require("classnames"));
-var _createCustomizableField = _interopRequireDefault(require("../../../create-customizable-field"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function PanelContainer(_ref) {
@@ -23,6 +22,4 @@ function PanelContainer(_ref) {
     role: "listbox",
     children: children
   });
-}
-var _default = (0, _createCustomizableField["default"])(PanelContainer, 'ComboboxPanelContainer');
-exports["default"] = _default;
+}

package/lib/components/commons/components/combo-box/panel/panel-container.spec.js

@@ -2,12 +2,11 @@
 
 var _react = require("@testing-library/react");
 var _vitest = require("vitest");
-var _panelContainer = _interopRequireDefault(require("./panel-container"));
+var _panelContainer = require("./panel-container");
 var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 (0, _vitest.describe)('PanelContainer', function () {
   (0, _vitest.it)('should render children', function () {
-    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_panelContainer["default"], {
+    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_panelContainer.PanelContainer, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
         children: "Item 1"
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
@@ -21,7 +20,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
   });
   (0, _vitest.it)('should set the id attribute', function () {
     var id = 'test-panel';
-    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer["default"], {
+    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer.PanelContainer, {
       id: id,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
         children: "Item 1"
@@ -30,7 +29,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
     (0, _vitest.expect)(_react.screen.getByRole('listbox')).toHaveAttribute('id', "lunatic-combo-box-panel-".concat(id));
   });
   (0, _vitest.it)('should set the aria-label attribute', function () {
-    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer["default"], {
+    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer.PanelContainer, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
         children: "Item 1"
       })
@@ -38,7 +37,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
     (0, _vitest.expect)(_react.screen.getByRole('listbox')).toHaveAttribute('aria-label', 'suggestions');
   });
   (0, _vitest.it)('should set the focused class when focused prop is true', function () {
-    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer["default"], {
+    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer.PanelContainer, {
       focused: true,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
         children: "Item 1"
@@ -47,7 +46,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
     (0, _vitest.expect)(_react.screen.getByRole('listbox')).toHaveClass('focused');
   });
   (0, _vitest.it)('should set the expanded class when expanded prop is true', function () {
-    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer["default"], {
+    (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer.PanelContainer, {
       expanded: true,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
         children: "Item 1"

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Panel = Panel;
 var _react = _interopRequireDefault(require("react"));
-var _panelContainer = _interopRequireDefault(require("./panel-container"));
+var _panelContainer = require("./panel-container");
 var _optionContainer = require("./option-container");
 var _comboBoxOption = _interopRequireDefault(require("./combo-box-option"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -22,7 +22,7 @@ function Panel(_ref) {
     onSelect = _ref.onSelect;
   var visibleOptions = expanded ? options : [];
   var ComboBoxOptionComponent = OptionRender !== null && OptionRender !== void 0 ? OptionRender : _comboBoxOption["default"];
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer["default"], {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_panelContainer.PanelContainer, {
     expanded: expanded,
     focused: focused,
     id: "".concat(id, "-list"),

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

@@ -14,12 +14,11 @@ function SelectionContainer(_ref) {
     expanded = _ref.expanded,
     focused = _ref.focused,
     disabled = _ref.disabled,
-    labelId = _ref.labelId,
-    className = _ref.className;
+    labelId = _ref.labelId;
   var comboBoxId = "".concat(id);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     id: comboBoxId,
-    className: (0, _classnames["default"])("".concat(className !== null && className !== void 0 ? className : 'lunatic', "-combo-box-selection"), {
+    className: (0, _classnames["default"])('lunatic-combo-box-selection', {
       focused: focused,
       disabled: disabled
     }),

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

@@ -21,8 +21,7 @@ function Selection(_ref) {
     options = _ref.options,
     editable = _ref.editable,
     labelId = _ref.labelId,
-    id = _ref.id,
-    className = _ref.className;
+    id = _ref.id;
   var onChangeEx = (0, _react.useCallback)(function (e) {
     onChange === null || onChange === void 0 ? void 0 : onChange(e.target.value);
   }, [onChange]);
@@ -31,7 +30,6 @@ function Selection(_ref) {
     labelId: labelId,
     expanded: expanded,
     "aria-owns": "".concat(id, "-list"),
-    className: className,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_LabelOrInput.LabelOrInput, {
       labelRenderer: labelRenderer,
       placeholder: placeholder,

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _roundabout = _interopRequireDefault(require("./roundabout"));
-var _redirect = _interopRequireDefault(require("./redirect"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -30,12 +29,6 @@ function LunaticRoundabout(_ref) {
       nbIterations: iterations
     });
   }, [goToPage, page, iterations]);
-  if (iterations === 1) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_redirect["default"], {
-      goToIteration: goToIteration,
-      iteration: 0
-    });
-  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_roundabout["default"], {
     label: label,
     expressions: expressions,

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

@@ -25,7 +25,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function Suggester(_ref) {
   var _ref$className = _ref.className,
-    className = _ref$className === void 0 ? 'lunatic' : _ref$className,
+    className = _ref$className === void 0 ? 'lunatic-suggester-default-style' : _ref$className,
     _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? _i18n["default"].PLACEHOLDER : _ref$placeholder,
     _ref$onSelect = _ref.onSelect,

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

@@ -28,7 +28,6 @@ function LunaticSuggester(_ref) {
     missingResponse = _ref.missingResponse,
     management = _ref.management,
     response = _ref.response,
-    className = _ref.className,
     getSuggesterStatus = _ref.getSuggesterStatus;
   var onChange = (0, _useOnHandleChange["default"])({
     handleChange: handleChange,
@@ -56,8 +55,7 @@ function LunaticSuggester(_ref) {
       value: value,
       errors: errors,
       label: label,
-      getSuggesterStatus: getSuggesterStatus,
-      className: className
+      getSuggesterStatus: getSuggesterStatus
     })
   });
 }

package/lib/src/components/commons/components/combo-box/combo-box-container.d.ts

@@ -1,10 +1,8 @@
 import type { PropsWithChildren } from 'react';
-import { LunaticBaseProps } from '../../../type';
 type Props = PropsWithChildren<{
     className?: string;
     id?: string;
     classStyle?: string;
-    errors?: LunaticBaseProps['errors'];
 }>;
-declare const _default: import("react").ComponentType<Props>;
-export default _default;
+export declare function ComboBoxContainer({ children, className, id, classStyle, }: Props): import("react/jsx-runtime").JSX.Element;
+export {};

package/lib/src/components/commons/components/combo-box/combo-box-content.d.ts

@@ -4,7 +4,6 @@ type Props = PropsWithChildren<{
     onBlur: () => void;
     onFocus: () => void;
     onKeyDown: (key: string) => void;
-    className?: string;
 }>;
-export declare function ComboBoxContent({ children, focused, onFocus, onBlur, onKeyDown, className, }: Props): import("react/jsx-runtime").JSX.Element;
+export declare function ComboBoxContent({ children, focused, onFocus, onBlur, onKeyDown, }: Props): import("react/jsx-runtime").JSX.Element;
 export default ComboBoxContent;

package/lib/src/components/commons/components/combo-box/combo-box.stories.d.ts

@@ -10,7 +10,6 @@ export declare const Default: Story<{
     editable?: boolean | undefined;
     labelId?: string | undefined;
     id?: string | undefined;
-    className?: string | undefined;
 } & import("./selection/label-selection").LabelSelectionProps & import("./panel/panel").PanelProps & {
     className?: string | undefined;
     classStyle?: string | undefined;

package/lib/src/components/commons/components/combo-box/panel/panel-container.d.ts

@@ -4,5 +4,5 @@ type Props = PropsWithChildren<{
     expanded?: boolean;
     id?: string;
 }>;
-declare const _default: import("react").ComponentType<Props>;
-export default _default;
+export declare function PanelContainer({ children, focused, expanded, id }: Props): import("react/jsx-runtime").JSX.Element;
+export {};

package/lib/src/components/commons/components/combo-box/selection/selection-container.d.ts

@@ -5,7 +5,6 @@ type Props = PropsWithChildren<{
     disabled?: boolean;
     labelId?: string;
     id?: string;
-    className?: string;
 }>;
-declare function SelectionContainer({ children, id, expanded, focused, disabled, labelId, className, }: Props): import("react/jsx-runtime").JSX.Element;
+declare function SelectionContainer({ children, id, expanded, focused, disabled, labelId, }: Props): import("react/jsx-runtime").JSX.Element;
 export default SelectionContainer;

package/lib/src/components/commons/components/combo-box/selection/selection.d.ts

@@ -6,6 +6,5 @@ export type SelectionProps = {
     editable?: boolean;
     labelId?: string;
     id?: string;
-    className?: string;
 } & LabelSelectionProps;
-export declare function Selection({ labelRenderer, placeholder, search, expanded, disabled, focused, onChange, selectedIndex, options, editable, labelId, id, className, }: SelectionProps): import("react/jsx-runtime").JSX.Element;
+export declare function Selection({ labelRenderer, placeholder, search, expanded, disabled, focused, onChange, selectedIndex, options, editable, labelId, id, }: SelectionProps): import("react/jsx-runtime").JSX.Element;

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

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

package/lib/stories/roundabout/data1.json

@@ -0,0 +1,25 @@
+{
+	"COLLECTED": {
+		"NB_HAB": {
+			"EDITED": null,
+			"FORCED": null,
+			"INPUTED": null,
+			"PREVIOUS": null,
+			"COLLECTED": 1
+		},
+		"PRENOMS": {
+			"EDITED": [null],
+			"FORCED": [null],
+			"INPUTED": [null],
+			"PREVIOUS": [null],
+			"COLLECTED": ["Fanny"]
+		},
+		"AGE": {
+			"EDITED": [null],
+			"FORCED": [null],
+			"INPUTED": [null],
+			"PREVIOUS": [null],
+			"COLLECTED": [15]
+		}
+	}
+}

package/lib/stories/roundabout/roundabout.stories.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Default = void 0;
+exports["default"] = exports.OneIteration = exports.Default = void 0;
 var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
 var _source = _interopRequireDefault(require("./source"));
-var _data = _interopRequireDefault(require("./data"));
+var _data = _interopRequireDefault(require("./data1"));
+var _data2 = _interopRequireDefault(require("./data2"));
 var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -32,6 +33,13 @@ Default.args = {
   id: 'roundabout',
   source: _source["default"],
   pagination: true,
-  data: _data["default"],
-  readOnly: true
+  data: _data2["default"]
+};
+var OneIteration = Template.bind({});
+exports.OneIteration = OneIteration;
+OneIteration.args = {
+  id: 'roundabout-one-iteration',
+  source: _source["default"],
+  pagination: true,
+  data: _data["default"]
 };

package/lib/stories/suggester/simple.json

@@ -46,21 +46,6 @@
 				"value": "true",
 				"type": "VTL"
 			},
-			"controls": [
-				{
-					"id": "age-controls",
-					"criticality": "ERROR",
-					"typeOfControl": "FORMAT",
-					"control": {
-						"value": "not(isnull(HELLO))",
-						"type": "VTL"
-					},
-					"errorMessage": {
-						"value": "\"Veuillez selectionner quelquechose\"",
-						"type": "VTL"
-					}
-				}
-			],
 			"response": {
 				"name": "HELLO"
 			},

package/lib/use-lunatic/commons/page.js

@@ -34,11 +34,23 @@ function isPageEmpty(state) {
     pager = state.pager;
   var iteration = pager.iteration;
   var components = (0, _index.getComponentsFromState)(state);
-  return components.filter(function (component) {
+  var visibleComponents = components.filter(function (component) {
     var conditionFilter = component.conditionFilter;
     if (conditionFilter) {
       return (0, _index.executeConditionFilter)(conditionFilter, executeExpression, iteration);
     }
     return true;
-  }).length === 0;
+  });
+
+  // No components are displayable on this page
+  if (visibleComponents.length === 0) {
+    return true;
+  }
+
+  // We have a roundabout with only one iteration
+  var firstComponent = visibleComponents[0];
+  if (visibleComponents.length === 1 && (firstComponent === null || firstComponent === void 0 ? void 0 : firstComponent.componentType) === 'Roundabout' && executeExpression(firstComponent.iterations) === 1) {
+    return true;
+  }
+  return false;
 }

package/lib/use-lunatic/reducer/commons/auto-explore-loop.js

@@ -20,15 +20,28 @@ function autoExploreLoop(state) {
   var pageId = (0, _page.getPageId)(newPager);
   var page = state.pages[pageId];
   var isForward = direction === 'forward';
-  // The page is a loop
-  if (page.isLoop && page.subPages && page.subPages.length > 0) {
-    var maxSubPage = page.subPages.length;
-    var firstSubPage = (0, _page.pageStringToNumbers)(page.subPages[isForward ? 0 : maxSubPage - 1]);
+  var goInsideSubpage = function goInsideSubpage(subPages, nbIteration) {
+    var maxSubPage = subPages.length;
+    var firstSubPage = (0, _page.pageStringToNumbers)(subPages[isForward ? 0 : maxSubPage - 1]);
     newPager.page = firstSubPage[0].toString();
     newPager.subPage = firstSubPage[1] - 1; // Subpage starts at 0
     newPager.nbSubPages = maxSubPage;
     newPager.nbIterations = state.executeExpression(page.iterations);
     newPager.iteration = isForward ? 0 : newPager.nbIterations - 1;
+  };
+
+  // The page is a loop
+  if (page.isLoop && page.subPages && page.subPages.length > 0) {
+    goInsideSubpage(page.subPages, state.executeExpression(page.iterations));
+  }
+
+  // The page contains a roundabout, go to the first iteration if it only has one iteration
+  var firstComponent = page.components[0];
+  if (page.components[0].componentType === 'Roundabout' && page.subPages && page.subPages.length > 0 && isForward) {
+    var nbIterations = state.executeExpression(page.iterations);
+    if (nbIterations === 1) {
+      goInsideSubpage(page.subPages, 1);
+    }
   }
   return _objectSpread(_objectSpread({}, state), {}, {
     isInLoop: newPager.nbIterations !== undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.5.1-panelContainer",
+	"version": "2.5.1-testRoundaboutFix",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {

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

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ComboBoxContentBox = ComboBoxContentBox;
-exports["default"] = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _index = require("../../index");
-var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function ComboBoxContentBox(_ref) {
-  var children = _ref.children,
-    className = _ref.className,
-    onFocus = _ref.onFocus,
-    onKeyDown = _ref.onKeyDown,
-    focused = _ref.focused;
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _classnames["default"])("".concat(className !== null && className !== void 0 ? className : 'lunatic', "-combo-box"), {
-      focused: focused
-    }),
-    onFocus: onFocus,
-    onClick: onFocus,
-    onKeyDown: onKeyDown,
-    children: children
-  });
-}
-var _default = (0, _index.createCustomizableLunaticField)(ComboBoxContentBox, 'ComboboxContentBox');
-exports["default"] = _default;

package/lib/src/components/commons/components/combo-box/combo-box-content-box.d.ts

@@ -1,11 +0,0 @@
-import type { KeyboardEvent } from 'react';
-import React, { PropsWithChildren } from 'react';
-type Props = PropsWithChildren<{
-    focused?: boolean;
-    onFocus: () => void;
-    onKeyDown: (e: KeyboardEvent<Element>) => void;
-    className?: string;
-}>;
-export declare function ComboBoxContentBox({ children, className, onFocus, onKeyDown, focused, }: Props): import("react/jsx-runtime").JSX.Element;
-declare const _default: React.ComponentType<Props>;
-export default _default;