fix(collapse): when is-nav, do better checking of click events (Fixes #2222) (#2225)

tmorehouse · web-flow · commit 8b96e1efdd9d · 2018-11-26T03:27:29.000-04:00
diff --git a/src/components/collapse/collapse.js b/src/components/collapse/collapse.js
@@ -1,5 +1,5 @@
 import listenOnRootMixin from '../../mixins/listen-on-root'
-import { hasClass, reflow, getCS, getBCR, eventOn, eventOff } from '../../utils/dom'
+import { closest, matches, reflow, getCS, getBCR, eventOn, eventOff } from '../../utils/dom'
 
 // Events we emit on $root
 const EVENT_STATE = 'bv::collapse::state'
@@ -141,7 +141,7 @@ export default {
       if (!this.isNav || !el || getCS(this.$el).display !== 'block') {
         return
       }
-      if (hasClass(el, 'nav-link') || hasClass(el, 'dropdown-item')) {
+      if (matches(el, '.nav-link,.dropdown-item') || closest('.nav-link,.dropdown-item', el)) {
         this.show = false
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import listenOnRootMixin from '../../mixins/listen-on-root'`
`2`		`-import { hasClass, reflow, getCS, getBCR, eventOn, eventOff } from '../../utils/dom'`
	`2`	`+import { closest, matches, reflow, getCS, getBCR, eventOn, eventOff } from '../../utils/dom'`
`3`	`3`
`4`	`4`	`// Events we emit on $root`
`5`	`5`	`const EVENT_STATE = 'bv::collapse::state'`
`@@ -141,7 +141,7 @@ export default {`
`141`	`141`	`if (!this.isNav \|\| !el \|\| getCS(this.$el).display !== 'block') {`
`142`	`142`	`return`
`143`	`143`	`}`
`144`		`- if (hasClass(el, 'nav-link') \|\| hasClass(el, 'dropdown-item')) {`
	`144`	`+ if (matches(el, '.nav-link,.dropdown-item') \|\| closest('.nav-link,.dropdown-item', el)) {`
`145`	`145`	`this.show = false`
`146`	`146`	`}`
`147`	`147`	`},`