Popup does not clean up event listeners if closeOnClick: true

[Pessimistress]

mapbox-gl-js version: 2.7.0

browser: any

Steps to Trigger Behavior

1. Create popup with closeOnClick: true
2. Add listener to the popup's close event
3. After the popup is closed, the close event continue to fire upon any click on the map

Link to Demonstration

https://codepen.io/Pessimistress/pen/qBPmbrV

1. Click on "open popup"
2. Click anywhere on the map
3. Repeat 1 & 2 a few times, observe console logs

Expected Behavior

The close callback should be called once for each popup

Actual Behavior

All close callbacks ever registered continue to be called when the map is clicked.

I believe this was introduced by 9c1e1a0, as a preclick listener is added to the map:

mapbox-gl-js/src/ui/popup.js

Line 143 in 6828333

map.on('preclick', this._onClose);

But on popup.remove it attempts to remove a click listener:

mapbox-gl-js/src/ui/popup.js

Line 219 in 6828333

map.off('click', this._onClose);

This bug cannot be reproduced on versions <2.5.0, when this commit was included.

[ryanhamley]

Thanks for the report @Pessimistress I submitted #11540 to fix this