fix: 🐛 Day is selected after data is loaded
This commit is contained in:
parent
4579c1278c
commit
ccaa17bf96
|
@ -6,7 +6,7 @@ import {
|
|||
TabBar,
|
||||
Tab,
|
||||
} from '@ui-kitten/components'
|
||||
import React from 'react'
|
||||
import React, { useEffect, useState } from 'react'
|
||||
import moment from 'moment'
|
||||
import { StyleSheet, View } from 'react-native'
|
||||
import { useMenu, useTimetable } from '@skolplattformen/api-hooks'
|
||||
|
@ -95,11 +95,7 @@ export const Day = ({ weekDay, lunch, lessons }: DayProps) =>
|
|||
export const Week = ({ child }: WeekProps) => {
|
||||
moment.locale(LanguageService.getLanguageCode())
|
||||
const days = moment.weekdaysShort().slice(1, 6)
|
||||
let date = moment() // skip today after school, pick tomorrow
|
||||
//if (date.isoWeekday() > 5) date = date.add(3, 'days').startOf('week') // skip weekends, pick monday next week instead
|
||||
const [selectedIndex, setSelectedIndex] = React.useState(
|
||||
Math.min(date.isoWeekday() - 1, 5)
|
||||
)
|
||||
const [selectedIndex, setSelectedIndex] = useState(0)
|
||||
const [year, week] = [moment().isoWeekYear(), moment().isoWeek()]
|
||||
const { data: lessons } = useTimetable(
|
||||
child,
|
||||
|
@ -109,6 +105,10 @@ export const Week = ({ child }: WeekProps) => {
|
|||
)
|
||||
const { data: menu } = useMenu(child)
|
||||
|
||||
useEffect(() => {
|
||||
Math.min(moment().isoWeekday() - 1, 5)
|
||||
}, [lessons])
|
||||
|
||||
return (
|
||||
<View style={styles.view}>
|
||||
<TabBar
|
||||
|
|
|
@ -22,7 +22,7 @@ PODS:
|
|||
- OpenSSL-Universal (= 1.1.180)
|
||||
- Flipper-Glog (0.3.6)
|
||||
- Flipper-PeerTalk (0.0.4)
|
||||
- Flipper-RSocket (1.3.1):
|
||||
- Flipper-RSocket (1.3.0):
|
||||
- Flipper-Folly (~> 2.5)
|
||||
- FlipperKit (0.75.1):
|
||||
- FlipperKit/Core (= 0.75.1)
|
||||
|
@ -279,7 +279,7 @@ PODS:
|
|||
- react-native-simple-toast (1.1.3):
|
||||
- React-Core
|
||||
- Toast (~> 4.0.0)
|
||||
- react-native-webview (11.3.2):
|
||||
- react-native-webview (11.4.2):
|
||||
- React-Core
|
||||
- React-perflogger (0.64.0)
|
||||
- React-RCTActionSheet (0.64.0):
|
||||
|
@ -355,7 +355,7 @@ PODS:
|
|||
- React-Core
|
||||
- RNGestureHandler (1.10.3):
|
||||
- React-Core
|
||||
- RNLocalize (2.0.2):
|
||||
- RNLocalize (2.0.3):
|
||||
- React-Core
|
||||
- RNScreens (2.18.1):
|
||||
- React-Core
|
||||
|
@ -540,17 +540,17 @@ EXTERNAL SOURCES:
|
|||
SPEC CHECKSUMS:
|
||||
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
|
||||
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
|
||||
DoubleConversion: cde416483dac037923206447da6e1454df403714
|
||||
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
|
||||
FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5
|
||||
FBReactNativeSpec: bc9813353956ed2de2f370de75d9c1123e81f425
|
||||
FBReactNativeSpec: 0b41cf9e0b74ffa97ededb3d0210da5b4710474c
|
||||
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
|
||||
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
|
||||
Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
|
||||
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
|
||||
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
|
||||
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
|
||||
Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5
|
||||
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
|
||||
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
|
||||
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
|
||||
hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f
|
||||
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
|
||||
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
|
||||
|
@ -570,7 +570,7 @@ SPEC CHECKSUMS:
|
|||
react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979
|
||||
react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
|
||||
react-native-simple-toast: bf002828cf816775a6809f7a9ec3907509bce11f
|
||||
react-native-webview: 71567b6bf3d4e55914e580d720cc8f7df64af817
|
||||
react-native-webview: 4c85a3e5de574ee8c2c0985b4bebbdd240f49304
|
||||
React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af
|
||||
React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11
|
||||
React-RCTAnimation: 3f96f21a497ae7dabf4d2f150ee43f906aaf516f
|
||||
|
@ -588,7 +588,7 @@ SPEC CHECKSUMS:
|
|||
RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
|
||||
RNDateTimePicker: d943800c936fb01c352fcfb70439550d2cb57092
|
||||
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
|
||||
RNLocalize: 43f6c30d8e19ad92282ae434d310fb463b31f419
|
||||
RNLocalize: 99e59cad311ca1b6872b1764514009416ccba03d
|
||||
RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
|
||||
RNSVG: ce9d996113475209013317e48b05c21ee988d42e
|
||||
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
|
||||
|
|
Loading…
Reference in New Issue