ublo-lib 1.1.14 → 1.1.16

package/es/lbm/components/msem-linker/editor/ski-pass.js

@@ -78,7 +78,6 @@ const SkiPass = ({
   const [filters, setFilters] = React.useState();
   const [data, setData] = React.useState(getDefaultData(config));
   const [presetUrl, setPresetUrl] = React.useState("");
-  const firstRender = React.useRef(true);
   const resortData = resorts?.find(r => {
     return r.resort === parseInt(selectedResort);
   });
@@ -135,45 +134,58 @@ const SkiPass = ({
   const selectedDomains = data.domains.map(domain => filters?.domains?.find(d => d.value === domain));
   const selectedDurations = data.durations.map(domain => filters?.durations?.find(d => d.value === domain));
 
-  const updateField = field => value => {
-    const isFrom = field === "stayFrom";
-    const isTo = field === "stayTo";
+  const updateField = (field, isArray) => value => {
+    if (isArray) {
+      setData(data => ({ ...data,
+        [field]: value.map(v => v.value)
+      }));
+    } else {
+      setData(data => ({ ...data,
+        [field]: value
+      }));
+    }
+  };
 
-    if (isFrom) {
-      const from = new Date(value);
-      const to = new Date(data.stayTo);
+  const updateStayFrom = value => {
+    const from = new Date(value);
+    const to = new Date(data.stayTo);
 
-      if (from > to || !data.stayTo) {
-        return setData({ ...data,
-          [field]: value,
-          stayTo: value
-        });
-      }
+    if (from > to || !data.stayTo) {
+      updateField("stayTo")(value);
+    }
 
-      return setData({ ...data,
-        [field]: value
-      });
+    updateField("stayFrom")(value);
+  };
+
+  const updateStayTo = value => {
+    const from = new Date(data.stayFrom);
+    const to = new Date(value);
+
+    if (from > to || !data.stayFrom) {
+      updateField("stayFrom")(value);
     }
 
-    if (isTo) {
-      const from = new Date(data.stayFrom);
-      const to = new Date(value);
+    updateField("stayTo")(value);
+  };
 
-      if (from > to || !data.stayFrom) {
-        return setData({ ...data,
-          [field]: value,
-          stayFrom: value
-        });
-      }
+  const updateFirstSkiDate = value => {
+    if (!data.stayFrom) {
+      updateField("stayFrom")(value);
+    }
 
-      return setData({ ...data,
-        [field]: value
-      });
+    if (!data.stayTo) {
+      updateField("stayTo")(value);
     }
 
-    setData({ ...data,
-      [field]: value
-    });
+    updateField("firstSkiDate")(value);
+  };
+
+  const updateDomains = value => {
+    if (value.length > 0) {
+      updateField("durations", true)([]);
+    }
+
+    updateField("domains", true)(value);
   };
 
   const updateSkiers = code => value => {
@@ -184,10 +196,6 @@ const SkiPass = ({
     });
   };
 
-  const updateCatalog = value => {
-    setCatalog(value);
-  };
-
   const copyPresetsUrl = async () => {
     try {
       await navigator.clipboard.writeText(presetUrl);
@@ -279,18 +287,6 @@ const SkiPass = ({
       }
     }
   }, [catalog, data, kind, lang, selectedResort, setConfig, widgetUrl]);
-  React.useEffect(() => {
-    if (firstRender.current) {
-      firstRender.current = false;
-      return;
-    }
-
-    if (data.domains.length > 0) {
-      setData(data => ({ ...data,
-        durations: []
-      }));
-    }
-  }, [data.domains]);
 
   if (!ready) {
     return _jsx("div", {
@@ -299,12 +295,6 @@ const SkiPass = ({
     });
   }
 
-  const updateFilter = kind => newValues => {
-    setData(data => ({ ...data,
-      [kind]: newValues.map(v => v.value)
-    }));
-  };
-
   return _jsxs("div", {
     className: styles.skiPass,
     children: [_jsx("div", {
@@ -313,7 +303,7 @@ const SkiPass = ({
     }), _jsx(Select, {
       options: formatedCatalogs,
       value: catalog,
-      onValueChange: updateCatalog
+      onValueChange: setCatalog
     }), !catalog || !data ? _jsx("div", {
       className: styles.tip,
       children: "Vous devez selectionner un catalogue avant de pouvoir ajouter des presets"
@@ -327,17 +317,17 @@ const SkiPass = ({
           type: "date",
           label: messages.from,
           value: data.stayFrom,
-          onValueChange: updateField("stayFrom")
+          onValueChange: updateStayFrom
         }), _jsx(Input, {
           type: "date",
           label: messages.to,
           value: data.stayTo,
-          onValueChange: updateField("stayTo")
+          onValueChange: updateStayTo
         }), _jsx(Input, {
           type: "date",
           label: messages.firstSkiDate,
           value: data.firstSkiDate,
-          onValueChange: updateField("firstSkiDate"),
+          onValueChange: updateFirstSkiDate,
           min: data?.stayFrom || undefined,
           max: data?.stayTo || undefined
         })]
@@ -372,7 +362,7 @@ const SkiPass = ({
         label: messages.activities,
         options: activities,
         values: selectedActivities,
-        onChange: updateFilter("activities")
+        onChange: updateField("activities", true)
       }), _jsxs("div", {
         className: styles.row,
         children: [filteredDomains?.length > 0 && _jsx(MutlipleSelect, {
@@ -380,13 +370,13 @@ const SkiPass = ({
           label: messages.domains,
           options: filteredDomains,
           values: selectedDomains,
-          onChange: updateFilter("domains")
+          onChange: updateDomains
         }), filteredDurations?.length > 0 && _jsx(MutlipleSelect, {
           placeholder: "Selectionnez une ou plusieurs options",
           label: messages.durations,
           options: filteredDurations,
           values: selectedDurations,
-          onChange: updateFilter("durations"),
+          onChange: updateField("durations", true),
           disabled: data.domains?.length === 0
         })]
       }), widgetUrl && _jsxs(_Fragment, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "peerDependencies": {
     "dt-design-system": "^2.1.0",
     "next": "^12.0.0",