@dative-gpi/foundation-shared-components 1.1.9-sandbox-2 → 1.1.10

package/components/fields/FSEntityFieldUI.vue

@@ -240,7 +240,7 @@ export default defineComponent({
         },
         {
           id: EntityType.Subgrouping,
-          label: $tr("ui.common.subgroupings", "Subgroupings")
+          label: $tr("ui.common.subgroupings", "Categories")
         }
       ];
 

package/components/map/FSMapMarker.vue

@@ -48,30 +48,26 @@ export default {
     to: {
       type: Object as PropType<RouteLocation | null>,
       required: false
-    },
-    html: {
-      type: [String, HTMLElement] as PropType<string | HTMLElement>,
-      required: false
     }
   },
   emits: ['click', 'auxclick'],
   setup(props, { emit }) {
     const map = inject<Ref<Map | null>>(MAP);
     const markerClusterGroup = inject<Ref<MarkerClusterGroup | null>>(MARKERCLUSTERGROUP, ref(null));
-
+      
     const { getColors } = useColors();
     const { handleRoutingEvent } = useRouting();
 
-    if (!map) {
+    if(!map) {
       throw new Error('FSMapTileLayer must be used inside a FSMap component');
     }
 
-    if (!map.value) {
+    if(!map.value) {
       throw new Error('FSMapTileLayer must be used inside a FSMap component with a map');
     }
-
+      
     const getMarkerIcon = () => {
-      if (props.variant === 'gps') {
+      if(props.variant === 'gps') {
         const size = 16;
         return divIcon({
           html: gpsMarkerHtml(),
@@ -81,7 +77,7 @@ export default {
         });
       }
 
-      if (props.variant === 'location') {
+      if(props.variant === 'location') {
         const size = 36;
         return divIcon({
           html: locationMarkerHtml(props.icon ?? "mdi-map-marker", getColors(props.color).base, props.label),
@@ -93,7 +89,7 @@ export default {
 
       const size = 16;
       return divIcon({
-        html: props.html ?? pinMarkerHtml(getColors(props.color).base, props.label),
+        html: pinMarkerHtml(getColors(props.color).base, props.label),
         iconSize: [size, size],
         className: props.selected ? 'fs-map-marker fs-map-pin fs-map-pin-selected' : 'fs-map-marker fs-map-pin',
         iconAnchor: [size / 2, size / 2],
@@ -107,11 +103,11 @@ export default {
     });
 
     const onClick = (event: MouseEvent) => {
-      if (props.to) {
+      if(props.to) {
         handleRoutingEvent(event, props.to, true);
         return;
       }
-
+      
       emit('click', {
         ...event,
         latlng: props.latlng
@@ -119,7 +115,7 @@ export default {
     }
 
     const onAuxClick = (event: MouseEvent) => {
-      if (props.to) {
+      if(props.to) {
         handleRoutingEvent(event, props.to);
         return;
       }
@@ -131,19 +127,19 @@ export default {
     }
 
     watch(map, () => {
-      if (!map.value) {
+      if(!map.value) {
         return;
       }
 
-      if (markerClusterGroup && markerClusterGroup.value) {
+      if(markerClusterGroup && markerClusterGroup.value) {
         actualMarker.value.addTo(markerClusterGroup.value);
       } else {
         actualMarker.value.addTo(map.value);
       }
     }, { immediate: true });
 
-    watch([() => props.variant, () => props.color, () => props.selected, () => props.html], () => {
-      if (!actualMarker.value || !map.value) {
+    watch([() => props.variant, () => props.color, () => props.selected], () => {
+      if(!actualMarker.value || !map.value) {
         return;
       }
 
@@ -152,7 +148,7 @@ export default {
     });
 
     watch([() => props.latlng?.lat, () => props.latlng?.lng], () => {
-      if (!actualMarker.value || !map.value || !props.latlng) {
+      if(!actualMarker.value || !map.value || !props.latlng) {
         return;
       }
 
@@ -160,7 +156,7 @@ export default {
     });
 
     watch(markerElement, (newMarkerElement) => {
-      if (!newMarkerElement) {
+      if(!newMarkerElement) {
         return;
       }
 
@@ -169,8 +165,8 @@ export default {
     }, { immediate: true });
 
     onUnmounted(() => {
-      if (actualMarker.value && map.value) {
-        if (markerClusterGroup && markerClusterGroup.value) {
+      if(actualMarker.value && map.value) {
+        if(markerClusterGroup && markerClusterGroup.value) {
           markerClusterGroup.value.removeLayer(actualMarker.value as Marker);
         } else {
           map.value.removeLayer(actualMarker.value as Marker);

package/composables/index.ts

@@ -5,7 +5,6 @@ export * from "./useBreakpoints";
 export * from "./useColors";
 export * from "./useCountUp";
 export * from "./useDebounce";
-export * from "./useDomRenderer";
 export * from "./useElementVisibility";
 export * from "./useMapLayers";
 export * from "./useResize";

package/package.json

@@ -4,7 +4,7 @@
     "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
   },
   "sideEffects": false,
-  "version": "1.1.9-sandbox-2",
+  "version": "1.1.10",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,8 +13,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.1.9-sandbox-2",
-    "@dative-gpi/foundation-shared-services": "1.1.9-sandbox-2"
+    "@dative-gpi/foundation-shared-domain": "1.1.10",
+    "@dative-gpi/foundation-shared-services": "1.1.10"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -38,5 +38,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "a26ae1e0964030d75000054d021c1d45feadb98e"
+  "gitHead": "9fab51b9fc34cd8a60f870ef40e5a437115f2f2b"
 }

package/composables/useDomRenderer.ts

@@ -1,83 +0,0 @@
-import { h, render, getCurrentInstance, onBeforeUnmount, toValue, type Component, type MaybeRefOrGetter, watch } from "vue";
-
-interface RenderHandle {
-  unsubscribe: () => void;
-  getElement: (style?: Partial<CSSStyleDeclaration>) => HTMLElement;
-}
-
-interface Subscription {
-  container: HTMLElement;
-  mountPoint: HTMLElement;
-  stopWatching: () => void;
-}
-
-function destroySubscription(subscription: Subscription) {
-  subscription.stopWatching();
-  render(null, subscription.container);
-  subscription.container.remove();
-  subscription.mountPoint.remove();
-}
-
-export function useDomRenderer<TProps extends Record<string, any>>(component: Component<TProps>) {
-
-  const instance = getCurrentInstance();
-  if (!instance) {
-    throw new Error("useDomRenderer must be used inside setup()");
-  }
-
-  const appContext = instance.appContext;
-  const subscriptions = new Set<Subscription>();
-
-  const subscribe = (getProps: MaybeRefOrGetter<TProps>, style?: Partial<CSSStyleDeclaration>): RenderHandle => {
-    const mountPoint = document.createElement("div");
-
-    const container = document.createElement("div");
-    mountPoint.appendChild(container);
-
-    const stopWatching = watch(
-      getProps,
-      () => {
-        const vnode = h(component, toValue(getProps));
-        vnode.appContext = appContext;
-        render(vnode, container);
-      },
-      { immediate: true }
-    );
-
-    const subscription: Subscription = { container, mountPoint, stopWatching };
-    subscriptions.add(subscription);
-
-    const unsubscribe = () => {
-      if (!subscriptions.has(subscription)) {
-        return;
-      }
-      destroySubscription(subscription);
-      subscriptions.delete(subscription);
-    };
-
-    const getElement = (newStyle?: Partial<CSSStyleDeclaration>): HTMLElement => {
-      if (!subscriptions.has(subscription)) {
-        throw new Error("This render handle has already been unsubscribed");
-      }
-      mountPoint.style.cssText = "";
-      Object.assign(mountPoint.style, style ?? {}, newStyle ?? {});
-      return mountPoint;
-    };
-
-    return { unsubscribe, getElement };
-  };
-
-  const unsubscribeAll = () => {
-    for (const subscription of subscriptions) {
-      destroySubscription(subscription);
-    }
-    subscriptions.clear();
-  };
-
-  onBeforeUnmount(unsubscribeAll);
-
-  return {
-    subscribe,
-    unsubscribeAll,
-  };
-}