fix(b-nav-item-dropdown): boundary handling in <b-navbar> (closes #5789) (#5794)

jacobmllr95 · web-flow · commit 73383bfd935c · 2020-09-17T15:26:07.000+02:00
* fix(b-nav-item-dropdown): `boundary` handling in `&lt;b-navbar&gt;`

* Update nav-item-dropdown.spec.js
diff --git a/docs/common-props.json b/docs/common-props.json
@@ -126,7 +126,7 @@
     "description": "Sets the `placeholder` attribute value on the form control"
   },
   "disabled": {
-    "description": "When set to 'true', disables the component's functionality and places it in a disabled state"
+    "description": "When set to `true`, disables the component's functionality and places it in a disabled state"
   },
   "readonly": {
     "description": "Sets the `readonly` attribute on the form control"
diff --git a/src/components/nav/nav-item-dropdown.js b/src/components/nav/nav-item-dropdown.js
@@ -29,10 +29,6 @@ export const BNavItemDropdown = /*#__PURE__*/ Vue.extend({
     toggleId() {
       return this.safeId('_BV_toggle_')
     },
-    isNav() {
-      // Signal to dropdown mixin that we are in a navbar
-      return true
-    },
     dropdownClasses() {
       return [this.directionClass, this.boundaryClass, { show: this.visible }]
     },
diff --git a/src/components/nav/nav-item-dropdown.spec.js b/src/components/nav/nav-item-dropdown.spec.js
@@ -34,15 +34,6 @@ describe('nav-item-dropdown', () => {
     wrapper.destroy()
   })
 
-  it('should have a flag that we are in a nav', async () => {
-    const wrapper = mount(BNavItemDropdown)
-
-    expect(wrapper.vm).toBeDefined()
-    expect(wrapper.vm.isNav).toBe(true)
-
-    wrapper.destroy()
-  })
-
   it('should have custom toggle class when "toggle-class" prop set', async () => {
     const wrapper = mount(BNavItemDropdown, {
       propsData: {
diff --git a/src/components/nav/package.json b/src/components/nav/package.json
@@ -98,11 +98,11 @@
         "props": [
           {
             "prop": "text",
-            "description": "Text to place in the toggle button, or in the split button is split mode"
+            "description": "Text to place in the toggle element (link)"
           },
           {
             "prop": "html",
-            "description": "HTML string to place in the toggle button, or in the split button is split mode. Use with caution"
+            "description": "HTML string to place in the toggle element (link). Use with caution"
           },
           {
             "prop": "dropup",
@@ -138,16 +138,16 @@
           },
           {
             "prop": "toggleClass",
-            "description": "CSS class (or classes) to add to the toggle button"
+            "description": "CSS class (or classes) to add to the toggle element (link)"
           },
           {
             "prop": "noCaret",
-            "description": "Hide the caret indicator on the toggle button"
+            "description": "Hide the caret indicator on the toggle element (link)"
           },
           {
             "prop": "boundary",
             "version": "2.4.0",
-            "description": "The boundary constraint of the menu: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement. Has no effect when dropdown is inside a b-navbar"
+            "description": "The boundary constraint of the menu: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement. Has no effect when dropdown is inside a `<b-navbar>`"
           }
         ],
         "slots": [
diff --git a/src/mixins/dropdown.js b/src/mixins/dropdown.js
@@ -127,8 +127,7 @@ export default {
       // Position `static` is needed to allow menu to "breakout" of the `scrollParent`
       // boundaries when boundary is anything other than `scrollParent`
       // See: https://github.com/twbs/bootstrap/issues/24251#issuecomment-341413786
-      const { boundary } = this
-      return boundary !== 'scrollParent' || !boundary ? 'position-static' : ''
+      return this.boundary !== 'scrollParent' && !this.inNavbar ? 'position-static' : ''
     }
   },
   watch: {

Original file line number	Diff line number	Diff line change
`@@ -98,11 +98,11 @@`
`98`	`98`	`"props": [`
`99`	`99`	`{`
`100`	`100`	`"prop": "text",`
`101`		`- "description": "Text to place in the toggle button, or in the split button is split mode"`
	`101`	`+ "description": "Text to place in the toggle element (link)"`
`102`	`102`	`},`
`103`	`103`	`{`
`104`	`104`	`"prop": "html",`
`105`		`- "description": "HTML string to place in the toggle button, or in the split button is split mode. Use with caution"`
	`105`	`+ "description": "HTML string to place in the toggle element (link). Use with caution"`
`106`	`106`	`},`
`107`	`107`	`{`
`108`	`108`	`"prop": "dropup",`
`@@ -138,16 +138,16 @@`
`138`	`138`	`},`
`139`	`139`	`{`
`140`	`140`	`"prop": "toggleClass",`
`141`		`- "description": "CSS class (or classes) to add to the toggle button"`
	`141`	`+ "description": "CSS class (or classes) to add to the toggle element (link)"`
`142`	`142`	`},`
`143`	`143`	`{`
`144`	`144`	`"prop": "noCaret",`
`145`		`- "description": "Hide the caret indicator on the toggle button"`
	`145`	`+ "description": "Hide the caret indicator on the toggle element (link)"`
`146`	`146`	`},`
`147`	`147`	`{`
`148`	`148`	`"prop": "boundary",`
`149`	`149`	`"version": "2.4.0",`
`150`		`- "description": "The boundary constraint of the menu: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement. Has no effect when dropdown is inside a b-navbar"`
	`150`	+ "description": "The boundary constraint of the menu: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement. Has no effect when dropdown is inside a `<b-navbar>`"
`151`	`151`	`}`
`152`	`152`	`],`
`153`	`153`	`"slots": [`