Unverified Commit 56d75740 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera Committed by GitHub
Browse files

Merge pull request #59 from vue-leaflet/restore-options-prop 

Restore options prop
parents 1e81f8dd 6b0c8de1

src/Playground.vue

+11 −8
Original line number Diff line number Diff line
@@ -38,11 +38,20 @@ 
          >Hello, Map!</l-control

        >



        <l-marker :lat-lng="[0, 0]" draggable @moveend="log('moveend')">

        <l-marker

          :lat-lng="[50, 50]"

          draggable

          @moveend="log('moveend')"

          :options="{ riseOnHover: true, riseOffset: 300 }"

        >

          <l-tooltip>

            lol

            options

          </l-tooltip>

        </l-marker>

        <l-marker :lat-lng="[51, 51]"/>

        <l-marker :lat-lng="[51, 49]"/>

        <l-marker :lat-lng="[49, 51]"/>

        <l-marker :lat-lng="[49, 49]"/>



        <l-layer-group>

          <l-marker :lat-lng="[0, 0]" draggable @moveend="log('moveend')">
@@ -56,12 +65,6 @@ 
          </l-marker>

        </l-layer-group>



        <l-marker :lat-lng="[50, 50]" draggable @moveend="log('moveend')">

          <l-popup>

            lol

          </l-popup>

        </l-marker>



        <l-polyline

          :lat-lngs="[

            [47.334852, -1.509485],

src/components/LCircle.vue

+2 −4
Original line number Diff line number Diff line
@@ -19,16 +19,14 @@ export default { 
    const { options, methods } = circleSetup(props, leafletRef, context);



    onMounted(async () => {

      const { circle, DomEvent, setOptions } = await import(

        "leaflet/dist/leaflet-src.esm"

      );

      const { circle, DomEvent } = await import("leaflet/dist/leaflet-src.esm");



      leafletRef.value = circle(props.latLng, options);



      const listeners = remapEvents(context.attrs);

      DomEvent.on(leafletRef.value, listeners);



      propsBinder(methods, leafletRef.value, props, setOptions);

      propsBinder(methods, leafletRef.value, props);



      addLayer({

        ...props,

src/components/LCircleMarker.vue

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ export default { 
    const { options, methods } = circleMarkerSetup(props, leafletRef, context);



    onMounted(async () => {

      const { circleMarker, DomEvent, setOptions } = await import(

      const { circleMarker, DomEvent } = await import(

        "leaflet/dist/leaflet-src.esm"

      );
@@ -28,7 +28,7 @@ export default { 
      const listeners = remapEvents(context.attrs);

      DomEvent.on(leafletRef.value, listeners);



      propsBinder(methods, leafletRef.value, props, setOptions);

      propsBinder(methods, leafletRef.value, props);



      addLayer({

        ...props,

src/components/LControl.vue

+8 −4
Original line number Diff line number Diff line 
<script>

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

import { props, setup as controlSetup, render } from "../functions/control";

import {

  props as controlProps,

  setup as controlSetup,

  render,

} from "../functions/control";

import { propsBinder } from "../utils.js";



export default {

  name: "LControl",

  props: {

    ...props,

    ...controlProps,

    disableClickPropagation: {

      type: Boolean,

      custom: true,
@@ -25,7 +29,7 @@ export default { 
    const registerControl = inject("registerControl");

    const { options, methods } = controlSetup(props, leafletRef);

    onMounted(async () => {

      const { Control, setOptions, DomEvent } = await import(

      const { Control, DomEvent } = await import(

        "leaflet/dist/leaflet-src.esm"

      );
@@ -36,7 +40,7 @@ export default { 
      });



      leafletRef.value = new LControl(options);

      propsBinder(methods, leafletRef.value, props, setOptions);

      propsBinder(methods, leafletRef.value, props);

      registerControl({ leafletObject: leafletRef.value });



      if (props.disableClickPropagation) {

src/components/LControlAttribution.vue

+2 −4
Original line number Diff line number Diff line
@@ -15,12 +15,10 @@ export default { 
    const registerControl = inject("registerControl");

    const { options, methods } = attributionControlSetup(props, leafletRef);

    onMounted(async () => {

      const { control, setOptions } = await import(

        "leaflet/dist/leaflet-src.esm"

      );

      const { control } = await import("leaflet/dist/leaflet-src.esm");



      leafletRef.value = control.attribution(options);

      propsBinder(methods, leafletRef.value, props, setOptions);

      propsBinder(methods, leafletRef.value, props);

      registerControl({ leafletObject: leafletRef.value });

      nextTick(() => context.emit("ready", leafletRef.value));

    });