Skip to content

Commit a88c7e3

Browse files
committed
refactor: CMedia: rename props, change behavior
- replace asidePositionClasses prop with addAsideMargin boolean, - rename asidePosition to asideVerticalPosition
1 parent 75d0ee4 commit a88c7e3

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/components/Media/CMedia.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ export default {
1919
CImg
2020
},
2121
props: {
22-
asidePositionClasses: [String, Array, Object],
22+
addAsideMargin: {
23+
type: Boolean,
24+
default: true
25+
},
2326
addAsideClasses: [String, Array, Object],
2427
addBodyClasses: [String, Array, Object],
2528
asideRight: Boolean,
2629
asideImageProps: Object,
27-
asidePosition: {
30+
asideVerticalPosition: {
2831
type: String,
2932
default: 'start',
3033
validator: val => ['start', 'center', 'end', 'stretch'].includes(val)
@@ -36,19 +39,16 @@ export default {
3639
{
3740
blankColor: '#777777',
3841
width: '64px',
39-
height: this.asidePosition === 'stretch' ? '100%' : '64px'
42+
height: this.asideVerticalPosition === 'stretch' ? '100%' : '64px'
4043
},
4144
this.asideImageProps || {}
4245
)
4346
},
44-
computedAsidePositionClasses () {
45-
return this.asidePositionClasses || `m${this.asideRight? 'l' : 'r' }-3`
46-
},
4747
asideClasses () {
4848
return [
49-
this.computedAsidePositionClasses,
49+
this.addAsideMargin ? `m${this.asideRight? 'l' : 'r' }-3` : '',
5050
this.addAsideClasses,
51-
`align-self-${this.asidePosition}`
51+
`align-self-${this.asideVerticalPosition}`
5252
]
5353
},
5454
mediaBodyClasses () {

src/components/Media/tests/CMedia.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ const ComponentName = 'CMedia'
55
const defaultWrapper = mount(Component)
66
const customWrapper = mount(Component, {
77
propsData: {
8-
asidePositionClasses: 'position-class',
8+
addAsideMargin: false,
99
addAsideClasses: 'additional-aside-class',
1010
addBodyClasses: 'additional-body-class',
1111
asideRight: true,
12-
asidePosition: 'stretch'
12+
asideVerticalPosition: 'stretch'
1313
},
1414
slots: {
1515
default: 'CMedia content'

src/components/Media/tests/__snapshots__/CMedia.spec.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ exports[`CMedia renders correctly 2`] = `
2626
class="media d-flex flex-row-reverse"
2727
>
2828
<div
29-
class="position-class additional-aside-class align-self-stretch"
29+
class="additional-aside-class align-self-stretch"
3030
>
3131
<svg
3232
class=""

src/components/index.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,12 +360,12 @@ export declare class CListGroupitem extends CLink {
360360
}
361361

362362
export declare class CMedia extends Vue {
363-
asidePositionClasses: [string, Array<any>, object]
363+
addAsideMargin: boolean
364364
addAsideClasses: [string, Array<any>, object]
365365
addBodyClasses: [string, Array<any>, object]
366366
asideRight: boolean
367367
asideImageProps: object
368-
asidePosition: string
368+
asideVerticalPosition: string
369369
}
370370

371371
export declare class CModal extends Vue {

0 commit comments

Comments
 (0)