ublo-lib 1.31.42 → 1.31.44

package/es/common/components/editable-map/icons/viarmonia.d.ts

@@ -0,0 +1,3 @@
+export function Location(props: any): React.JSX.Element;
+export function Pebbles(props: any): React.JSX.Element;
+import * as React from "react";

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

@@ -1,45 +1,31 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import * as React from "react";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 export function Location(props) {
-  return _jsxs(Icon, {
-    ...props,
-    children: [_jsx("path", {
-      d: "M2 12a10 10 0 1 1 20 0 10 10 0 0 1-20 0Z"
-    }), _jsx("path", {
-      fillRule: "evenodd",
-      clipRule: "evenodd",
-      d: "M0 12a12 12 0 1 1 24 0 12 12 0 0 1-24 0ZM12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20Z",
-      fill: "#fff"
-    })]
-  }, "1");
+    return (<Icon key="1" {...props}>
+      <path d="M2 12a10 10 0 1 1 20 0 10 10 0 0 1-20 0Z"/>
+      <path fillRule="evenodd" clipRule="evenodd" d="M0 12a12 12 0 1 1 24 0 12 12 0 0 1-24 0ZM12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20Z" fill="#fff"/>
+    </Icon>);
 }
 export function Pebbles(props) {
-  return _jsxs(Icon, {
-    ...props,
-    children: [_jsx("path", {
-      d: "M2 12a10 10 0 1 1 20 0 10 10 0 0 1-20 0Z"
-    }), _jsx("path", {
-      fillRule: "evenodd",
-      clipRule: "evenodd",
-      d: "M0 12a12 12 0 1 1 24 0 12 12 0 0 1-24 0ZM12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20Z",
-      fill: "#fff"
-    }), _jsx("path", {
-      d: "M18.84 17.57h-3.6c.3-.13.6-.24.9-.38.64-.26 1.2-.7 1.6-1.25.25-.38.36-.79.28-1.24-.1-.5-.38-.94-.79-1.24-.6-.5-1.3-.86-2.06-1.07-.33-.1-.67-.17-1.01-.25.28-.1.55-.18.81-.29a3.1 3.1 0 0 0 1.05-.68c.26-.27.41-.58.38-.97-.04-.42-.28-.72-.58-.97a4.57 4.57 0 0 0-1.85-.8c-.07-.03-.15-.03-.23-.08l.18-.07c.26-.11.5-.26.7-.45.51-.46.52-1.1.02-1.6-.23-.2-.5-.38-.8-.5-.19-.08-.4-.13-.62-.2l.14-.1c.28-.25.33-.62.12-.88-.1-.13-.24-.24-.39-.32a2.57 2.57 0 0 0-1.44-.21c-.35.03-.68.13-.96.35-.37.28-.41.7-.08 1.02.04.05.11.08.15.15l-.14.04c-.4.1-.76.26-1.09.5-.34.27-.6.59-.53 1.06.04.38.29.64.58.86.2.15.43.25.7.36l-.58.15c-.63.15-1.22.46-1.7.9-.54.53-.54 1.25 0 1.78.32.33.72.54 1.15.71.22.1.46.15.72.24-.55.1-1.05.23-1.53.42-.7.24-1.33.64-1.85 1.16a1.77 1.77 0 0 0 0 2.52c.4.42.87.72 1.4.96l.86.37H5.23c-.23 0-.23 0-.23.23 0 .2 0 .2.21.2h13.52c.27 0 .26 0 .28-.28 0-.13-.05-.15-.17-.15Zm-2.5-3.04h.1c.26 0 .22-.04.23.22v.11c0 .08-.03.1-.1.1h-.09c-.29 0-.28 0-.29-.3 0-.1.04-.15.16-.13Zm-6.32-.73a3.1 3.1 0 0 0-1.74.64c-.19.15-.34.33-.46.54-.04.08-.08.1-.15.04l-.04-.01c-.27-.14-.27-.14-.1-.4.39-.53.95-.92 1.58-1.08.26-.08.52-.13.79-.16.24-.03.24-.03.24.2v.1c.02.1-.03.12-.12.13Zm1.67-7.02c-.43.04-.82.2-1.1.55-.03.04-.06.04-.09.01l-.17-.11c-.15-.1-.15-.1-.03-.24.35-.39.84-.62 1.37-.66.07 0 .1.03.1.1v.25c0 .06-.01.08-.08.1Zm4.05 8.45c.23 0 .23 0 .23.2 0 .23 0 .23-.24.23-.23 0-.23 0-.23-.23 0-.2 0-.2.23-.2Zm-.7 1.14c-.27 0-.23.04-.23-.24-.01-.2 0-.2.23-.2s.23 0 .23.22c0 .26.03.22-.23.22Z",
-      fill: "#fff"
-    })]
-  }, "2");
+    return (<Icon key="2" {...props}>
+      <path d="M2 12a10 10 0 1 1 20 0 10 10 0 0 1-20 0Z"/>
+      <path fillRule="evenodd" clipRule="evenodd" d="M0 12a12 12 0 1 1 24 0 12 12 0 0 1-24 0ZM12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20Z" fill="#fff"/>
+      <path d="M18.84 17.57h-3.6c.3-.13.6-.24.9-.38.64-.26 1.2-.7 1.6-1.25.25-.38.36-.79.28-1.24-.1-.5-.38-.94-.79-1.24-.6-.5-1.3-.86-2.06-1.07-.33-.1-.67-.17-1.01-.25.28-.1.55-.18.81-.29a3.1 3.1 0 0 0 1.05-.68c.26-.27.41-.58.38-.97-.04-.42-.28-.72-.58-.97a4.57 4.57 0 0 0-1.85-.8c-.07-.03-.15-.03-.23-.08l.18-.07c.26-.11.5-.26.7-.45.51-.46.52-1.1.02-1.6-.23-.2-.5-.38-.8-.5-.19-.08-.4-.13-.62-.2l.14-.1c.28-.25.33-.62.12-.88-.1-.13-.24-.24-.39-.32a2.57 2.57 0 0 0-1.44-.21c-.35.03-.68.13-.96.35-.37.28-.41.7-.08 1.02.04.05.11.08.15.15l-.14.04c-.4.1-.76.26-1.09.5-.34.27-.6.59-.53 1.06.04.38.29.64.58.86.2.15.43.25.7.36l-.58.15c-.63.15-1.22.46-1.7.9-.54.53-.54 1.25 0 1.78.32.33.72.54 1.15.71.22.1.46.15.72.24-.55.1-1.05.23-1.53.42-.7.24-1.33.64-1.85 1.16a1.77 1.77 0 0 0 0 2.52c.4.42.87.72 1.4.96l.86.37H5.23c-.23 0-.23 0-.23.23 0 .2 0 .2.21.2h13.52c.27 0 .26 0 .28-.28 0-.13-.05-.15-.17-.15Zm-2.5-3.04h.1c.26 0 .22-.04.23.22v.11c0 .08-.03.1-.1.1h-.09c-.29 0-.28 0-.29-.3 0-.1.04-.15.16-.13Zm-6.32-.73a3.1 3.1 0 0 0-1.74.64c-.19.15-.34.33-.46.54-.04.08-.08.1-.15.04l-.04-.01c-.27-.14-.27-.14-.1-.4.39-.53.95-.92 1.58-1.08.26-.08.52-.13.79-.16.24-.03.24-.03.24.2v.1c.02.1-.03.12-.12.13Zm1.67-7.02c-.43.04-.82.2-1.1.55-.03.04-.06.04-.09.01l-.17-.11c-.15-.1-.15-.1-.03-.24.35-.39.84-.62 1.37-.66.07 0 .1.03.1.1v.25c0 .06-.01.08-.08.1Zm4.05 8.45c.23 0 .23 0 .23.2 0 .23 0 .23-.24.23-.23 0-.23 0-.23-.23 0-.2 0-.2.23-.2Zm-.7 1.14c-.27 0-.23.04-.23-.24-.01-.2 0-.2.23-.2s.23 0 .23.22c0 .26.03.22-.23.22Z" fill="#fff"/>
+    </Icon>);
+}
+function Icon(_a) {
+    var { width = 24, height = 24 } = _a, props = __rest(_a, ["width", "height"]);
+    return (<svg viewBox={`0 0 ${width} ${height}`} width={width} height={height} {...props}>
+      {props.children}
+    </svg>);
 }
-function Icon({
-  width = 24,
-  height = 24,
-  ...props
-}) {
-  return _jsx("svg", {
-    viewBox: `0 0 ${width} ${height}`,
-    width: width,
-    height: height,
-    ...props,
-    children: props.children
-  });
-}

package/es/common/components/editable-map/index.d.ts

@@ -0,0 +1,4 @@
+export default function EditableMap({ iconSet, hideSlopes }: {
+    iconSet?: string;
+    hideSlopes: any;
+}): import("react-dom/node_modules/@types/react").ReactPortal[];

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

@@ -3,82 +3,74 @@ import * as ReactDOM from "react-dom";
 import dynamic from "next/dynamic";
 import Router from "next/router";
 import { useUbloContext } from "ublo/with-ublo";
-import { jsx as _jsx } from "react/jsx-runtime";
-const Map = dynamic(() => import("./editable-map"), {
-  ssr: false
-});
-export default function EditableMap({
-  iconSet = "esf",
-  hideSlopes
-}) {
-  const {
-    lang,
-    path
-  } = useUbloContext();
-  const [formats, setFormats] = React.useState([]);
-  const [refreshKey, setRefreshKey] = React.useState(0);
-  const refreshEditableMap = () => {
-    setRefreshKey(key => key + 1);
-  };
-  React.useEffect(() => {
-    window.refreshEditableMap = refreshEditableMap;
-    setFormats([]);
-    setTimeout(() => {
-      const elements = document.querySelectorAll("section.open-street-map");
-      if (elements.length) {
-        const formats = Array.from(elements).map(element => {
-          const isInDialog = Boolean(element?.closest("dialog"));
-          const isInZone = Boolean(element?.closest(".cms"));
-          const presetsOverrideElement = element?.closest("[data-map-presets-override]");
-          const storedPresetsOverride = presetsOverrideElement?.dataset.mapPresetsOverride;
-          const storedPresets = element.dataset.presets;
-          const presets = storedPresets ? JSON.parse(storedPresets) : {};
-          const presetsOverride = storedPresetsOverride ? JSON.parse(storedPresetsOverride) : {};
-          return {
-            element,
-            isInDialog,
-            isInZone,
-            presets: {
-              ...presets,
-              ...presetsOverride
+const Map = dynamic(() => import("./editable-map"), { ssr: false });
+export default function EditableMap({ iconSet = "esf", hideSlopes }) {
+    const { lang, path } = useUbloContext();
+    const [formats, setFormats] = React.useState([]);
+    const [refreshKey, setRefreshKey] = React.useState(0);
+    // 🤮🤮🤮
+    // Permet de forcer le refresh des cartes présentes dans le html des popups
+    // ouvertes par les boutons présents en colonne de droite et dans les offres
+    // des pages produit
+    // Pour ublo 3 permet de refresh les cartes lors de la navigation côté client
+    const refreshEditableMap = () => {
+        setRefreshKey((key) => key + 1);
+    };
+    React.useEffect(() => {
+        window.refreshEditableMap = refreshEditableMap;
+        setFormats([]);
+        setTimeout(() => {
+            const elements = document.querySelectorAll("section.open-street-map");
+            if (elements.length) {
+                const formats = Array.from(elements).map((element) => {
+                    const isInDialog = Boolean(element === null || element === void 0 ? void 0 : element.closest("dialog"));
+                    const isInZone = Boolean(element === null || element === void 0 ? void 0 : element.closest(".cms"));
+                    const presetsOverrideElement = element === null || element === void 0 ? void 0 : element.closest("[data-map-presets-override]");
+                    const storedPresetsOverride = presetsOverrideElement === null || presetsOverrideElement === void 0 ? void 0 : presetsOverrideElement.dataset.mapPresetsOverride;
+                    const storedPresets = element.dataset.presets;
+                    const presets = storedPresets ? JSON.parse(storedPresets) : {};
+                    const presetsOverride = storedPresetsOverride
+                        ? JSON.parse(storedPresetsOverride)
+                        : {};
+                    return {
+                        element,
+                        isInDialog,
+                        isInZone,
+                        presets: Object.assign(Object.assign({}, presets), presetsOverride),
+                    };
+                });
+                setFormats(formats);
             }
-          };
+        }, 200);
+    }, [lang, path, refreshKey]);
+    React.useEffect(() => {
+        if (formats.some((format) => format.isInZone)) {
+            window.addEventListener("ublo-content-saved", reloadWindow);
+            return () => {
+                window.addEventListener("ublo-content-saved", reloadWindow);
+            };
+        }
+    }, [formats]);
+    React.useEffect(() => {
+        const zones = Array.from(document.querySelectorAll(".cms"));
+        zones.forEach((zone) => {
+            zone.addEventListener("ublo-section-created", refreshEditableMap);
+            zone.addEventListener("ublo-section-pasted", refreshEditableMap);
         });
-        setFormats(formats);
-      }
-    }, 200);
-  }, [lang, path, refreshKey]);
-  React.useEffect(() => {
-    if (formats.some(format => format.isInZone)) {
-      window.addEventListener("ublo-content-saved", reloadWindow);
-      return () => {
-        window.addEventListener("ublo-content-saved", reloadWindow);
-      };
-    }
-  }, [formats]);
-  React.useEffect(() => {
-    const zones = Array.from(document.querySelectorAll(".cms"));
-    zones.forEach(zone => {
-      zone.addEventListener("ublo-section-created", refreshEditableMap);
-      zone.addEventListener("ublo-section-pasted", refreshEditableMap);
+        return () => {
+            zones.forEach((zone) => {
+                zone.removeEventListener("ublo-section-pasted", refreshEditableMap);
+                zone.removeEventListener("ublo-section-created", refreshEditableMap);
+            });
+        };
+    }, []);
+    if (!formats.length)
+        return null;
+    Router.ready(() => {
+        Router.events.on("routeChangeComplete", refreshEditableMap);
     });
-    return () => {
-      zones.forEach(zone => {
-        zone.removeEventListener("ublo-section-pasted", refreshEditableMap);
-        zone.removeEventListener("ublo-section-created", refreshEditableMap);
-      });
-    };
-  }, []);
-  if (!formats.length) return null;
-  Router.ready(() => {
-    Router.events.on("routeChangeComplete", refreshEditableMap);
-  });
-  return formats.map(format => ReactDOM.createPortal(_jsx(Map, {
-    format: format,
-    iconSet: iconSet,
-    hideSlopes: hideSlopes
-  }), format.element));
+    return formats.map((format) => ReactDOM.createPortal(<Map format={format} iconSet={iconSet} hideSlopes={hideSlopes}/>, format.element));
 }
 function reloadWindow() {
-  window.location.reload();
-}
+    window.location.reload();
+}

package/es/common/components/editable-map/map-events.d.ts

@@ -0,0 +1,9 @@
+export default function MapEvents({ mapRef, markers, setMarkers, setCenter, setZoom, isEditing, element, }: {
+    mapRef: any;
+    markers: any;
+    setMarkers: any;
+    setCenter: any;
+    setZoom: any;
+    isEditing: any;
+    element: any;
+}): any;

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

@@ -1,43 +1,36 @@
 import { useMapEvents } from "react-leaflet";
 const DEFAULT_MARKER_DATA = {
-  icon: "Location",
-  title: "Nouveau point d'intérêt",
-  description: "",
-  url: "",
-  label: "",
-  tooltipOpened: false
+    icon: "Location",
+    title: "Nouveau point d'intérêt",
+    description: "",
+    url: "",
+    label: "",
+    tooltipOpened: false,
 };
-export default function MapEvents({
-  mapRef,
-  markers,
-  setMarkers,
-  setCenter,
-  setZoom,
-  isEditing,
-  element
-}) {
-  const ids = markers.map(m => m.id);
-  const newId = ids.length ? Math.max(...ids) + 1 : 1;
-  const addMarker = e => {
-    const hasAnOpenedPopup = Boolean(mapRef.current?.getContainer().querySelector(".leaflet-popup"));
-    const isFocused = Boolean(element.querySelector("cms-section-ui"));
-    if (!isEditing || !isFocused || hasAnOpenedPopup) return;
-    setMarkers([...markers, {
-      id: newId,
-      ...DEFAULT_MARKER_DATA,
-      position: e.latlng
-    }]);
-  };
-  useMapEvents({
-    dragend(e) {
-      setCenter(e.target.getCenter());
-    },
-    zoomend(e) {
-      setZoom(e.target.getZoom());
-    },
-    click(e) {
-      addMarker(e);
-    }
-  });
-  return null;
-}
+export default function MapEvents({ mapRef, markers, setMarkers, setCenter, setZoom, isEditing, element, }) {
+    const ids = markers.map((m) => m.id);
+    const newId = ids.length ? Math.max(...ids) + 1 : 1;
+    const addMarker = (e) => {
+        var _a;
+        const hasAnOpenedPopup = Boolean((_a = mapRef.current) === null || _a === void 0 ? void 0 : _a.getContainer().querySelector(".leaflet-popup"));
+        const isFocused = Boolean(element.querySelector("cms-section-ui"));
+        if (!isEditing || !isFocused || hasAnOpenedPopup)
+            return;
+        setMarkers([
+            ...markers,
+            Object.assign(Object.assign({ id: newId }, DEFAULT_MARKER_DATA), { position: e.latlng }),
+        ]);
+    };
+    useMapEvents({
+        dragend(e) {
+            setCenter(e.target.getCenter());
+        },
+        zoomend(e) {
+            setZoom(e.target.getZoom());
+        },
+        click(e) {
+            addMarker(e);
+        },
+    });
+    return null;
+}

package/es/common/components/editable-map/marker-list.d.ts

@@ -0,0 +1,7 @@
+export default function MarkerList({ isInDialog, markers, mapRef, iconSet }: {
+    isInDialog: any;
+    markers: any;
+    mapRef: any;
+    iconSet: any;
+}): React.JSX.Element;
+import * as React from "react";

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

@@ -4,94 +4,71 @@ import classNames from "classnames";
 import Button from "dt-design-system/es/button";
 import * as DTIcons from "dt-design-system/es/icons";
 import useWindowSizes from "../../hooks/use-window-sizes";
+// import useWindowSizes from "ublo-lib/es/common/hooks/use-window-sizes";
 import * as Icons from "./icons";
 import css from "./marker-list.module.css";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-export default function MarkerList({
-  isInDialog,
-  markers,
-  mapRef,
-  iconSet
-}) {
-  const [opened, setOpened] = React.useState(true);
-  const importantMarkers = markers.filter(marker => marker.important);
-  const otherMarkers = markers.filter(marker => !marker.important);
-  const sortedImportantMarkers = importantMarkers.sort(alphaNumSortByTitle);
-  const sortedOtherMarkers = otherMarkers.sort(alphaNumSortByTitle);
-  const allMarkers = [...sortedImportantMarkers, ...sortedOtherMarkers];
-  const toggleList = e => {
-    e.preventDefault();
-    e.stopPropagation();
-    setOpened(!opened);
-  };
-  const {
-    width
-  } = useWindowSizes();
-  const ToggleIcon = opened ? DTIcons.ChevronRight : DTIcons.Menu;
-  React.useEffect(() => {
-    setOpened(width > 992);
-  }, [width]);
-  const classes = classNames(css.list, {
-    [css.listOpened]: opened,
-    [css.listIsInDialog]: isInDialog
-  });
-  return _jsxs("div", {
-    className: classes,
-    children: [opened && _jsx("div", {
-      className: css.inner,
-      children: allMarkers.map(({
-        id,
-        icon,
-        title,
-        position,
-        important
-      }) => {
-        const focusMarker = e => {
-          e.stopPropagation();
-          e.preventDefault();
-          mapRef.current.setView(position, 17);
-          setTimeout(() => {
-            mapRef.current.eachLayer(layer => {
-              if (layer instanceof L.Marker) {
-                const marker = layer.getElement().querySelector(`[data-id="${id}"]`);
-                if (marker) {
-                  layer.openPopup();
-                }
-              }
-            });
-          }, 300);
-          if (width <= 992) {
-            setOpened(false);
-          }
-        };
-        const Icon = Icons[iconSet][icon] || Icons[iconSet].Location;
-        const classes = classNames(css.button, {
-          [css.buttonImportant]: important
-        });
-        return _jsxs("a", {
-          href: "",
-          className: classes,
-          onClick: focusMarker,
-          children: [_jsx(Icon, {
-            className: css.icon
-          }), _jsx("span", {
-            children: title
-          })]
-        }, id);
-      })
-    }), _jsx(Button, {
-      type: "button",
-      variant: "secondary",
-      className: css.toggle,
-      onClick: toggleList,
-      children: _jsx(ToggleIcon, {})
-    })]
-  });
+export default function MarkerList({ isInDialog, markers, mapRef, iconSet }) {
+    const [opened, setOpened] = React.useState(true);
+    const importantMarkers = markers.filter((marker) => marker.important);
+    const otherMarkers = markers.filter((marker) => !marker.important);
+    const sortedImportantMarkers = importantMarkers.sort(alphaNumSortByTitle);
+    const sortedOtherMarkers = otherMarkers.sort(alphaNumSortByTitle);
+    const allMarkers = [...sortedImportantMarkers, ...sortedOtherMarkers];
+    const toggleList = (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        setOpened(!opened);
+    };
+    const { width } = useWindowSizes();
+    const ToggleIcon = opened ? DTIcons.ChevronRight : DTIcons.Menu;
+    React.useEffect(() => {
+        setOpened(width > 992);
+    }, [width]);
+    const classes = classNames(css.list, {
+        [css.listOpened]: opened,
+        [css.listIsInDialog]: isInDialog,
+    });
+    return (<div className={classes}>
+      {opened && (<div className={css.inner}>
+          {allMarkers.map(({ id, icon, title, position, important }) => {
+                const focusMarker = (e) => {
+                    e.stopPropagation();
+                    e.preventDefault();
+                    mapRef.current.setView(position, 17);
+                    setTimeout(() => {
+                        mapRef.current.eachLayer((layer) => {
+                            if (layer instanceof L.Marker) {
+                                const marker = layer
+                                    .getElement()
+                                    .querySelector(`[data-id="${id}"]`);
+                                if (marker) {
+                                    layer.openPopup();
+                                }
+                            }
+                        });
+                    }, 300);
+                    if (width <= 992) {
+                        setOpened(false);
+                    }
+                };
+                const Icon = Icons[iconSet][icon] || Icons[iconSet].Location;
+                const classes = classNames(css.button, {
+                    [css.buttonImportant]: important,
+                });
+                return (<a key={id} href="" className={classes} onClick={focusMarker}>
+                <Icon className={css.icon}/>
+                <span>{title}</span>
+              </a>);
+            })}
+        </div>)}
+      <Button type="button" variant="secondary" className={css.toggle} onClick={toggleList}>
+        <ToggleIcon />
+      </Button>
+    </div>);
 }
 function alphaNumSortByTitle(a, b) {
-  return a.title.localeCompare(b.title, undefined, {
-    numeric: true,
-    sensitivity: "base"
-  });
-}
+    return a.title.localeCompare(b.title, undefined, {
+        numeric: true,
+        sensitivity: "base",
+    });
+}

package/es/common/components/editable-map/markers.d.ts

@@ -0,0 +1,6 @@
+export default function Markers({ markers, setMarkers, iconSet, isEditing }: {
+    markers: any;
+    setMarkers: any;
+    iconSet: any;
+    isEditing: any;
+}): any;

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

@@ -6,92 +6,43 @@ import EditForm from "./edit-form";
 import * as Icons from "./icons";
 import css from "./markers.module.css";
 import PopupData from "./popup-data";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-export default function Markers({
-  markers,
-  setMarkers,
-  iconSet,
-  isEditing
-}) {
-  return markers.map((marker, i) => {
-    return _jsx(Marker, {
-      marker: marker,
-      setMarkers: setMarkers,
-      iconSet: iconSet,
-      isEditing: isEditing
-    }, i);
-  });
-}
-function Marker({
-  marker,
-  setMarkers,
-  iconSet,
-  isEditing
-}) {
-  const markerRef = React.useRef();
-  const popupRef = React.useRef();
-  const {
-    id,
-    icon,
-    title,
-    position,
-    tooltipOpened
-  } = marker;
-  const Icon = Icons[iconSet][icon] || Icons[iconSet].Location;
-  const updatePosition = e => {
-    setMarkers(currents => {
-      return currents.map(marker => {
-        if (marker.id === id) {
-          return {
-            ...marker,
-            position: e.target.getLatLng()
-          };
-        }
-        return marker;
-      });
+export default function Markers({ markers, setMarkers, iconSet, isEditing }) {
+    return markers.map((marker, i) => {
+        return (<Marker key={i} marker={marker} setMarkers={setMarkers} iconSet={iconSet} isEditing={isEditing}/>);
     });
-  };
-  const tooltipProps = tooltipOpened ? {
-    direction: "right",
-    permanent: true,
-    offset: [6, -12]
-  } : {
-    direction: "right",
-    offset: [6, -12]
-  };
-  return _jsxs(LeafletMarker, {
-    ref: markerRef,
-    draggable: isEditing,
-    eventHandlers: {
-      dragend(e) {
-        updatePosition(e);
-      },
-      click(e) {
-        e.originalEvent.stopPropagation();
-      }
-    },
-    position: position,
-    icon: L.divIcon({
-      className: css.markerIcon,
-      html: ReactDOM.renderToString(_jsx(Icon, {
-        "data-id": id
-      }))
-    }),
-    children: [!isEditing && _jsx(Tooltip, {
-      ...tooltipProps,
-      children: title
-    }), _jsx(Popup, {
-      ref: popupRef,
-      offset: [0, -24],
-      children: isEditing ? _jsx(EditForm, {
-        popupRef: popupRef,
-        marker: marker,
-        setMarkers: setMarkers,
-        iconSet: iconSet
-      }) : _jsx(PopupData, {
-        marker: marker
-      })
-    })]
-  }, id);
-}
+}
+function Marker({ marker, setMarkers, iconSet, isEditing }) {
+    const markerRef = React.useRef();
+    const popupRef = React.useRef();
+    const { id, icon, title, position, tooltipOpened } = marker;
+    const Icon = Icons[iconSet][icon] || Icons[iconSet].Location;
+    const updatePosition = (e) => {
+        setMarkers((currents) => {
+            return currents.map((marker) => {
+                if (marker.id === id) {
+                    return Object.assign(Object.assign({}, marker), { position: e.target.getLatLng() });
+                }
+                return marker;
+            });
+        });
+    };
+    const tooltipProps = tooltipOpened
+        ? { direction: "right", permanent: true, offset: [6, -12] }
+        : { direction: "right", offset: [6, -12] };
+    return (<LeafletMarker key={id} ref={markerRef} draggable={isEditing} eventHandlers={{
+            dragend(e) {
+                updatePosition(e);
+            },
+            click(e) {
+                e.originalEvent.stopPropagation();
+            },
+        }} position={position} icon={L.divIcon({
+            className: css.markerIcon,
+            html: ReactDOM.renderToString(<Icon data-id={id}/>),
+        })}>
+      {!isEditing && <Tooltip {...tooltipProps}>{title}</Tooltip>}
+      <Popup ref={popupRef} offset={[0, -24]}>
+        {isEditing ? (<EditForm popupRef={popupRef} marker={marker} setMarkers={setMarkers} iconSet={iconSet}/>) : (<PopupData marker={marker}/>)}
+      </Popup>
+    </LeafletMarker>);
+}

package/es/common/components/editable-map/popup-data.d.ts

@@ -0,0 +1,4 @@
+export default function PopupData({ marker }: {
+    marker: any;
+}): React.JSX.Element;
+import * as React from "react";