Skip to content

Commit bf85236

Browse files
tmorehousetmorehouse
authored
Merge pull request #2978 from bootstrap-vue/dev
chore: release 2.0.0-rc.17
2 parents 7ce0847 + 85e6905 commit bf85236

File tree

360 files changed

+12332
-6702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+12332
-6702
lines changed

‎CHANGELOG.md

Lines changed: 91 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,96 @@
11
# Changelog
22

3-
All notable changes to this project will be documented in this file. See
4-
[standard-version](https://github.com/conventional-changelog/standard-version) for commit
5-
guidelines.
6-
7-
<a name="2.0.0-rc.15"></a>
3+
> All notable changes to this project will be documented in this file. See
4+
> [standard-version](https://github.com/conventional-changelog/standard-version) for commit
5+
> guidelines.
6+
7+
<a name="2.0.0-rc.17"></a>
8+
9+
## [v2.0.0-rc.17](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.0.0-rc.16...v2.0.0-rc.17)
10+
11+
Released 2019-04-07
12+
13+
### Bug Fixes v2.0.0-rc.17
14+
15+
- **breadcrumb-item:** remove atribute `role="presentation"` for better ARIA support
16+
([#2991](https://github.com/bootstrap-vue/bootstrap-vue/issues/2991))
17+
([e84c4a7](https://github.com/bootstrap-vue/bootstrap-vue/commit/e84c4a7))
18+
- **docs:** add back missing leading slash to search urls
19+
([#2947](https://github.com/bootstrap-vue/bootstrap-vue/issues/2947))
20+
([fff8795](https://github.com/bootstrap-vue/bootstrap-vue/commit/fff8795))
21+
- **docs:** fix component plugin's included plugins and directives
22+
([#2966](https://github.com/bootstrap-vue/bootstrap-vue/issues/2966))
23+
([cbf24c3](https://github.com/bootstrap-vue/bootstrap-vue/commit/cbf24c3))
24+
- **docs:** fix issue with table docs page (closes
25+
[#2939](https://github.com/bootstrap-vue/bootstrap-vue/issues/2939))
26+
([#2940](https://github.com/bootstrap-vue/bootstrap-vue/issues/2940))
27+
([c6abfd0](https://github.com/bootstrap-vue/bootstrap-vue/commit/c6abfd0))
28+
- **env:** check for undefined on process (closes
29+
[#2958](https://github.com/bootstrap-vue/bootstrap-vue/issues/2958))
30+
([#2959](https://github.com/bootstrap-vue/bootstrap-vue/issues/2959))
31+
([0c3a7b0](https://github.com/bootstrap-vue/bootstrap-vue/commit/0c3a7b0))
32+
- **form-group:** don't render `aria-labelledby` on group when `label-for` provided (fixes
33+
[#2933](https://github.com/bootstrap-vue/bootstrap-vue/issues/2933))
34+
([#2936](https://github.com/bootstrap-vue/bootstrap-vue/issues/2936))
35+
([8058c03](https://github.com/bootstrap-vue/bootstrap-vue/commit/8058c03))
36+
- **form-textarea:** improved computedHeight calculation when in auto resize mode
37+
([#3012](https://github.com/bootstrap-vue/bootstrap-vue/issues/3012))
38+
([0043b92](https://github.com/bootstrap-vue/bootstrap-vue/commit/0043b92))
39+
- **link:** support handling multiple click event listeners (fixes
40+
[#2938](https://github.com/bootstrap-vue/bootstrap-vue/issues/2938))
41+
([#2943](https://github.com/bootstrap-vue/bootstrap-vue/issues/2943))
42+
([97e8ece](https://github.com/bootstrap-vue/bootstrap-vue/commit/97e8ece))
43+
- **modal:** prevent close on backdrop when click initiated inside modal content (fixes
44+
[#3025](https://github.com/bootstrap-vue/bootstrap-vue/issues/3025))
45+
([#3029](https://github.com/bootstrap-vue/bootstrap-vue/issues/3029))
46+
([ad57e8c](https://github.com/bootstrap-vue/bootstrap-vue/commit/ad57e8c))
47+
- **modal:** prevent page scroll as modal opens
48+
([#2963](https://github.com/bootstrap-vue/bootstrap-vue/issues/2963))
49+
([3bf3622](https://github.com/bootstrap-vue/bootstrap-vue/commit/3bf3622))
50+
- **modal:** improve stacked modal z-index calculations (closes
51+
[#3015](https://github.com/bootstrap-vue/bootstrap-vue/issues/3015))
52+
([#3017](https://github.com/bootstrap-vue/bootstrap-vue/issues/3017))
53+
([891e8cc](https://github.com/bootstrap-vue/bootstrap-vue/commit/891e8cc))
54+
- **pagination:** reset to page 1 when `total-rows` or `per-page` changes (closes
55+
[#2987](https://github.com/bootstrap-vue/bootstrap-vue/issues/2987))
56+
([#2993](https://github.com/bootstrap-vue/bootstrap-vue/issues/2993))
57+
([df2e77a](https://github.com/bootstrap-vue/bootstrap-vue/commit/df2e77a))
58+
- **pagination-nav:** better current page detection in IE
59+
([#3006](https://github.com/bootstrap-vue/bootstrap-vue/issues/3006))
60+
([f742aa9](https://github.com/bootstrap-vue/bootstrap-vue/commit/f742aa9))
61+
- **tooltip/popover:** prevent double show/shown event emits when `.sync` modifier used (fixes
62+
[#1637](https://github.com/bootstrap-vue/bootstrap-vue/issues/1637))
63+
([#3001](https://github.com/bootstrap-vue/bootstrap-vue/issues/3001))
64+
([0d3599a](https://github.com/bootstrap-vue/bootstrap-vue/commit/0d3599a))
65+
- **utils/get:** handle case when nested value is falsy
66+
([#2982](https://github.com/bootstrap-vue/bootstrap-vue/issues/2982))
67+
([40f6cb7](https://github.com/bootstrap-vue/bootstrap-vue/commit/40f6cb7))
68+
- **v-b-toggle/b-collapse:** ensure toggle remains in sync with collapse (Closes
69+
[#3020](https://github.com/bootstrap-vue/bootstrap-vue/issues/3020))
70+
([#3021](https://github.com/bootstrap-vue/bootstrap-vue/issues/3021))
71+
([6b36d0d](https://github.com/bootstrap-vue/bootstrap-vue/commit/6b36d0d))
72+
73+
### Features v2.0.0-rc.17
74+
75+
- **docs:** algolia powered search
76+
([#2952](https://github.com/bootstrap-vue/bootstrap-vue/issues/2952))
77+
([0417f7b](https://github.com/bootstrap-vue/bootstrap-vue/commit/0417f7b))
78+
- **modal:** auto return focus to trigger element using previous document.activeElement if no
79+
return focus element provided
80+
([#3033](https://github.com/bootstrap-vue/bootstrap-vue/issues/3033))
81+
([e5c0aa5](https://github.com/bootstrap-vue/bootstrap-vue/commit/e5c0aa5))
82+
- **modal:** subclass `BvEvent` as `BvModalEvent` for modal specific properties
83+
([#3024](https://github.com/bootstrap-vue/bootstrap-vue/issues/3024))
84+
([502eba9](https://github.com/bootstrap-vue/bootstrap-vue/commit/502eba9))
85+
- **table:** add TypeScript definitions for table fields
86+
([#2867](https://github.com/bootstrap-vue/bootstrap-vue/issues/2867))
87+
([436e8c1](https://github.com/bootstrap-vue/bootstrap-vue/commit/436e8c1))
88+
- **v-b-scrollspy:** support when vue-router is in `hash` based route mode (closes
89+
[#2722](https://github.com/bootstrap-vue/bootstrap-vue/issues/2722))
90+
([#2953](https://github.com/bootstrap-vue/bootstrap-vue/issues/2953))
91+
([a713dd4](https://github.com/bootstrap-vue/bootstrap-vue/commit/a713dd4))
92+
93+
<a name="2.0.0-rc.16"></a>
894

995
## [v2.0.0-rc.16](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.0.0-rc.15...v2.0.0-rc.16)
1096

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing
22

3-
👍🎉 First off, thanks for taking the time to contribute! 🎉👍
3+
> 👍🎉 First off, thanks for taking the time to contribute! 🎉👍
44
55
## Playground & Issue Reports
66

‎docs/assets/scss/styles.scss

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,46 @@ pre.editable.error:after {
145145
background-color: rgba(255, 0, 0, 0.1);
146146
}
147147

148+
/* Additional styling for (responsive) markdown tables */
149+
.bv-docs-table {
150+
font-size: 90%;
151+
152+
thead > tr > th {
153+
min-width: 80px;
154+
}
155+
156+
code {
157+
white-space: nowrap !important;
158+
}
159+
}
160+
148161
/* CSS for table transition example */
149162
table#table-transition-example {
150163
.flip-list-move {
151164
transition: transform 1s;
152165
}
153166
}
167+
168+
/*
169+
* Docsearch overrides
170+
* See: https://github.com/twbs/bootstrap/blob/master/site/static/docs/4.3/assets/scss/_algolia.scss
171+
*/
172+
.algolia-autocomplete {
173+
.ds-dropdown-menu {
174+
background: #fff !important;
175+
border: 1px solid rgba(0, 0, 0, 0.1) !important;
176+
box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.175) !important;
177+
178+
.ds-suggestions {
179+
@media (min-width: 768px) {
180+
max-height: calc(100vh - 12rem);
181+
overflow-y: auto;
182+
}
183+
184+
.algolia-docsearch-suggestion--subcategory-inline,
185+
.algolia-docsearch-suggestion--title {
186+
display: inline-block !important;
187+
}
188+
}
189+
}
190+
}

‎docs/components/componentdoc.vue

Lines changed: 49 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,25 @@
3030
<b-table
3131
:items="propsItems"
3232
:fields="propsFields"
33+
class="bv-docs-table"
34+
responsive="sm"
3335
small
3436
head-variant="default"
3537
striped
3638
>
37-
<template slot="prop" slot-scope="{ value }">
38-
<code>{{ value }}</code>
39+
<template slot="prop" slot-scope="{ value, item }">
40+
<code class="text-nowrap">{{ value }}</code>
41+
<b-badge v-if="item.required" variant="info">Required</b-badge>
42+
<b-badge v-else-if="item.deprecated" variant="danger">Deprecated</b-badge>
43+
<b-badge v-else-if="item.deprecation" variant="warning">Deprecation</b-badge>
3944
</template>
4045
<template slot="row-details" slot-scope="{ item }">
41-
<b-badge variant="warning">
42-
{{ typeof item.deprecated === 'string' ? 'deprecation' : 'deprecated' }}
43-
</b-badge>
44-
<!-- If deprecated is a string, show the string value -->
45-
<small v-if="typeof item.deprecated === 'string'">{{ item.deprecated }}</small>
46+
<p v-if="typeof item.deprecated === 'string'" class="mb-1 small">
47+
{{ item.deprecated }}
48+
</p>
49+
<p v-if="typeof item.deprecation === 'string'" class="mb-1 small">
50+
{{ item.deprecation }}
51+
</p>
4652
</template>
4753
<template slot="defaultValue" slot-scope="{ value }">
4854
<code v-if="value">{{ value }}</code>
@@ -56,6 +62,8 @@
5662
<b-table
5763
:items="[componentVModel]"
5864
:fields="['prop', 'event']"
65+
class="bv-docs-table"
66+
responsive="sm"
5967
small
6068
head-variant="default"
6169
striped
@@ -77,10 +85,16 @@
7785
<b-table
7886
:items="slots"
7987
:fields="slotsFields"
88+
class="bv-docs-table"
89+
responsive="sm"
8090
small
8191
head-variant="default"
8292
striped
83-
></b-table>
93+
>
94+
<template slot="name" slot-scope="{ value }">
95+
<code class="text-nowrap">{{ value }}</code>
96+
</template>
97+
</b-table>
8498
</article>
8599

86100
<article v-if="events && events.length > 0">
@@ -90,17 +104,22 @@
90104
<b-table
91105
:items="events"
92106
:fields="eventsFields"
107+
class="bv-docs-table"
108+
responsive="sm"
93109
small
94110
head-variant="default"
95111
striped
96112
>
113+
<template slot="event" slot-scope="{ value }">
114+
<code class="text-nowrap">{{ value }}</code>
115+
</template>
97116
<template slot="args" slot-scope="{ value, item }">
98117
<div
99118
v-for="arg in value"
100119
:key="`event-${item.event}-${arg.arg ? arg.arg : 'none'}`"
101120
>
102-
<template v-if="arg.arg"><code>{{ arg.arg }}</code> - </template>
103-
<span v-html="arg.description"></span>
121+
<template v-if="arg.arg"><code class="text-nowrap">{{ arg.arg }}</code> - </template>
122+
<span>{{ arg.description }}</span>
104123
</div>
105124
</template>
106125
</b-table>
@@ -117,17 +136,24 @@
117136
<b-table
118137
:items="rootEventListeners"
119138
:fields="rootEventListenersFields"
139+
class="bv-docs-table"
140+
responsive="sm"
120141
small
121142
head-variant="default"
122143
striped
123144
>
145+
<template slot="event" slot-scope="{ value }">
146+
<code class="text-nowrap">{{ value }}</code>
147+
</template>
124148
<template slot="args" slot-scope="{ value, item }">
125149
<div
126150
v-for="arg in value"
127151
:key="`event-${item.event}-${arg.arg ? arg.arg : 'none'}`"
128152
>
129-
<template v-if="arg.arg"><code>{{ arg.arg }}</code> - </template>
130-
<span v-html="arg.description"></span>
153+
<template v-if="arg.arg">
154+
<code class="text-nowrap">{{ arg.arg }}</code>
155+
<span v-if="arg.description"> - {{ arg.description }}</span>
156+
</template>
131157
</div>
132158
</template>
133159
</b-table>
@@ -181,8 +207,12 @@ export default {
181207
let options = {}
182208
if (!component.options && typeof component === 'function') {
183209
// Async component that hans't been resolved yet
184-
component(opts => {
185-
options = opts ? { ...opts } : {}
210+
component(cmp => {
211+
if (Object.prototype.toString.call(cmp) === '[object Object]') {
212+
options = { ...cmp }
213+
} else if (cmp && cmp.options) {
214+
options = cmp.options
215+
}
186216
})
187217
} else {
188218
// Regular component
@@ -203,22 +233,11 @@ export default {
203233
return this.componentOptions.props || {}
204234
},
205235
propsFields() {
206-
const props = this.componentProps
207-
const hasRequired = Object.keys(props).some(p => props[p].required)
208-
209-
const fields = [
236+
return [
210237
{ key: 'prop', label: 'Property' },
211238
{ key: 'type', label: 'Type' },
212239
{ key: 'defaultValue', label: 'Default Value' }
213240
]
214-
215-
// Add the required column if there are required field(s)
216-
if (hasRequired) {
217-
// Insert required field after prop name
218-
fields.splice(1, 0, { key: 'required', label: 'Required' })
219-
}
220-
221-
return fields
222241
},
223242
eventsFields() {
224243
return [
@@ -267,19 +286,15 @@ export default {
267286
}
268287
defaultVal = (defaultVal || '').replace(/"/g, "'")
269288
270-
// Requied prop?
271-
const required = p.required ? 'Yes' : ''
272-
// Deprecation?
273-
const deprecated = p.deprecated || false
274-
275289
return {
276290
prop: kebabCase(prop),
277291
type,
278-
required,
279292
typeClass,
280293
defaultValue: defaultVal,
281-
deprecated,
282-
_showDetails: !!deprecated
294+
required: p.required || false,
295+
deprecated: p.deprecated || false,
296+
deprecation: p.deprecation || false,
297+
_showDetails: typeof p.deprecated === 'string' || typeof p.deprecation === 'string'
283298
}
284299
})
285300
},

0 commit comments

Comments
 (0)