🌐 AI搜索 & 代理 主页
Skip to content

fix(b-table, b-table-lite, b-table-simple): handle header variant for sticky columns (fixes #5278) #5279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmorehouse merged 19 commits into from
Apr 30, 2020
Merged

fix(b-table, b-table-lite, b-table-simple): handle header variant for sticky columns (fixes #5278) #5279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7bbaa84
fix(b-table, b-table-lite, b-table-simple): handle header variant
tmorehouse Apr 30, 2020
3cf6322
Update tfoot.js
tmorehouse Apr 30, 2020
51e7ada
Update tbody.js
tmorehouse Apr 30, 2020
532e407
Update tbody.js
tmorehouse Apr 30, 2020
1778085
Update td.js
tmorehouse Apr 30, 2020
550cb2f
Update td.js
tmorehouse Apr 30, 2020
a995597
Update td.js
tmorehouse Apr 30, 2020
04561ca
Update tbody.js
tmorehouse Apr 30, 2020
b1a09db
Update tfoot.js
tmorehouse Apr 30, 2020
ef4cbbb
Update td.js
tmorehouse Apr 30, 2020
e5b8c0d
Update th.js
tmorehouse Apr 30, 2020
74c995f
Update tr.js
tmorehouse Apr 30, 2020
26c2d91
Update thead.js
tmorehouse Apr 30, 2020
e59a259
Update td.js
tmorehouse Apr 30, 2020
867466a
Update td.js
tmorehouse Apr 30, 2020
d88bf4f
Update tbody.js
tmorehouse Apr 30, 2020
0a210b0
Update tfoot.js
tmorehouse Apr 30, 2020
d1cbd70
Update tfoot.js
tmorehouse Apr 30, 2020
cdac3e7
Merge branch 'dev' into issue-5278
jacobmllr95 Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/components/table/tbody.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ export const props = {
}
}

// TODO:
// In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit
// to the child elements, so this can be converted to a functional component
// @vue/component
export const BTbody = /*#__PURE__*/ Vue.extend({
name: 'BTbody',
Expand Down Expand Up @@ -60,7 +63,7 @@ export const BTbody = /*#__PURE__*/ Vue.extend({
// background color inheritance with Bootstrap v4 table CSS
return !this.isStacked && this.bvTable.stickyHeader
},
tableVariant() /* istanbul ignore next: Not currently sniffed in tests */ {
tableVariant() {
// Sniffed by <b-tr> / <b-td> / <b-th>
return this.bvTable.tableVariant
},
Expand Down
11 changes: 7 additions & 4 deletions src/components/table/td.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ export const props = {
}
}

// TODO:
// In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit
// to the child elements, so this can be converted to a functional component
// @vue/component
export const BTd = /*#__PURE__*/ Vue.extend({
name: 'BTableCell',
Expand Down Expand Up @@ -104,8 +107,7 @@ export const BTd = /*#__PURE__*/ Vue.extend({
headVariant() {
return this.bvTableTr.headVariant
},
/* istanbul ignore next: need to add in tests for footer variant */
footVariant() /* istanbul ignore next: need to add in tests for footer variant */ {
footVariant() {
return this.bvTableTr.footVariant
},
tableVariant() {
Expand All @@ -120,11 +122,12 @@ export const BTd = /*#__PURE__*/ Vue.extend({
cellClasses() {
// We use computed props here for improved performance by caching
// the results of the string interpolation
// TODO: need to add handling for footVariant
let variant = this.variant
if (
(!variant && this.isStickyHeader && !this.headVariant) ||
(!variant && this.isStickyColumn)
(!variant && this.isStickyColumn && this.inTfoot && !this.footVariant) ||
(!variant && this.isStickyColumn && this.inThead && !this.headVariant) ||
(!variant && this.isStickyColumn && this.inTbody)
) {
// Needed for sticky-header mode as Bootstrap v4 table cells do
// not inherit parent's background-color. Boo!
Expand Down
7 changes: 5 additions & 2 deletions src/components/table/tfoot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ export const props = {
}
}

// TODO:
// In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit
// to the child elements, so this can be converted to a functional component
// @vue/component
export const BTfoot = /*#__PURE__*/ Vue.extend({
name: 'BTfoot',
Expand All @@ -33,7 +36,7 @@ export const BTfoot = /*#__PURE__*/ Vue.extend({
// Sniffed by <b-tr> / <b-td> / <b-th>
return true
},
isDark() /* istanbul ignore next: Not currently sniffed in tests */ {
isDark() {
// Sniffed by <b-tr> / <b-td> / <b-th>
return this.bvTable.dark
},
Expand All @@ -56,7 +59,7 @@ export const BTfoot = /*#__PURE__*/ Vue.extend({
// background color inheritance with Bootstrap v4 table CSS
return !this.isStacked && this.bvTable.stickyHeader
},
tableVariant() /* istanbul ignore next: Not currently sniffed in tests */ {
tableVariant() {
// Sniffed by <b-tr> / <b-td> / <b-th>
return this.bvTable.tableVariant
},
Expand Down
3 changes: 3 additions & 0 deletions src/components/table/th.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import Vue from '../../utils/vue'
import { BTd } from './td'

// TODO:
// In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit
// to the child elements, so this can be converted to a functional component
// @vue/component
export const BTh = /*#__PURE__*/ Vue.extend({
name: 'BTh',
Expand Down
3 changes: 3 additions & 0 deletions src/components/table/thead.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ export const props = {
}
}

// TODO:
// In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit
// to the child elements, so this can be converted to a functional component
// @vue/component
export const BThead = /*#__PURE__*/ Vue.extend({
name: 'BThead',
Expand Down
3 changes: 3 additions & 0 deletions src/components/table/tr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ export const props = {
const LIGHT = 'light'
const DARK = 'dark'

// TODO:
// In Bootstrap v5, we won't need "sniffing" as table element variants properly inherit
// to the child elements, so this can be converted to a functional component
// @vue/component
export const BTr = /*#__PURE__*/ Vue.extend({
name: 'BTr',
Expand Down