ublo-lib 1.50.2 → 1.50.4

package/es/future/components/msem-package/components/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/future/components/msem-package/components/config.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC;AAIvC,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;CAC/D,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,2CA+EpE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/future/components/msem-package/components/config.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC;AAIvC,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;CAC/D,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,2CA0FpE"}

package/es/future/components/msem-package/components/config.js

@@ -4,10 +4,9 @@ import { useMsemRuntime } from "../context";
 import styles from "./config.module.css";
 export default function Config({ idPrefix, config, setConfig }) {
     const ref = React.useRef(null);
-    const { menuPath, lang, path, Zone, cmsMode } = useMsemRuntime();
+    const { menuPath, lang, path, Zone } = useMsemRuntime();
     const initializedRef = React.useRef(false);
     const prevRouteRef = React.useRef(`/${lang}${path}`);
-    const prevModeRef = React.useRef(cmsMode);
     const originalConfigRef = React.useRef(null);
     const parseZone = React.useCallback(() => {
         const container = ref.current;
@@ -45,15 +44,19 @@ export default function Config({ idPrefix, config, setConfig }) {
         }
     }, [lang, path, parseZone, setConfig]);
     React.useEffect(() => {
-        const prev = prevModeRef.current;
-        prevModeRef.current = cmsMode;
-        if (prev === "editing" && cmsMode && cmsMode !== "editing") {
+        const reloadIfChanged = () => {
             const original = originalConfigRef.current;
             const changed = !original || JSON.stringify(config) !== JSON.stringify(original);
             if (changed)
                 window.location.reload();
-        }
-    }, [cmsMode, config]);
+        };
+        document.addEventListener("ublo-content-saved", reloadIfChanged);
+        document.addEventListener("ublo-content-discarded", reloadIfChanged);
+        return () => {
+            document.removeEventListener("ublo-content-saved", reloadIfChanged);
+            document.removeEventListener("ublo-content-discarded", reloadIfChanged);
+        };
+    }, [config]);
     React.useEffect(() => {
         const container = ref.current;
         if (initializedRef.current && container) {

package/es/future/components/msem-package/components/widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widget.d.ts","sourceRoot":"","sources":["../../../../../src/future/components/msem-package/components/widget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC;AAIvC,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IACtD,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACnE,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAuBF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,KAAK,EACL,MAAM,EACN,MAAM,EACN,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,GAAG,EACH,MAAM,EACN,cAAc,EACd,iBAAiB,EACjB,SAAS,GACV,EAAE,KAAK,2CAkQP"}
+{"version":3,"file":"widget.d.ts","sourceRoot":"","sources":["../../../../../src/future/components/msem-package/components/widget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC;AAIvC,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IACtD,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,iBAAiB,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACnE,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAuBF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,KAAK,EACL,MAAM,EACN,MAAM,EACN,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,GAAG,EACH,MAAM,EACN,cAAc,EACd,iBAAiB,EACjB,SAAS,GACV,EAAE,KAAK,2CAqQP"}

package/es/future/components/msem-package/components/widget.js

@@ -54,6 +54,15 @@ export default function Widget({ index, config, widget, step, setStep, stay, pax
         needsStay ||
         needsPax ||
         (optional ? otherStepOpen : !completedSteps.includes(index - 1));
+    React.useEffect(() => {
+        if (!isStarted)
+            return;
+        window.requestAnimationFrame(() => {
+            ref.current
+                ?.closest("[data-msem-reserve]")
+                ?.scrollIntoView({ behavior: "smooth", block: "start" });
+        });
+    }, [isStarted, count]);
     const startWidget = (force) => {
         if (!force && (isDisabled || isStarted || done))
             return;
@@ -61,12 +70,6 @@ export default function Widget({ index, config, widget, step, setStep, stay, pax
             setOptionalRepeat(optionalRepeat + 1);
         }
         setStep(id);
-        const container = ref.current;
-        if (container) {
-            setTimeout(() => {
-                container.scrollIntoView({ behavior: "smooth" });
-            }, 600);
-        }
     };
     const addPerson = (e) => {
         e.stopPropagation();
@@ -80,8 +83,6 @@ export default function Widget({ index, config, widget, step, setStep, stay, pax
         setStep(null);
     };
     const handleCartChange = () => {
-        if (widgetContainerRef.current)
-            widgetContainerRef.current.scrollIntoView();
         if (!repeatable) {
             setAddedToCart(true);
             setCompletedSteps([...completedSteps, index]);

package/es/future/components/msem-package/components/widgets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widgets.d.ts","sourceRoot":"","sources":["../../../../../src/future/components/msem-package/components/widgets.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC;AAKvC,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAC9B,OAAO,EACP,MAAM,EACN,IAAI,EACJ,GAAG,EACH,SAAS,GACV,EAAE,KAAK,2CAgJP"}
+{"version":3,"file":"widgets.d.ts","sourceRoot":"","sources":["../../../../../src/future/components/msem-package/components/widgets.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC;AAKvC,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAC9B,OAAO,EACP,MAAM,EACN,IAAI,EACJ,GAAG,EACH,SAAS,GACV,EAAE,KAAK,2CAmKP"}

package/es/future/components/msem-package/components/widgets.js

@@ -9,7 +9,7 @@ import T from "../i18n/translations";
 import * as Api from "../utils/api";
 import styles from "./widgets.module.css";
 export default function Widgets({ cartUrl, config, stay, pax, validated, }) {
-    const { lang, langPrefixLinks: hasLangPrefix, esfplusUrl } = useMsemRuntime();
+    const { esfplusUrl } = useMsemRuntime();
     const { widgets, optionalWidgets, id } = config;
     const [step, setStep] = React.useState(null);
     const [completedSteps, setCompletedSteps] = React.useState([-1]);
@@ -19,8 +19,18 @@ export default function Widgets({ cartUrl, config, stay, pax, validated, }) {
     const packageUUID = React.useMemo(() => {
         return new Date().getTime().toString(36);
     }, [flowKey]);
+    const rootRef = React.useRef(null);
     const packageId = `${id}-${packageUUID}`;
     const packageUncompleted = completedSteps.length - 1 !== widgets?.length;
+    React.useEffect(() => {
+        if (!packageUncompleted && step === null) {
+            window.requestAnimationFrame(() => {
+                rootRef.current
+                    ?.closest("[data-msem-reserve]")
+                    ?.scrollIntoView({ behavior: "smooth", block: "start" });
+            });
+        }
+    }, [packageUncompleted, step]);
     const currentPackageInfo = React.useRef(null);
     React.useEffect(() => {
         currentPackageInfo.current = { packageId, uncompleted: packageUncompleted };
@@ -55,18 +65,24 @@ export default function Widgets({ cartUrl, config, stay, pax, validated, }) {
             setCompletedOptionalSteps([-1]);
             setFlowKey((k) => k + 1);
         }
+        else if (!prev && validated && widgets?.length) {
+            const datedPack = config.stay?.dated ?? Boolean(config.stay?.from || config.stay?.to);
+            const requiresChoice = (datedPack && !config.stay?.forced) ||
+                (config.pax?.mode === "range" && !config.pax?.hidden);
+            if (requiresChoice)
+                setStep(widgets[0].id);
+        }
     }, [validated]);
     if (!widgets?.length)
         return null;
     const submit = () => {
-        const prefix = hasLangPrefix ? `/${lang}` : "";
-        window.location.href = `${prefix}${cartUrl}`;
+        window.location.href = cartUrl;
     };
     const dated = config.stay?.dated ?? Boolean(config.stay?.from || config.stay?.to);
     const paxRangeVisible = config.pax?.mode === "range" && !config.pax?.hidden;
     const missingStay = dated && (!stay?.from || !stay?.to);
     const missingPax = paxRangeVisible && pax == null;
-    return (_jsxs("div", { className: styles.widgets, children: [validated && missingStay && (_jsx(Information, { type: "warning", className: styles.warning, children: _jsx(T, { id: "widgets.missing-stay" }) })), validated && !missingStay && missingPax && (_jsx(Information, { type: "warning", className: styles.warning, children: _jsx(T, { id: "widgets.missing-pax" }) })), widgets.map((widget, i) => {
+    return (_jsxs("div", { ref: rootRef, className: styles.widgets, children: [validated && missingStay && (_jsx(Information, { type: "warning", className: styles.warning, children: _jsx(T, { id: "widgets.missing-stay" }) })), validated && !missingStay && missingPax && (_jsx(Information, { type: "warning", className: styles.warning, children: _jsx(T, { id: "widgets.missing-pax" }) })), widgets.map((widget, i) => {
                 return (_jsx(Widget, { index: i, config: config, widget: widget, step: step, setStep: setStep, stay: stay, pax: pax, locked: !validated, completedSteps: completedSteps, setCompletedSteps: setCompletedSteps, packageId: packageId }, `${flowKey}-${widget.id}`));
             }), optionalWidgets?.length > 0 && (_jsxs(_Fragment, { children: [_jsx("div", { className: styles.title, children: _jsx(T, { id: "widgets.options" }) }), optionalWidgets.map((widget, i) => (_jsx(Widget, { index: i, config: config, widget: widget, stay: stay, pax: pax, locked: !validated || packageUncompleted, step: optionalStep, setStep: setOptionalStep, completedSteps: completedOptionalSteps, setCompletedSteps: setCompletedOptionalSteps, packageId: packageId }, `${flowKey}-${widget.id}`)))] })), !packageUncompleted && (_jsx("div", { className: styles.buttons, children: _jsxs(Button, { className: styles.submit, onClick: submit, children: [_jsx(Icons.ShoppingCart, {}), _jsx(T, { id: "widgets.submit" })] }) }))] }));
 }

package/es/future/components/msem-package/context.d.ts

@@ -6,7 +6,6 @@ export type MsemRuntime = {
     menuPath?: {
         id?: number | string;
     } | null;
-    langPrefixLinks: boolean;
     esfplusUrl: string;
     Zone: React.ComponentType<any>;
     DatePicker: React.ComponentType<any>;

package/es/future/components/msem-package/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/future/components/msem-package/context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC3C,eAAe,EAAE,OAAO,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC/B,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;CACnD,CAAC;AAGF,eAAO,MAAM,mBAAmB,6BAA8B,CAAC;AAE/D,wBAAgB,cAAc,IAAI,WAAW,CAI5C"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/future/components/msem-package/context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC/B,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;CACnD,CAAC;AAGF,eAAO,MAAM,mBAAmB,6BAA8B,CAAC;AAE/D,wBAAgB,cAAc,IAAI,WAAW,CAK5C"}

package/es/future/components/msem-package/core.js

@@ -24,5 +24,5 @@ export default function MseMPackage({ idPrefix, editorOptions, cartUrl, runtime,
         if (configLoaded && !requiresChoice)
             setValidated(true);
     }, [configLoaded, requiresChoice]);
-    return (_jsx(MsemRuntimeProvider, { value: runtime, children: _jsxs("div", { className: styles.container, children: [_jsx(Config, { idPrefix: idPrefix, config: config, setConfig: setConfig }), isEditing && (_jsxs("div", { className: styles.editor, children: [_jsx("h2", { className: styles.editorTitle, children: "Param\u00E9trage du pack" }), _jsx(GlobalSettings, { config: config, setConfig: setConfig }), _jsx(StaySettings, { config: config, setConfig: setConfig }), _jsx(PaxSettings, { config: config, setConfig: setConfig }), _jsx(WidgetsSettings, { config: config, setConfig: setConfig, editorOptions: editorOptions })] })), !isEditing && (_jsxs("div", { className: styles.reserve, children: [_jsx(Filters, { config: config, stay: stay, setStay: setStay, pax: pax, setPax: setPax, validated: validated, setValidated: setValidated }), _jsx(Widgets, { cartUrl: cartUrl, config: config, stay: stay, pax: pax, validated: validated })] }))] }) }));
+    return (_jsx(MsemRuntimeProvider, { value: runtime, children: _jsxs("div", { className: styles.container, children: [_jsx(Config, { idPrefix: idPrefix, config: config, setConfig: setConfig }), isEditing && (_jsxs("div", { className: styles.editor, children: [_jsx("h2", { className: styles.editorTitle, children: "Param\u00E9trage du pack" }), _jsx(GlobalSettings, { config: config, setConfig: setConfig }), _jsx(StaySettings, { config: config, setConfig: setConfig }), _jsx(PaxSettings, { config: config, setConfig: setConfig }), _jsx(WidgetsSettings, { config: config, setConfig: setConfig, editorOptions: editorOptions })] })), !isEditing && (_jsxs("div", { className: styles.reserve, "data-msem-reserve": true, children: [_jsx(Filters, { config: config, stay: stay, setStay: setStay, pax: pax, setPax: setPax, validated: validated, setValidated: setValidated }), _jsx(Widgets, { cartUrl: cartUrl, config: config, stay: stay, pax: pax, validated: validated })] }))] }) }));
 }

package/es/future/components/msem-package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/future/components/msem-package/index.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,KAAK,MAAM,SAAS,CAAC;AAEtC,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,QAAQ,CAAC;AACzC,cAAc,WAAW,CAAC;AAE1B,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,KAAK,EAAE,KAAK,2CAe/C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/future/components/msem-package/index.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,KAAK,MAAM,SAAS,CAAC;AAEtC,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,QAAQ,CAAC;AACzC,cAAc,WAAW,CAAC;AAE1B,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,KAAK,EAAE,KAAK,2CAc/C"}

package/es/future/components/msem-package/index.js

@@ -9,14 +9,13 @@ export * from "./types";
 export { default as Core } from "./core";
 export * from "./context";
 export default function MseMPackage(props) {
-    const { cmsMode, lang, path, menuPath, config } = useUbloContext();
+    const { cmsMode, lang, path, menuPath } = useUbloContext();
     const { publicRuntimeConfig } = getConfig();
     const runtime = {
         cmsMode,
         lang,
         path,
         menuPath,
-        langPrefixLinks: config.langPrefix.links,
         esfplusUrl: publicRuntimeConfig.esfplusUrl,
         Zone,
         DatePicker,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.50.2",
+  "version": "1.50.4",
   "peerDependencies": {
     "classnames": "^2.5.1",
     "dt-design-system": "^3.12.0",