utopia-ui 3.0.0-alpha.151 → 3.0.0-alpha.153

package/dist/Components/Templates/ItemCard.d.ts

@@ -1,9 +1,8 @@
-import { Item } from "../../types";
-export declare const ItemCard: ({ item, url, parameterField, deleteCallback, navigateCallback, loading }: {
-    item: Item;
+import { Item } from '../../types';
+export declare const ItemCard: ({ i, loading, url, parameterField, deleteCallback }: {
+    i: Item;
+    loading: boolean;
     url: string;
     parameterField: string;
-    deleteCallback: (item: Item) => void;
-    loading: boolean;
-    navigateCallback: (url: string) => void;
+    deleteCallback: any;
 }) => import("react/jsx-runtime").JSX.Element;

package/dist/Components/Templates/OverlayItemsIndexPage.d.ts

@@ -3,16 +3,11 @@ declare type breadcrumb = {
     name: string;
     path: string;
 };
-export declare const OverlayItemsIndexPage: ({ url, layerName, parameterField, breadcrumbs, itemNameField, itemTextField, itemImageField, itemSymbolField, itemSubnameField, plusButton, children }: {
+export declare const OverlayItemsIndexPage: ({ url, layerName, parameterField, breadcrumbs, plusButton, children }: {
     layerName: string;
     url: string;
     parameterField: string;
     breadcrumbs: Array<breadcrumb>;
-    itemNameField: string;
-    itemTextField: string;
-    itemImageField: string;
-    itemSymbolField: string;
-    itemSubnameField: string;
     plusButton?: boolean | undefined;
     children?: ReactNode;
 }) => import("react/jsx-runtime").JSX.Element;

package/dist/index.js

@@ -1136,12 +1136,19 @@ var DateUserInfo = function (_a) {
                     jsx("p", __assign({ className: "!tw-my-0 tw-min-h-[21px] tw-font-bold tw-cursor-pointer tw-text-gray-500", onClick: function () { return setInfoExpanded(true); } }, { children: "\u24D8" })), jsx("div", { className: 'tw-grow ' })] })));
 };
 
+var ItemCard = function (_a) {
+    var _b, _c, _d, _e, _f, _g, _h;
+    var i = _a.i, loading = _a.loading, url = _a.url, parameterField = _a.parameterField, deleteCallback = _a.deleteCallback;
+    var navigate = useNavigate();
+    return (jsxs("div", __assign({ className: 'tw-cursor-pointer tw-card tw-border-[1px] tw-border-base-300 tw-card-body tw-shadow-xl tw-bg-base-100 tw-text-base-content tw-p-4 tw-mb-4 tw-h-fit', onClick: function () { return navigate(url + getValue(i, parameterField)); } }, { children: [jsx(HeaderView, { loading: loading, item: i, api: (_b = i.layer) === null || _b === void 0 ? void 0 : _b.api, itemAvatarField: (_c = i.layer) === null || _c === void 0 ? void 0 : _c.itemAvatarField, itemNameField: (_d = i.layer) === null || _d === void 0 ? void 0 : _d.itemNameField, itemSubnameField: (_e = i.layer) === null || _e === void 0 ? void 0 : _e.itemSubnameField, editCallback: function () { return navigate("/edit-item/" + i.id); }, deleteCallback: function () { return deleteCallback(i); } }), jsxs("div", __assign({ className: 'tw-overflow-y-auto tw-overflow-x-hidden tw-max-h-64 fade' }, { children: [((_f = i.layer) === null || _f === void 0 ? void 0 : _f.itemType.show_start_end) &&
+                        jsx(StartEndView, { item: i }), ((_g = i.layer) === null || _g === void 0 ? void 0 : _g.itemType.show_text) &&
+                        jsx(TextView, { truncate: true, item: i, itemTextField: (_h = i.layer) === null || _h === void 0 ? void 0 : _h.itemTextField })] })), jsx(DateUserInfo, { item: i })] })));
+};
+
 var OverlayItemsIndexPage = function (_a) {
-    var url = _a.url, layerName = _a.layerName, parameterField = _a.parameterField, breadcrumbs = _a.breadcrumbs, itemNameField = _a.itemNameField, itemTextField = _a.itemTextField, itemImageField = _a.itemImageField, itemSymbolField = _a.itemSymbolField, itemSubnameField = _a.itemSubnameField, _b = _a.plusButton, plusButton = _b === void 0 ? true : _b, children = _a.children;
-    console.log(itemSymbolField);
-    var _c = useState(new Map()); _c[0]; _c[1];
-    var _d = useState(false), loading = _d[0], setLoading = _d[1];
-    var _e = useState(""), addItemPopupType = _e[0], setAddItemPopupType = _e[1];
+    var url = _a.url, layerName = _a.layerName, parameterField = _a.parameterField, breadcrumbs = _a.breadcrumbs, _b = _a.plusButton, plusButton = _b === void 0 ? true : _b, children = _a.children;
+    var _c = useState(false), loading = _c[0], setLoading = _c[1];
+    var _d = useState(""), addItemPopupType = _d[0], setAddItemPopupType = _d[1];
     var tabRef = useRef(null);
     function scroll() {
         var _a;
@@ -1150,7 +1157,7 @@ var OverlayItemsIndexPage = function (_a) {
     useEffect(function () {
         scroll();
     }, [addItemPopupType]);
-    var navigate = useNavigate();
+    useNavigate();
     var tags = useTags();
     var addTag = useAddTag();
     var user = useAuth().user;
@@ -1243,10 +1250,7 @@ var OverlayItemsIndexPage = function (_a) {
                                 var dateB = b.date_updated ? new Date(b.date_updated).getTime() : b.date_created ? new Date(b.date_created).getTime() : 0;
                                 return dateB - dateA; // Subtracts milliseconds which are numbers
                             }).map(function (i, k) {
-                                var _a, _b;
-                                return (jsxs("div", __assign({ className: 'tw-cursor-pointer tw-card tw-border-[1px] tw-border-base-300 tw-card-body tw-shadow-xl tw-bg-base-100 tw-text-base-content tw-p-4 tw-mb-4 tw-h-fit', onClick: function () { return navigate(url + getValue(i, parameterField)); } }, { children: [jsx(HeaderView, { loading: loading, item: i, api: layer === null || layer === void 0 ? void 0 : layer.api, itemAvatarField: itemImageField, itemNameField: itemNameField, itemSubnameField: itemSubnameField, editCallback: function () { return navigate("/edit-item/" + i.id); }, deleteCallback: function () { return deleteItem(i); } }), jsxs("div", __assign({ className: 'tw-overflow-y-auto tw-overflow-x-hidden tw-max-h-64 fade' }, { children: [((_a = i.layer) === null || _a === void 0 ? void 0 : _a.itemType.show_start_end) &&
-                                                    jsx(StartEndView, { item: i }), ((_b = i.layer) === null || _b === void 0 ? void 0 : _b.itemType.show_text) &&
-                                                    jsx(TextView, { truncate: true, item: i, itemTextField: itemTextField })] })), jsx(DateUserInfo, { item: i })] }), k));
+                                return (jsx(ItemCard, { i: i, loading: loading, url: url, parameterField: parameterField, deleteCallback: function () { return deleteItem(i); } }, k));
                             }), addItemPopupType == "place" ?
                                 jsx("form", __assign({ ref: tabRef, autoComplete: 'off', onSubmit: function (e) { return submitNewItem(e); } }, { children: jsxs("div", __assign({ className: 'tw-cursor-pointer tw-card tw-border-[1px] tw-border-base-300 tw-card-body tw-shadow-xl tw-bg-base-100 tw-text-base-content tw-p-6 tw-mb-10' }, { children: [jsx("label", __assign({ className: "tw-btn tw-btn-sm tw-rounded-2xl tw-btn-circle tw-btn-ghost hover:tw-bg-transparent tw-absolute tw-right-0 tw-top-0 tw-text-gray-600", onClick: function () {
                                                     setAddItemPopupType("");
@@ -3253,10 +3257,16 @@ function UtopiaMap(_a) {
         var params = new URLSearchParams(location.search);
         params.get("position");
     }, [location]);
+    var onEachFeature = function (feature, layer) {
+        if (feature.properties) {
+            layer.bindPopup(feature.properties.name);
+            console.log(feature);
+        }
+    };
     return (jsx(Fragment, { children: jsxs("div", __assign({ className: (selectNewItemPosition != null ? "crosshair-cursor-enabled" : undefined) }, { children: [jsxs(MapContainer, __assign({ ref: mapDivRef, style: { height: height, width: width }, center: new LatLng(center[0], center[1]), zoom: zoom, zoomControl: false, maxZoom: 19 }, { children: [jsx(Outlet, {}), jsxs(Control, __assign({ position: 'topLeft', zIndex: "1000" }, { children: [jsx(SearchControl, {}), jsx(TagsControl, {})] })), jsxs(Control, __assign({ position: 'bottomLeft', zIndex: "999" }, { children: [jsx(QuestControl, {}), jsx(LayerControl, {})] })), jsx(TileLayer, { maxZoom: 19, attribution: '\u00A9 <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors', url: "https://tile.osmand.net/hd/{z}/{x}/{y}.png" }), jsx(MarkerClusterGroup, __assign({ ref: function (r) { return setClusterRef(r); }, showCoverageOnHover: true, chunkedLoading: true, maxClusterRadius: 50, removeOutsideVisibleBounds: false }, { children: React.Children.toArray(children).map(function (child) {
                                 return React.isValidElement(child) ?
                                     React.cloneElement(child, { setItemFormPopup: setItemFormPopup, itemFormPopup: itemFormPopup, clusterRef: clusterRef }) : child;
-                            }) })), geo && jsx(GeoJSON, { data: geo }), jsx(MapEventListener, { setSelectNewItemPosition: setSelectNewItemPosition, selectNewItemPosition: selectNewItemPosition, setItemFormPopup: setItemFormPopup })] })), jsx(AddButton, { triggerAction: setSelectNewItemPosition }), selectNewItemPosition != null &&
+                            }) })), geo && jsx(GeoJSON, { data: geo, onEachFeature: onEachFeature }), jsx(MapEventListener, { setSelectNewItemPosition: setSelectNewItemPosition, selectNewItemPosition: selectNewItemPosition, setItemFormPopup: setItemFormPopup })] })), jsx(AddButton, { triggerAction: setSelectNewItemPosition }), selectNewItemPosition != null &&
                     jsxs("div", __assign({ className: "tw-button tw-z-1000 tw-absolute tw-right-5 tw-top-4 tw-drop-shadow-md" }, { children: [jsx("label", __assign({ className: "tw-btn tw-btn-sm tw-rounded-2xl tw-btn-circle tw-btn-ghost hover:tw-bg-transparent tw-absolute tw-right-0 tw-top-0 tw-text-gray-600", onClick: function () {
                                     setSelectNewItemPosition(null);
                                 } }, { children: jsx("p", __assign({ className: 'tw-text-center ' }, { children: "\u2715" })) })), jsx("div", __assign({ className: "tw-alert tw-bg-base-100 tw-text-base-content" }, { children: jsx("div", { children: jsxs("span", { children: ["Select ", selectNewItemPosition.name, " position!"] }) }) }))] }))] })) }));
@@ -4943,11 +4953,11 @@ function OverlayItemProfileSettings() {
         setNeeds([]);
         setRelations([]);
         (_d = item === null || item === void 0 ? void 0 : item.offers) === null || _d === void 0 ? void 0 : _d.map(function (o) {
-            var offer = tags.find(function (t) { return t.id === o.tags_id; });
+            var offer = tags === null || tags === void 0 ? void 0 : tags.find(function (t) { return t.id === o.tags_id; });
             offer && setOffers(function (current) { return __spreadArray(__spreadArray([], current, true), [offer], false); });
         });
         (_e = item === null || item === void 0 ? void 0 : item.needs) === null || _e === void 0 ? void 0 : _e.map(function (o) {
-            var need = tags.find(function (t) { return t.id === o.tags_id; });
+            var need = tags === null || tags === void 0 ? void 0 : tags.find(function (t) { return t.id === o.tags_id; });
             need && setNeeds(function (current) { return __spreadArray(__spreadArray([], current, true), [need], false); });
         });
         (_f = item.relations) === null || _f === void 0 ? void 0 : _f.map(function (r) {
@@ -4969,7 +4979,7 @@ function OverlayItemProfileSettings() {
                     changedItem = {};
                     offer_updates = [];
                     //check for new offers
-                    offers.map(function (o) {
+                    offers === null || offers === void 0 ? void 0 : offers.map(function (o) {
                         var _a;
                         var existingOffer = (_a = item === null || item === void 0 ? void 0 : item.offers) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.tags_id === o.id; });
                         existingOffer && offer_updates.push(existingOffer.id);
@@ -4978,7 +4988,7 @@ function OverlayItemProfileSettings() {
                         !existingOffer && offer_updates.push({ items_id: item === null || item === void 0 ? void 0 : item.id, tags_id: o.id });
                     });
                     needs_updates = [];
-                    needs.map(function (n) {
+                    needs === null || needs === void 0 ? void 0 : needs.map(function (n) {
                         var existingNeed = user === null || user === void 0 ? void 0 : user.needs.find(function (t) { return t.tags_id === n.id; });
                         existingNeed && needs_updates.push(existingNeed.id);
                         !existingNeed && needs_updates.push({ items_id: item === null || item === void 0 ? void 0 : item.id, tags_id: n.id });