From be51f9dc5976822a70aaee52f772112e702b12be Mon Sep 17 00:00:00 2001 From: Fawad Mirzad Date: Thu, 18 Feb 2021 06:07:26 +0100 Subject: [PATCH] Fix info window cannot be opened --- package.json | 2 +- src/components/infoWindow.vue | 13 +++++-------- src/components/marker.vue | 6 +++++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 5d75a94..b31f874 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@fawmi/vue-google-maps", "description": "Google Map components for Vue.js 3", - "version": "0.7.10", + "version": "0.7.11", "private": false, "main": "src/main.js", "keywords": [ diff --git a/src/components/infoWindow.vue b/src/components/infoWindow.vue index f31cc68..352ca8e 100644 --- a/src/components/infoWindow.vue +++ b/src/components/infoWindow.vue @@ -25,7 +25,7 @@ const props = { }, } -const events = ['domready', 'closeclick', 'content_changed'] +const events = ['domready', 'click', 'closeclick', 'content_changed'] export default buildComponent({ mappedProps: props, @@ -61,17 +61,14 @@ export default buildComponent({ }) } }, - + emits: ['closeclick'], methods: { _openInfoWindow() { + this.$infoWindowObject.close() if (this.opened) { - if (this.$markerObject !== null) { - this.$infoWindowObject.open(this.$map, this.$markerObject) - } else { - this.$infoWindowObject.open(this.$map) - } + this.$infoWindowObject.open(this.$map, this.$markerObject) } else { - this.$infoWindowObject.close() + this.$emit('closeclick') } }, }, diff --git a/src/components/marker.vue b/src/components/marker.vue index f5cd110..323c358 100644 --- a/src/components/marker.vue +++ b/src/components/marker.vue @@ -1,5 +1,5 @@ @@ -89,6 +89,7 @@ export default buildComponent({ default: null, }, }, + emits: events, unmounted() { if (!this.$markerObject) { return @@ -114,6 +115,9 @@ export default buildComponent({ if (this.$clusterPromise) { this.$clusterPromise.then((co) => { co.addMarker(inst) + inst.addListener('click', ()=> { + this.$emit('click') + }); this.$clusterObject = co }) }