From 9bd1fe0fb648314c0ca2ac1a53689a12ff1d5ae1 Mon Sep 17 00:00:00 2001
From: PucklaJ <jonaas.pucher000000@gmail.com>
Date: Thu, 14 Dec 2023 11:30:45 +0100
Subject: [PATCH] Readd OnSelected callback to Calendar

---
 cmd/calendar_demo/main.go | 20 +++++++++++++-------
 widget/calendar.go        | 28 ++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/cmd/calendar_demo/main.go b/cmd/calendar_demo/main.go
index 99311d53..bf9f1347 100644
--- a/cmd/calendar_demo/main.go
+++ b/cmd/calendar_demo/main.go
@@ -15,15 +15,17 @@ func main() {
 	a := app.New()
 	w := a.NewWindow("Calendar")
 
-	i := widget.NewLabel("Please Choose a Date")
+	i := widget.NewLabel("OnChanged")
 	i.Alignment = fyne.TextAlignCenter
 	l := widget.NewLabel("")
 	l.Alignment = fyne.TextAlignCenter
-	d := &date{instruction: i, dateChosen: l}
+	ll := widget.NewLabel("OnSelected: ")
+	d := &date{selectedDates: l, dateSelected: ll}
 
 	// Defines which date you would like the calendar to start
 	startingDate := time.Now()
-	calendar := xwidget.NewCalendar(startingDate, d.onChanged)
+	calendar := xwidget.NewCalendarWithMode(startingDate, d.onChanged, xwidget.CalendarSingle)
+	calendar.OnSelected = d.onSelected
 
 	selection := widget.NewRadioGroup([]string{"Single", "Multi", "Range"}, func(s string) {
 		calendar.ClearSelection()
@@ -47,6 +49,7 @@ func main() {
 	c := container.NewVBox(
 		i,
 		scroll,
+		ll,
 		calendar,
 		selection,
 	)
@@ -56,16 +59,19 @@ func main() {
 }
 
 type date struct {
-	instruction *widget.Label
-	dateChosen  *widget.Label
+	selectedDates *widget.Label
+	dateSelected  *widget.Label
 }
 
 func (d *date) onChanged(selectedDates []time.Time) {
 	// use time object to set text on label with given format
-	d.instruction.SetText("Date Selected:")
 	var str string
 	for _, d := range selectedDates {
 		str += fmt.Sprint(d.Format("Mon 02 Jan 2006"), "\n")
 	}
-	d.dateChosen.SetText(str)
+	d.selectedDates.SetText(str)
+}
+
+func (d *date) onSelected(selectedDate time.Time) {
+	d.dateSelected.SetText("OnSelected: " + selectedDate.Format("Mon 02 Jan 2006"))
 }
diff --git a/widget/calendar.go b/widget/calendar.go
index c3ff3685..bb2093a0 100644
--- a/widget/calendar.go
+++ b/widget/calendar.go
@@ -115,6 +115,7 @@ type Calendar struct {
 	SelectionMode int
 	SelectedDates []time.Time
 	OnChanged     func([]time.Time)
+	OnSelected    func(time.Time)
 }
 
 func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
@@ -145,10 +146,10 @@ func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
 		b = widget.NewButton(s, func() {
 
 			selectedDate := c.dateForButton(dayNum)
+			isSelected := false
 
 			if c.SelectionMode == CalendarSingle {
 				// Unselect all currently selected buttons
-				isSelected := false
 				for _, t := range c.SelectedDates {
 					tYear, tMonth, tDay := t.Date()
 
@@ -169,6 +170,7 @@ func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
 				} else {
 					c.SelectedDates = c.SelectedDates[:0]
 				}
+				isSelected = !isSelected
 			} else if c.SelectionMode == CalendarMulti {
 				// Only add it to the slice if it does not contain it
 				var index int
@@ -184,6 +186,7 @@ func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
 				if !found {
 					c.SelectedDates = append(c.SelectedDates, selectedDate)
 					b.Importance = calendarSelectColor
+					isSelected = true
 				} else {
 					c.SelectedDates = append(c.SelectedDates[:index], c.SelectedDates[index+1:]...)
 					b.Importance = calendarUnselectColor
@@ -200,6 +203,7 @@ func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
 					dateButtons[sDay].Refresh()
 
 					c.SelectedDates = append(c.SelectedDates, selectedDate)
+					isSelected = true
 				} else if len(c.SelectedDates) == 1 {
 					if dateEquals(c.SelectedDates[0], selectedDate) {
 						sDay := selectedDate.Day()
@@ -238,6 +242,7 @@ func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
 						}
 
 						c.SelectedDates = allDates
+						isSelected = true
 					}
 				} else {
 					if dateEquals(c.SelectedDates[0], selectedDate) {
@@ -293,6 +298,7 @@ func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
 							}
 
 							c.SelectedDates = c.SelectedDates[index:]
+							isSelected = true
 						} else {
 							// Change the end to the current one
 							for _, t := range c.SelectedDates[index+1:] {
@@ -304,6 +310,7 @@ func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
 							}
 
 							c.SelectedDates = c.SelectedDates[:index+1]
+							isSelected = true
 						}
 					} else {
 						// if a date outside start and end is clicked
@@ -343,6 +350,8 @@ func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
 
 							c.SelectedDates = append(c.SelectedDates, selectedDate)
 						}
+
+						isSelected = true
 					}
 				}
 			}
@@ -350,6 +359,9 @@ func (c *Calendar) daysOfMonth() []fyne.CanvasObject {
 			if c.OnChanged != nil {
 				c.OnChanged(c.SelectedDates)
 			}
+			if isSelected && c.OnSelected != nil {
+				c.OnSelected(selectedDate)
+			}
 		})
 
 		// Give the selected dates a different importance
@@ -432,10 +444,22 @@ func (c *Calendar) CreateRenderer() fyne.WidgetRenderer {
 }
 
 // NewCalendar creates a calendar instance
-func NewCalendar(cT time.Time, onChanged func([]time.Time)) *Calendar {
+func NewCalendar(cT time.Time, onSelected func(time.Time)) *Calendar {
 	c := &Calendar{
 		currentTime:   cT,
 		SelectionMode: CalendarSingle,
+		OnSelected:    onSelected,
+	}
+
+	c.ExtendBaseWidget(c)
+
+	return c
+}
+
+func NewCalendarWithMode(cT time.Time, onChanged func([]time.Time), mode int) *Calendar {
+	c := &Calendar{
+		currentTime:   cT,
+		SelectionMode: mode,
 		OnChanged:     onChanged,
 	}