Merge branch 'fix-b-link-href-handling' of https://github.com/bootstrap-vue/bootstrap-vue into fix-b-link-href-handling

jacobmllr95 · jacobmllr95 · commit 95dd6b233723 · 2020-10-12T17:16:59.000+02:00
diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
     "@babel/plugin-transform-runtime": "^7.11.5",
     "@babel/preset-env": "^7.11.5",
     "@babel/standalone": "^7.11.6",
-    "@nuxt/content": "^1.9.0",
+    "@nuxt/content": "^1.10.0",
     "@nuxtjs/google-analytics": "^2.4.0",
     "@nuxtjs/pwa": "^3.1.2",
     "@nuxtjs/robots": "^2.4.2",
@@ -124,7 +124,7 @@
     "codesandbox": "^2.2.1",
     "core-js": ">=2.6.5 <3.0.0",
     "cross-env": "^7.0.2",
-    "eslint": "^7.10.0",
+    "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.12.0",
     "eslint-config-standard": "^14.1.1",
     "eslint-config-vue": "^2.0.2",
@@ -139,10 +139,10 @@
     "esm": "^3.2.25",
     "execa": "^4.0.3",
     "highlight.js": "^9.18.2",
-    "html-loader": "^1.3.1",
+    "html-loader": "^1.3.2",
     "husky": "^4.3.0",
     "improved-yarn-audit": "^2.3.1",
-    "jest": "^26.5.2",
+    "jest": "^26.5.3",
     "lint-staged": "^10.4.0",
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.20",
@@ -159,7 +159,7 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "sass-loader": "^10.0.3",
     "standard-version": "^9.0.0",
-    "terser": "^5.3.4",
+    "terser": "^5.3.5",
     "vue": "^2.6.12",
     "vue-jest": "^3.0.7",
     "vue-router": "^3.4.6",
diff --git a/src/components/navbar/README.md b/src/components/navbar/README.md
@@ -292,8 +292,10 @@ Internally, `<b-navbar-toggle>` uses the [`v-b-toggle` directive](/docs/directiv
 `<b-navbar-toggle>` renders the default Bootstrap v4 _hamburger_ (which is a background SVG image).
 You can supply your own content (such as an icon) via the optionally scoped `default` slot. The
 default slot scope contains the property `expanded`, which will be `true` when the collapse is
-expanded, or `false` when the collapse is collapsed. You can use this to swap the toggle content
-based on the collapse state:
+expanded, or `false` when the collapse is collapsed.
+
+Note that the `expanded` scope property only works when supplying the `target` prop as a `string`,
+and not an `array`.
 
 ```html
 <template>
diff --git a/src/components/navbar/navbar-toggle.js b/src/components/navbar/navbar-toggle.js
@@ -22,7 +22,7 @@ export const BNavbarToggle = /*#__PURE__*/ Vue.extend({
       default: () => getComponentConfig(NAME_NAVBAR_TOGGLE, 'label')
     },
     target: {
-      type: String,
+      type: [Array, String],
       required: true
     },
     disabled: {
diff --git a/src/components/navbar/package.json b/src/components/navbar/package.json
@@ -71,7 +71,7 @@
         "props": [
           {
             "prop": "target",
-            "description": "ID of the collapse the toggle controls"
+            "description": "ID (or array of IDs) of the collapse/sidebar components that should be toggled"
           },
           {
             "prop": "label",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@`
`71`	`71`	`"props": [`
`72`	`72`	`{`
`73`	`73`	`"prop": "target",`
`74`		`- "description": "ID of the collapse the toggle controls"`
	`74`	`+ "description": "ID (or array of IDs) of the collapse/sidebar components that should be toggled"`
`75`	`75`	`},`
`76`	`76`	`{`
`77`	`77`	`"prop": "label",`