File tree Expand file tree Collapse file tree 2 files changed +54
-1
lines changed
test/unit/specs/PickerDay Expand file tree Collapse file tree 2 files changed +54
-1
lines changed Original file line number Diff line number Diff line change @@ -225,9 +225,12 @@ export default {
225
225
* @param {Object} day
226
226
* @return {Object}
227
227
*/
228
+ // eslint-disable-next-line complexity
228
229
dayClasses (day ) {
229
230
return {
230
- ' selected' : day .isSelected ,
231
+ ' selected' : this .showEdgeDates
232
+ ? day .isSelected
233
+ : day .isSelected && ! day .isPreviousMonth && ! day .isNextMonth ,
231
234
' disabled' : day .isDisabled ,
232
235
' highlighted' : day .isHighlighted ,
233
236
' muted' : day .isPreviousMonth || day .isNextMonth ,
Original file line number Diff line number Diff line change @@ -102,4 +102,54 @@ describe('PickerDay: DOM', () => {
102
102
103
103
expect ( wrapper . emitted ( 'select' ) [ 0 ] [ 0 ] . date ) . toBe ( 3 )
104
104
} )
105
+
106
+ it ( "only highlights today's edge date if shown" , async ( ) => {
107
+ const day = {
108
+ date : 1 ,
109
+ isToday : true ,
110
+ isPreviousMonth : false ,
111
+ isNextMonth : true ,
112
+ }
113
+
114
+ await wrapper . setProps ( {
115
+ showEdgeDates : true ,
116
+ } )
117
+
118
+ let dayClasses = wrapper . vm . dayClasses ( day )
119
+
120
+ expect ( dayClasses . today ) . toBeTruthy ( )
121
+
122
+ await wrapper . setProps ( {
123
+ showEdgeDates : false ,
124
+ } )
125
+
126
+ dayClasses = wrapper . vm . dayClasses ( day )
127
+
128
+ expect ( dayClasses . today ) . toBeFalsy ( )
129
+ } )
130
+
131
+ it ( 'only highlights selected edge date if shown' , async ( ) => {
132
+ const day = {
133
+ date : 1 ,
134
+ isSelected : true ,
135
+ isPreviousMonth : false ,
136
+ isNextMonth : true ,
137
+ }
138
+
139
+ await wrapper . setProps ( {
140
+ showEdgeDates : true ,
141
+ } )
142
+
143
+ let dayClasses = wrapper . vm . dayClasses ( day )
144
+
145
+ expect ( dayClasses . selected ) . toBeTruthy ( )
146
+
147
+ await wrapper . setProps ( {
148
+ showEdgeDates : false ,
149
+ } )
150
+
151
+ dayClasses = wrapper . vm . dayClasses ( day )
152
+
153
+ expect ( dayClasses . selected ) . toBeFalsy ( )
154
+ } )
105
155
} )
You can’t perform that action at this time.
0 commit comments