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

Jump to bottom

種別モーダルレイアウト修正 #3616

Merged
merged 1 commit into from
Jul 26, 2024
Merged

種別モーダルレイアウト修正 #3616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 16 additions & 7 deletions src/components/TrainTypeInfoModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { useMemo } from 'react'
import { Modal, Platform, SafeAreaView, StyleSheet, View } from 'react-native'
import { Modal, Platform, StyleSheet, View } from 'react-native'
import { RFValue } from 'react-native-responsive-fontsize'
import { useSafeAreaInsets } from 'react-native-safe-area-context'
import { useRecoilValue } from 'recoil'
import { Line, Station, TrainType } from '../../gen/proto/stationapi_pb'
import { LED_THEME_BG_COLOR } from '../constants'
Expand Down Expand Up @@ -34,8 +35,8 @@ const styles = StyleSheet.create({
},
modalView: {
paddingVertical: 24,
height: isTablet ? undefined : 'auto',
width: '100%',
justifyContent: 'center',
alignItems: 'center',
},
buttons: {
marginTop: isTablet ? 12 : 6,
Expand All @@ -58,6 +59,8 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
const isLEDTheme = useRecoilValue(isLEDSelector)
const { selectedLine } = useRecoilValue(lineState)

const { left: leftSafeArea, right: rightSafeArea } = useSafeAreaInsets()

const trainTypeLines = useMemo(
() =>
trainType.lines.length
Expand Down Expand Up @@ -85,7 +88,7 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
onRequestClose={onClose}
supportedOrientations={['landscape']}
>
<SafeAreaView style={styles.modalContainer}>
<View style={styles.modalContainer}>
<View
style={[
styles.modalView,
Expand All @@ -95,11 +98,17 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
isTablet
? {
width: '80%',
maxHeight: '90%',
shadowOpacity: 0.25,
shadowColor: '#000',
borderRadius: 16,
}
: { borderRadius: 8 },
: {
width: '100%',
height: '100%',
paddingLeft: leftSafeArea,
paddingRight: rightSafeArea,
},
]}
>
<Heading>
Expand All @@ -108,7 +117,7 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
: `${selectedLine?.nameRoman} ${trainType.nameRoman}`}
</Heading>

<View style={{ padding: isTablet ? 32 : 24 }}>
<View style={{ width: '100%', padding: isTablet ? 32 : 24 }}>
<Typography
style={{
fontSize: RFValue(14),
Expand Down Expand Up @@ -181,7 +190,7 @@ export const TrainTypeInfoModal: React.FC<Props> = ({
</Button>
</View>
</View>
</SafeAreaView>
</View>
</Modal>
)
}
6 changes: 4 additions & 2 deletions src/components/TrainTypeList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { useCallback, useMemo } from 'react'
import { FlatList, StyleSheet, TouchableOpacity, View } from 'react-native'
import { RFValue } from 'react-native-responsive-fontsize'
import { useSafeAreaInsets } from 'react-native-safe-area-context'
import { useRecoilValue } from 'recoil'
import { Line, TrainType } from '../../gen/proto/stationapi_pb'
import { currentLineSelector } from '../store/selectors/currentLine'
Expand Down Expand Up @@ -117,15 +118,14 @@ export const TrainTypeList = ({
onSelect: (item: TrainType) => void
}) => {
const isLEDTheme = useRecoilValue(isLEDSelector)

const renderItem = useCallback(
({ item }: { item: TrainType; index: number }) => {
return <ItemCell item={item} onSelect={onSelect} />
},
[onSelect]
)

const keyExtractor = useCallback((item: TrainType) => item.id.toString(), [])
const { bottom: safeAreaBottom } = useSafeAreaInsets()

return (
<FlatList
Expand All @@ -135,11 +135,13 @@ export const TrainTypeList = ({
borderWidth: 1,
flex: 1,
marginVertical: 24,
paddingBottom: safeAreaBottom + 24,
}}
data={data}
renderItem={renderItem}
keyExtractor={keyExtractor}
ItemSeparatorComponent={Separator}
ListFooterComponent={Separator}
/>
)
}
Loading