@@ -11,18 +11,18 @@ export default {
11
11
name: ' CSidebar' ,
12
12
props: {
13
13
fixed: Boolean ,
14
+ breakpoint: {
15
+ type: [String , Boolean ],
16
+ default: ' lg' ,
17
+ validator : val => [false , ' ' , ' sm' , ' md' , ' lg' , ' xl' ].includes (val)
18
+ },
14
19
minimize: Boolean ,
15
20
show: {
16
21
type: Boolean ,
17
22
default: true
18
23
},
19
24
mobileShow: Boolean ,
20
25
noHideOnMobileClick: Boolean ,
21
- breakpoint: {
22
- type: [String , Boolean ],
23
- default: ' lg' ,
24
- validator : val => [false , ' sm' , ' md' , ' lg' , ' xl' ].includes (val)
25
- },
26
26
aside: Boolean ,
27
27
light: Boolean
28
28
},
@@ -45,9 +45,12 @@ export default {
45
45
mounted () {
46
46
this .erd .listenTo (document .body , (el ) => this .bodyWidth = el .clientWidth )
47
47
48
- this .$root .$on (` c-${ this .mode } -toggle-minimize` , () => {
49
- this .switchState (' minimized' )
48
+ this .$root .$on (` c-sidebar-minimize` , (evt ) => {
49
+ if (this .$el .contains (evt .target )) {
50
+ this .switchState (' minimized' )
51
+ }
50
52
})
53
+
51
54
this .$root .$on (` c-${ this .mode } -toggle` , () => {
52
55
if (this .isOnMobile ) {
53
56
this .switchState (' mobileOpen' )
@@ -100,9 +103,9 @@ export default {
100
103
` c-sidebar-${ this .light ? ' light' : ' dark' } ` ,
101
104
{
102
105
' c-sidebar-show' : this .isOnMobile && this .mobileOpen ,
103
- [` c-sidebar-${ this .breakpoint } -show` ]: this .open ,
106
+ [` c-sidebar-${ this .breakpoint } -show` ]: this .open && this . breakpoint ,
104
107
' c-sidebar-fixed' : this .fixed ,
105
- ' c-sidebar-minimized' : this .minimized ,
108
+ ' c-sidebar-minimized' : this .minimized && ! this . isOnMobile ,
106
109
' c-sidebar-right' : this .aside
107
110
}
108
111
]
0 commit comments