Skip to content
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.

Sign up for GitHub

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

fix: assure correct initialPage in timetable #30

Merged
merged 10 commits into from
Jul 19, 2024
Merged

fix: assure correct initialPage in timetable #30

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4922d87
swipable timetable
builder-247 Jul 11, 2024
d031dc2
wip - static date selector
builder-247 Jul 16, 2024
c3493c2
re-add previous and next buttons
builder-247 Jul 16, 2024
5557400
fix
builder-247 Jul 18, 2024
e7ee481
Merge branch 'main' into timetable-ux
builder-247 Jul 18, 2024
41b453a
fix: event favorites read as bulk operation
Adventune Jul 18, 2024
d27a3c4
fix: linting issues
Adventune Jul 18, 2024
b9e4d8d
chore: format code
antoKeinanen Jul 18, 2024
d758ab9
fix: assure correct initialPage in timetable
builder-247 Jul 18, 2024
e814a1b
Merge branch 'main' into timetable-ux
builder-247 Jul 18, 2024
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
4 changes: 2 additions & 2 deletions elements/timetable/Timetable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const AnimatedPager = Animated.createAnimatedComponent(PagerView);

const Timetable = () => {
const [events, setEvents] = useState<AssemblyEvent[][]>([]);
const [eventDayIndex, setEventDayIndex] = useState(0);
const [eventDayIndex, setEventDayIndex] = useState(-1);
const { favorites, toggle: toggleFavorite } = useFavorite();

const callback = useCallback((position: number) => {
Expand Down Expand Up @@ -59,7 +59,7 @@ const Timetable = () => {

return (
<View style={{ flex: 1 }}>
{events.length === 0 ? (
{events.length === 0 || eventDayIndex === -1 ? (
<ActivityIndicator animating />
) : (
<View
Expand Down
Loading