harukin/jrshikoku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'c2ca832b804afb3b5817afece0c98b4e9e504020' into develop

Browse Source
This commit is contained in:
harukin-DeskMini 2023-02-05 05:03:31 +09:00
commit 4c47a1684c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/駅名表/Sign.js
View File

@ -145,10 +145,10 @@ const NexPreStationLine = ({ nexStation, preStation }) => {
return ( return (
<View style={styleSheet.下枠フレーム}> <View style={styleSheet.下枠フレーム}>
<View style={styleSheet.下枠フレーム}> <View style={styleSheet.下枠フレーム}>
{preStation && ( {preStation ? (
<> <>
<Text style={styleSheet.下枠左右マーク}>◀</Text> <Text style={styleSheet.下枠左右マーク}>◀</Text>
{preStation.StationNumber && ( {preStation.StationNumber ? (
<View style={styleSheet.下枠駅ナンバー}> <View style={styleSheet.下枠駅ナンバー}>
<View style={{ flex: 1 }} /> <View style={{ flex: 1 }} />
<Text <Text
@ -161,22 +161,26 @@ const NexPreStationLine = ({ nexStation, preStation }) => {
</Text> </Text>
<View style={{ flex: 1 }} /> <View style={{ flex: 1 }} />
</View> </View>
) : (
<></>
)} )}
<StationName <StationName
stringData={preStation} stringData={preStation}
ss={{ flex: 1, alignItems: "flex-start" }} ss={{ flex: 1, alignItems: "flex-start" }}
/> />
</> </>
) : (
<></>
)} )}
</View> </View>
<View style={styleSheet.下枠フレーム}> <View style={styleSheet.下枠フレーム}>
{nexStation && ( {nexStation ? (
<> <>
<StationName <StationName
stringData={nexStation} stringData={nexStation}
ss={{ flex: 1, alignItems: "flex-end" }} ss={{ flex: 1, alignItems: "flex-end" }}
/> />
{nexStation.StationNumber && ( {nexStation.StationNumber ? (
<View style={styleSheet.下枠駅ナンバー}> <View style={styleSheet.下枠駅ナンバー}>
<View style={{ flex: 1 }} /> <View style={{ flex: 1 }} />
<Text style={{ fontSize: parseInt("10%"), color: "white" }}> <Text style={{ fontSize: parseInt("10%"), color: "white" }}>
@ -184,9 +188,13 @@ const NexPreStationLine = ({ nexStation, preStation }) => {
</Text> </Text>
<View style={{ flex: 1 }} /> <View style={{ flex: 1 }} />
</View> </View>
) : (
<></>
)} )}
<Text style={styleSheet.下枠左右マーク}>▶</Text> <Text style={styleSheet.下枠左右マーク}>▶</Text>
</> </>
) : (
<></>
)} )}
</View> </View>
</View> </View>

1
menu.js
View File

@ -128,7 +128,6 @@ export default function Menu(props) {
} }
} else { } else {
setCurrentStation(undefined); setCurrentStation(undefined);
StationBoardAcSR.current?.hide();
} }
}, [location, originalStationList]); }, [location, originalStationList]);