Merge pull request #20

fix-header-buttons-disappearing
sampie777 · Nov 7, 2022 · 86e8953 · 86e8953
2 parents 0f80826 + 30e5638
commit 86e8953
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/source/gui/screens/documents/document/SingleDocument.tsx b/source/gui/screens/documents/document/SingleDocument.tsx
@@ -62,9 +62,6 @@ const SingleDocument: React.FC<NativeStackScreenProps<ParamList, "Document">> =
   const onBlur = () => {
     keepScreenAwake(false);
     setDocument(undefined);
-    navigation.setOptions({
-      title: ""
-    });
   };
 
   useEffect(() => {
@@ -78,7 +75,7 @@ const SingleDocument: React.FC<NativeStackScreenProps<ParamList, "Document">> =
     setTimeout(() => scrollToTop(), 150);
   }, [document?.id]);
 
-  useEffect(() => {
+  React.useLayoutEffect(() => {
     if (document === undefined) {
       navigation.setOptions({
         title: ""
@@ -109,9 +106,6 @@ const SingleDocument: React.FC<NativeStackScreenProps<ParamList, "Document">> =
     }
 
     setDocument(newDocument);
-    navigation.setOptions({
-      title: newDocument?.name
-    });
   };
 
   const animate = () => {

diff --git a/source/gui/screens/songs/song/SongDisplayScreen.tsx b/source/gui/screens/songs/song/SongDisplayScreen.tsx
@@ -82,10 +82,6 @@ const SongDisplayScreen: React.FC<ComponentProps> = ({ route, navigation }) => {
   const onBlur = () => {
     keepScreenAwake(false);
     setSong(undefined);
-    navigation.setOptions({
-      title: "",
-      headerRight: undefined
-    });
   };
 
   useEffect(() => {