Fix(Calendar): Improve type declaration using generic types with default parameters (Fixes #7555)

Fix(Calendar): Improve type declaration using generic types with default parameters (Fixes #7555) #4399