Commit fd4389c2 authored by Michael Underwood's avatar Michael Underwood
Browse files

WIP improve props typing, switch DomEvent.on(ref) to ref.on()

parent 1a3972e8

src/components/LGeoJson.vue

+2 −2
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ export default defineComponent({ 
    const { methods, options } = setupGeoJSON(props, leafletObject, context);



    onMounted(async () => {

      const { geoJSON, DomEvent }: typeof L = useGlobalLeaflet

      const { geoJSON }: typeof L = useGlobalLeaflet

        ? WINDOW_OR_GLOBAL.L

        : await import("leaflet/dist/leaflet-src.esm");



      leafletObject.value = markRaw<L.GeoJSON>(geoJSON(props.geojson, options));



      const listeners = remapEvents(context.attrs);

      DomEvent.on(leafletObject.value, listeners);

      leafletObject.value.on(listeners);



      propsBinder(methods, leafletObject.value, props);

      addLayer({

src/components/LGridLayer.vue

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ export default defineComponent({ 
    const { options, methods } = setupGridLayer(props, leafletObject, context);



    onMounted(async () => {

      const { GridLayer, DomEvent, DomUtil }: typeof L = useGlobalLeaflet

      const { GridLayer, DomUtil }: typeof L = useGlobalLeaflet

        ? WINDOW_OR_GLOBAL.L

        : await import("leaflet/dist/leaflet-src.esm");
@@ -78,7 +78,7 @@ export default defineComponent({ 
      leafletObject.value = markRaw<L.GridLayer>(new GLayer(options));



      const listeners = remapEvents(context.attrs);

      DomEvent.on(leafletObject.value, listeners);

      leafletObject.value.on(listeners);



      leafletObject.value.on("tileunload", methods.onUnload);

src/components/LIcon.vue

+1 −1
Original line number Diff line number Diff line 
<script lang="ts">

import L from "leaflet";

import type L from "leaflet";

import { defineComponent, h, inject, nextTick, onMounted, ref } from "vue";



import { componentProps, setupComponent } from "@src/functions/component";

src/components/LImageOverlay.vue

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ export default defineComponent({ 
    );



    onMounted(async () => {

      const { imageOverlay, DomEvent }: typeof L = useGlobalLeaflet

      const { imageOverlay }: typeof L = useGlobalLeaflet

        ? WINDOW_OR_GLOBAL.L

        : await import("leaflet/dist/leaflet-src.esm");

      leafletObject.value = markRaw<L.ImageOverlay>(
@@ -53,7 +53,7 @@ export default defineComponent({ 
      );



      const listeners = remapEvents(context.attrs);

      DomEvent.on(leafletObject.value, listeners);

      leafletObject.value.on(listeners);

      propsBinder(methods, leafletObject.value, props);

      addLayer({

        ...props,

src/components/LLayerGroup.vue

+2 −2
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ export default defineComponent({ 
    const { methods } = setupLayerGroup(props, leafletObject, context);



    onMounted(async () => {

      const { layerGroup, DomEvent }: typeof L = useGlobalLeaflet

      const { layerGroup }: typeof L = useGlobalLeaflet

        ? WINDOW_OR_GLOBAL.L

        : await import("leaflet/dist/leaflet-src.esm");

      leafletObject.value = markRaw<L.LayerGroup>(layerGroup(props.options));



      const listeners = remapEvents(context.attrs);

      DomEvent.on(leafletObject.value, listeners);

      leafletObject.value.on(listeners);



      propsBinder(methods, leafletObject.value, props);

      addLayer({