Skip to content

Conditional rendering of week calendar and calendar list #2647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Changes for day names
  • Loading branch information
nitzanyiz committed Apr 23, 2025
commit d8ae99678a64b51da51807b454ed6ca474cb5311
1 change: 1 addition & 0 deletions src/expandableCalendar/WeekCalendar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ const WeekCalendar = (props: WeekCalendarProps) => {
month={currentMonth}
accessibilityElementsHidden={true} // iOS
importantForAccessibility={'no-hide-descendants'} // Android
hideDayNames={true}
/>
);
};
Expand Down
4 changes: 2 additions & 2 deletions src/expandableCalendar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ const ExpandableCalendar = forwardRef<ExpandableCalendarRef, ExpandableCalendarP

const renderKnob = () => {
return (
<View style={style.current.knobContainer} pointerEvents={'box-none'}>
<View style={[style.current.knobContainer, !disablePan && style.current.knobPosition]} pointerEvents={'box-none'}>
<TouchableOpacity
style={style.current.knob}
testID={`${testID}.knob`}
Expand All @@ -623,7 +623,7 @@ const ExpandableCalendar = forwardRef<ExpandableCalendarRef, ExpandableCalendarP
const WeekComponent = disableWeekScroll ? Week : WeekCalendar;
return (
<WeekComponent
showHeader
showHeader={disablePan}
testID={`${testID}.weekCalendar`}
firstDay={firstDay}
{...others}
Expand Down
6 changes: 4 additions & 2 deletions src/expandableCalendar/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ export default function styleConstructor(theme: Theme = {}) {
container: {
backgroundColor: appStyle.calendarBackground
},
knobContainer: {
knobPosition: {
position: 'absolute',
left: 0,
right: 0,
height: KNOB_CONTAINER_HEIGHT,
bottom: 0,
},
knobContainer: {
height: KNOB_CONTAINER_HEIGHT,
alignItems: 'center',
justifyContent: 'center',
backgroundColor: appStyle.calendarBackground
Expand Down