Fixed #14

nheath99 · Oct 6, 2018 · 5022521 · 5022521
1 parent e706668
commit 5022521
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 12 deletions.
diff --git a/src/BlazorNodaTimeDateTimePicker/CssClassGenerator.cs b/src/BlazorNodaTimeDateTimePicker/CssClassGenerator.cs
@@ -17,26 +17,26 @@ internal static string Main(bool inline)
 
 		internal static string Day(LocalDate Date, DatePickerState State)
 		{
-			bool Disabled = State.IsDayDisabled(Date);
-			bool IsToday = Date == State.Today;
-			bool IsOld = Date.Month < State.MonthToDisplay.Month;
-			bool IsNew = Date.Month > State.MonthToDisplay.Month;
+			bool disabled = State.IsDayDisabled(Date);
+			bool isToday = Date == State.Today;
+			bool isOld = Date.Month < State.MonthToDisplay.Month;
+			bool isNew = Date.Month > State.MonthToDisplay.Month;
 
 			var sb = new List<string>
 			{
 				"day",
 				Date.DayOfWeek.IsWeekday() ? "weekday" : "weekend"
 			};
 
-			if (IsOld)
+			if (isOld)
 				sb.Add("old");
-			if (IsNew)
+			if (isNew)
 				sb.Add("new");
-			if (IsToday)
+			if (isToday)
 				sb.Add("today");
 			if (State.SelectedDate == Date)
 				sb.Add("active");
-			if (Disabled)
+			if (disabled)
 				sb.Add("disabled");
 
 			return string.Join(" ", sb);

diff --git a/src/BlazorNodaTimeDateTimePicker/DatePicker.cshtml b/src/BlazorNodaTimeDateTimePicker/DatePicker.cshtml
@@ -121,8 +121,6 @@
 	[Parameter] protected bool DisplayDaysOfWeek { get; set; } = true;
 	[Parameter] protected string DayViewHeaderFormat { get; set; } = "MMMM yyyy";
 	[Parameter] protected string MonthViewHeaderFormat { get; set; } = "yyyy";
-	[Parameter] protected bool Visible { get; set; } = false;
-	[Parameter] protected bool Inline { get; set; } = false;
 	[Parameter] protected string MaxWidth { get; set; }
 	[Parameter] protected string Width { get; set; } = "250px;";
 	[Parameter] protected bool ShowToday { get; set; } = true;
@@ -132,6 +130,16 @@
 	[Parameter] protected string ClearText { get; set; } = "Clear";
 	[Parameter] protected string CloseText { get; set; } = "Close";
 
+	[Parameter] protected bool Visible
+	{
+		get => State.Visible;
+		set => State.Visible = value;
+	}
+	[Parameter] protected bool Inline
+	{
+		get => State.Inline;
+		set => State.Inline = value;
+	}
 	[Parameter] protected IsoDayOfWeek FirstDayOfWeek
 	{
 		get => State.FirstDayOfWeek;
@@ -537,7 +545,7 @@
 		State.Log(nameof(CloseClicked));
 
 		if (!Inline)
-			Visible = false;
+			State.Close();
 	}
 
 	void OnUpdated()

diff --git a/src/BlazorNodaTimeDateTimePicker/DatePickerState.cs b/src/BlazorNodaTimeDateTimePicker/DatePickerState.cs
@@ -19,6 +19,8 @@ public DatePickerState()
 		internal LocalDate? SelectedDate { get; set; }
 		internal LocalDate MonthToDisplay { get; private set; }
 		internal ViewMode ViewMode { get; private set; } = ViewMode.Days;
+		internal bool Visible { get; set; }
+		internal bool Inline { get; set; }
 		internal IsoDayOfWeek FirstDayOfWeek { get; set; } = IsoDayOfWeek.Monday;
 
 		internal LocalDate MinDate { get; set; } = LocalDate.MinIsoValue;
@@ -64,6 +66,7 @@ void SelectedDateChanged()
 
 		void Updated() => OnUpdated?.Invoke();
 		void Opened() => OnOpened?.Invoke();
+		void Closed() => OnClosed?.Invoke();
 		void TodaySelected() => OnToday?.Invoke();
 		void StateChanged() => OnStateChanged?.Invoke();
 		void MonthToDisplayChanged() => OnMonthToDisplayChanged?.Invoke();
@@ -267,7 +270,7 @@ internal bool IsDayDisabled(LocalDate date)
 				if (DisabledDates != null)
 				{
 					if (DisabledDates.Contains(date))
-						return false;
+						return true;					
 				}
 
 				if (date < MinDate)
@@ -360,5 +363,23 @@ internal bool IsDecadeDisabled(int decade)
 
 			return false;
 		}
+
+		internal void Open()
+		{
+			if (!Inline)
+			{
+				Visible = true;
+				Opened();
+			}
+		}
+
+		internal void Close()
+		{
+			if (!Inline)
+			{
+				Visible = false;
+				Closed();
+			}
+		}
 	}
 }