ublo-lib 1.6.19 → 1.6.21

package/es/common/components/editable-map/edit-form.js

@@ -21,7 +21,7 @@ const EditForm = ({
     description,
     url,
     label,
-    popupOpened
+    tooltipOpened
   } = marker;
   const removeMarker = e => {
     e.stopPropagation();
@@ -79,9 +79,9 @@ const EditForm = ({
         compact: true
       })]
     }), _jsx(Checkbox, {
-      label: "Ouvert par d\xE9faut",
-      checked: popupOpened,
-      onCheckedChange: updateMarker("popupOpened")
+      label: "Tooltip affich\xE9 par d\xE9faut",
+      checked: tooltipOpened,
+      onCheckedChange: updateMarker("tooltipOpened")
     }), _jsxs("div", {
       className: css.buttons,
       children: [_jsxs(Button, {

package/es/common/components/editable-map/editable-map.js

@@ -64,11 +64,9 @@ const EditableMap = ({
         setZoom: setZoom,
         setCenter: setCenter
       }), _jsx(Markers, {
-        map: ref,
         markers: markers,
         setMarkers: setMarkers,
-        iconSet: iconSet,
-        isInDialog: isInDialog
+        iconSet: iconSet
       })]
     }), cmsMode === "editing" && _jsx(Helper, {})]
   });

package/es/common/components/editable-map/map-events.js

@@ -6,7 +6,7 @@ const DEFAULT_MARKER_DATA = {
   description: "",
   url: "",
   label: "",
-  popupOpened: false
+  tooltipOpened: false
 };
 const MapEvents = ({
   mapRef,

package/es/common/components/editable-map/markers.js

@@ -10,8 +10,6 @@ import PopupData from "./popup-data";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const Marker = ({
-  isInDialog,
-  map,
   marker,
   setMarkers,
   iconSet,
@@ -23,7 +21,7 @@ const Marker = ({
     icon,
     title,
     position,
-    popupOpened
+    tooltipOpened
   } = marker;
   const Icon = Icons[iconSet][icon] || Icons[iconSet].Location;
   const updatePosition = e => {
@@ -39,16 +37,13 @@ const Marker = ({
       });
     });
   };
-  React.useEffect(() => {
-    if (!isEditing && popupOpened) {
-      popupRef.current.setLatLng(position).openOn(map.current);
-      if (isInDialog) {
-        setInterval(() => {
-          popupRef.current.update();
-        }, 1000);
-      }
-    }
-  }, [isEditing, isInDialog, map, popupOpened, position]);
+  const tooltipProps = tooltipOpened ? {
+    direction: "right",
+    permanent: true,
+    offset: [6, -14]
+  } : {
+    sticky: true
+  };
   return _jsxs(LeafletMarker, {
     draggable: isEditing,
     eventHandlers: {
@@ -62,11 +57,10 @@ const Marker = ({
       html: ReactDOM.renderToString(_jsx(Icon, {}))
     }),
     children: [!isEditing && _jsx(Tooltip, {
-      sticky: true,
+      ...tooltipProps,
       children: title
     }), _jsx(Popup, {
       ref: popupRef,
-      className: css.popup,
       children: isEditing ? _jsx(EditForm, {
         popupRef: popupRef,
         marker: marker,
@@ -79,8 +73,6 @@ const Marker = ({
   }, id);
 };
 const Markers = ({
-  isInDialog,
-  map,
   markers,
   setMarkers,
   iconSet
@@ -91,8 +83,6 @@ const Markers = ({
   const isEditing = cmsMode === "editing";
   return markers.map((marker, i) => {
     return _jsx(Marker, {
-      isInDialog: isInDialog,
-      map: map,
       marker: marker,
       setMarkers: setMarkers,
       iconSet: iconSet,

package/es/common/components/editable-map/markers.module.css

@@ -4,8 +4,3 @@
   fill: var(--ds-secondary, var(--ds-blue-400, #4177f6));
   transform: translate(-35%, -65%);
 }
-
-.popup {
-  transition: all 160ms
-    var(--ds-transition-easing, cubic-bezier(0.4, 0.1, 0.2, 0.9)) !important;
-}

package/es/esf/components/magic-box/filter.js

@@ -36,8 +36,8 @@ const Filter = ({
       className: css.filterLabel,
       children: message(lang, code)
     }), _jsx(Select, {
-      value: values[code],
       options: options,
+      value: values[code],
       onValueChange: updateFilter
     })]
   });

package/es/esf/components/magic-box/magic-box.js

@@ -18,6 +18,7 @@ const MagicBox = ({
   className,
   alignContent,
   maxCPDuration,
+  minDays = 0,
   children
 }) => {
   const [filters, setFilters] = React.useState();
@@ -68,16 +69,28 @@ const MagicBox = ({
       filters,
       activities
     });
-    const {
-      filters: newFilters
-    } = filtersResult;
+    const newFilters = Object.keys(filtersResult.filters).reduce((acc, key) => {
+      const filter = filtersResult.filters[key];
+      if (key !== "days") {
+        return {
+          ...acc,
+          filter
+        };
+      } else {
+        const filteredDays = filter.filter(item => item.value > minDays);
+        return {
+          ...acc,
+          [key]: filteredDays
+        };
+      }
+    }, {});
     setFilters(newFilters);
     const defaultValues = Object.keys(newFilters).reduce((acc, key) => ({
       ...acc,
       [key]: ""
     }), {});
     !values && setValues(defaultValues);
-  }, [lang, resort, stay, values]);
+  }, [lang, minDays, resort, stay, values]);
   React.useEffect(() => {
     if (stay) {
       refreshFilters();

package/package.json

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