Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bugfix] Fix MapBox removal error and improve cleanup #254

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[Bugfix] Fix MapBox removal error and improve cleanup #254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 54 additions & 33 deletions packages/vue-mapbox-gl/components/MapboxMap.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,50 @@
default: null,
},
};
</script>

<script lang="ts" setup>
import {
ref,
shallowRef,
computed,
defineProps,
defineEmits,
onMounted,
onUnmounted,
provide,
nextTick,
} from 'vue';
import { useEventsBinding, usePropsBinding } from '../composables/index.js';

interface MapWithResizeObserver extends Map {
_resizeObserver?: ResizeObserver;
}

const props = defineProps(propsConfig);
const emit = defineEmits();

const map = shallowRef<Map>(null);

provide('mapbox-map', map);

const root = ref<HTMLDivElement | null>(null);
const isLoaded = ref<boolean>(false);

const options = computed(() => {
const { accessToken, mapStyle: style, ...options } = props;

// Use current component's element if container is not set
if (!options.container && root.value) {
options.container = root.value;
}

return { style, ...options };
});

/**
* All Map events which will be mapped/bounded to the component
* @see https://docs.mapbox.com/mapbox-gl-js/api/#map.event:resize
* @type {Array}
*/
const events = [
'boxzoomcancel',
Expand Down Expand Up @@ -294,34 +333,6 @@
'zoomstart',
];

export default {
inheritAttrs: false,
};
</script>

<script lang="ts" setup>
import { ref, shallowRef, computed, onMounted, onUnmounted, provide } from 'vue';
import { useEventsBinding, usePropsBinding } from '../composables/index.js';

const props = defineProps(propsConfig);
const emit = defineEmits();

const map = shallowRef<Map>(null);
provide('mapbox-map', map);

const root = ref();
const isLoaded = ref(false);
const options = computed(() => {
const { accessToken, mapStyle: style, ...options } = props;

// Use current component's element if container is not set
if (!options.container && root.value) {
options.container = root.value;
}

return { style, ...options };
});

useEventsBinding(emit, map, events);
usePropsBinding(props, map, propsConfig);

Expand All @@ -343,10 +354,20 @@
});
resizeObserver.observe(options.value.container);

onUnmounted(() => {
resizeObserver.disconnect();
map.value.remove();
});
// save observer for later cleanup in `onUnmounted`
(map.value as MapWithResizeObserver)._resizeObserver = resizeObserver;
});

onUnmounted(() => {
if (map.value) {
const observer = (map.value as MapWithResizeObserver)._resizeObserver;
if (observer) observer.disconnect();

nextTick(() => {
map.value?.remove();
map.value = null;
});
}
});

defineExpose({ map });
Expand Down