Skip to content

Commit 9afa3d6

Browse files
committed
(Calendar) Fix internal state reset #27
Don't reset to null, but to selection data.
1 parent e1d36c6 commit 9afa3d6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

calendar/src/main/java/com/maxkeppeler/sheets/calendar/CalendarState.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,11 @@ internal class CalendarState(
262262
}
263263

264264
override fun reset() {
265-
date.value = null
265+
date.value = selection.dateValue
266266
dates.clear()
267+
dates.addAll(selection.datesValue)
267268
range.clear()
269+
range.addAll(selection.rangeValue)
268270
}
269271

270272
companion object {

calendar/src/main/java/com/maxkeppeler/sheets/calendar/views/CalendarBaseSelectionComponent.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,13 @@ internal fun CalendarBaseSelectionComponent(
6868
onYearView: LazyListScope.() -> Unit
6969
) {
7070

71-
val baseModifier = modifier
72-
.sizeIn(
73-
maxHeight = BaseConstants.DYNAMIC_SIZE_MAX,
74-
maxWidth = BaseConstants.DYNAMIC_SIZE_MAX
75-
)
76-
.then(
71+
val baseModifier = modifier.then(
7772
when (orientation) {
7873
LibOrientation.PORTRAIT -> Modifier.padding(top = dimensionResource(RC.dimen.scd_normal_100))
79-
LibOrientation.LANDSCAPE -> Modifier
74+
LibOrientation.LANDSCAPE -> Modifier.sizeIn(
75+
maxHeight = BaseConstants.DYNAMIC_SIZE_MAX,
76+
maxWidth = BaseConstants.DYNAMIC_SIZE_MAX
77+
)
8078
}
8179
)
8280

0 commit comments

Comments
 (0)