Unverified Commit aee8b8f1 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera
Browse files

feat: use optionsMerger and remove setOptions

parent 28d57468

src/components/LCircle.vue

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

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

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

import { remapEvents, propsBinder, optionsMerger } from "../utils.js";

import {

  props as circleProps,

  setup as circleSetup,
@@ -28,16 +28,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);

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



      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

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

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

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

import { remapEvents, propsBinder, optionsMerger } from "../utils.js";

import {

  props as circleMarkerProps,

  setup as circleMarkerSetup,
@@ -28,16 +28,19 @@ 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"

      );



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

      leafletRef.value = circleMarker(

        props.latLng,

        optionsMerger(options, props)

      );



      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

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import { 
  setup as controlSetup,

  render,

} from "../functions/control";

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

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



export default {

  name: "LControl",
@@ -33,7 +33,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"

      );
@@ -43,8 +43,8 @@ export default { 
        },

      });



      leafletRef.value = new LControl(options);

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

      leafletRef.value = new LControl(optionsMerger(options, props));

      propsBinder(methods, leafletRef.value, props);

      registerControl({ leafletObject: leafletRef.value });



      if (props.disableClickPropagation) {

src/components/LControlAttribution.vue

+4 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import { 
  props as attributionControlProps,

  setup as attributionControlSetup,

} from "../functions/controlAttribution";

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

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



export default {

  name: "LControlAttribution",
@@ -21,12 +21,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);

      leafletRef.value = control.attribution(optionsMerger(options, props));

      propsBinder(methods, leafletRef.value, props);

      registerControl({ leafletObject: leafletRef.value });

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

    });

src/components/LControlLayers.vue

+8 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import { 
  props as layerControlProps,

  setup as layerControlSetup,

} from "../functions/controlLayers";

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

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



export default {

  name: "LControlLayers",
@@ -21,12 +21,14 @@ export default { 
    const registerLayerControl = inject("registerLayerControl");

    const { options, methods } = layerControlSetup(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.layers(null, null, options);

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

      leafletRef.value = control.layers(

        null,

        null,

        optionsMerger(options, props)

      );

      propsBinder(methods, leafletRef.value, props);



      registerLayerControl({

        ...props,