From 07e73a2227e10f983a6db0d8736cec534ad4dc1d Mon Sep 17 00:00:00 2001 From: Nitzan Yizhar Date: Wed, 16 Apr 2025 18:53:31 +0300 Subject: [PATCH 1/4] Removed hidden for accessible calendar --- src/expandableCalendar/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/expandableCalendar/index.tsx b/src/expandableCalendar/index.tsx index ce8ed2dd8..cee93b960 100644 --- a/src/expandableCalendar/index.tsx +++ b/src/expandableCalendar/index.tsx @@ -269,8 +269,8 @@ const ExpandableCalendar = forwardRef { - return [allowShadow && style.current.containerShadow, propsStyle, headerHeight === 0 && style.current.hidden, {overflow: 'hidden'} as const]; - }, [allowShadow, propsStyle, headerHeight]); + return [allowShadow && style.current.containerShadow, propsStyle, headerHeight === 0 && !screenReaderEnabled && style.current.hidden, {overflow: 'hidden'} as const]; + }, [allowShadow, propsStyle, headerHeight, screenReaderEnabled]); const wrapperStyle = useMemo(() => { return {height: deltaY}; From e28e4b4dd0e32ab8315857ce9a04fe750a18aa62 Mon Sep 17 00:00:00 2001 From: Nitzan Yizhar Date: Sun, 20 Apr 2025 12:35:32 +0300 Subject: [PATCH 2/4] Removed screen reader patch and set onHeaderLayout to calendar --- src/expandableCalendar/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/expandableCalendar/index.tsx b/src/expandableCalendar/index.tsx index cee93b960..d5f17d49c 100644 --- a/src/expandableCalendar/index.tsx +++ b/src/expandableCalendar/index.tsx @@ -269,7 +269,7 @@ const ExpandableCalendar = forwardRef { - return [allowShadow && style.current.containerShadow, propsStyle, headerHeight === 0 && !screenReaderEnabled && style.current.hidden, {overflow: 'hidden'} as const]; + return [allowShadow && style.current.containerShadow, propsStyle, headerHeight === 0 && style.current.hidden, {overflow: 'hidden'} as const]; }, [allowShadow, propsStyle, headerHeight, screenReaderEnabled]); const wrapperStyle = useMemo(() => { @@ -632,6 +632,7 @@ const ExpandableCalendar = forwardRef Date: Sun, 20 Apr 2025 13:27:45 +0300 Subject: [PATCH 3/4] Remove screenReaderEnabled dependency from containerStyle calculation --- src/expandableCalendar/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/expandableCalendar/index.tsx b/src/expandableCalendar/index.tsx index d5f17d49c..79656a3f4 100644 --- a/src/expandableCalendar/index.tsx +++ b/src/expandableCalendar/index.tsx @@ -270,7 +270,7 @@ const ExpandableCalendar = forwardRef { return [allowShadow && style.current.containerShadow, propsStyle, headerHeight === 0 && style.current.hidden, {overflow: 'hidden'} as const]; - }, [allowShadow, propsStyle, headerHeight, screenReaderEnabled]); + }, [allowShadow, propsStyle, headerHeight]); const wrapperStyle = useMemo(() => { return {height: deltaY}; From 318714dc34034a3db27fa0bfe0de25c932fe2ac8 Mon Sep 17 00:00:00 2001 From: Nitzan Yizhar Date: Sun, 20 Apr 2025 13:28:25 +0300 Subject: [PATCH 4/4] Fix formatting issue in containerStyle calculation --- src/expandableCalendar/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/expandableCalendar/index.tsx b/src/expandableCalendar/index.tsx index 79656a3f4..11714a1da 100644 --- a/src/expandableCalendar/index.tsx +++ b/src/expandableCalendar/index.tsx @@ -269,7 +269,7 @@ const ExpandableCalendar = forwardRef { - return [allowShadow && style.current.containerShadow, propsStyle, headerHeight === 0 && style.current.hidden, {overflow: 'hidden'} as const]; + return [allowShadow && style.current.containerShadow, propsStyle, headerHeight === 0 && style.current.hidden, {overflow: 'hidden'} as const]; }, [allowShadow, propsStyle, headerHeight]); const wrapperStyle = useMemo(() => {