about summary refs log tree commit diff
path: root/src/App.web.tsx
diff options
context:
space:
mode:
authorPaul Frazee <pfrazee@gmail.com>2023-03-13 16:01:43 -0500
committerGitHub <noreply@github.com>2023-03-13 16:01:43 -0500
commit56cf890debeb9872f791ccb992a5587f2c05fd9e (patch)
tree929453b41274a712d8b2fce441e98a0cd030d305 /src/App.web.tsx
parent503e03d91e1de4bfeabec1eb2d97dcdceb13fcc5 (diff)
downloadvoidsky-56cf890debeb9872f791ccb992a5587f2c05fd9e.tar.zst
Move to expo and react-navigation (#288)
* WIP - adding expo

* WIP - adding expo 2

* Fix tsc

* Finish adding expo

* Disable the 'require cycle' warning

* Tweak plist

* Modify some dependency versions to make expo happy

* Fix icon fill

* Get Web compiling for expo

* 1.7

* Switch to react-navigation in expo2 (#287)

* WIP Switch to react-navigation

* WIP Switch to react-navigation 2

* WIP Switch to react-navigation 3

* Convert all screens to react navigation

* Update BottomBar for react navigation

* Update mobile menu to be react-native drawer

* Fixes to drawer and bottombar

* Factor out some helpers

* Replace the navigation model with react-navigation

* Restructure the shell folder and fix the header positioning

* Restore the error boundary

* Fix tsc

* Implement not-found page

* Remove react-native-gesture-handler (no longer used)

* Handle notifee card presses

* Handle all navigations from the state layer

* Fix drawer behaviors

* Fix two linking issues

* Switch to our react-native-progress fork to fix an svg rendering issue

* Get Web working with react-navigation

* Refactor routes and navigation for a bit more clarity

* Remove dead code

* Rework Web shell to left/right nav to make this easier

* Fix ViewHeader for desktop web

* Hide profileheader back btn on desktop web

* Move the compose button to the left nav

* Implement reply prompt in threads for desktop web

* Composer refactors

* Factor out all platform-specific text input behaviors from the composer

* Small fix

* Update the web build to use tiptap for the composer

* Tune up the mention autocomplete dropdown

* Simplify the default avatar and banner

* Fixes to link cards in web composer

* Fix dropdowns on web

* Tweak load latest on desktop

* Add web beta message and feedback link

* Fix up links in desktop web
Diffstat (limited to 'src/App.web.tsx')
-rw-r--r--src/App.web.tsx24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/App.web.tsx b/src/App.web.tsx
index 84d3b6cd6..0bfa909be 100644
--- a/src/App.web.tsx
+++ b/src/App.web.tsx
@@ -1,9 +1,9 @@
 import React, {useState, useEffect} from 'react'
 import {SafeAreaProvider} from 'react-native-safe-area-context'
-import {getInitialURL} from 'platform/urls'
+import {RootSiblingParent} from 'react-native-root-siblings'
 import * as view from './view/index'
 import {RootStoreModel, setupState, RootStoreProvider} from './state'
-import {WebShell} from './view/shell/web'
+import {Shell} from './view/shell/index'
 import {ToastContainer} from './view/com/util/Toast.web'
 
 function App() {
@@ -16,12 +16,6 @@ function App() {
     view.setup()
     setupState().then(store => {
       setRootStore(store)
-      store.nav.bindWebNavigation()
-      getInitialURL().then(url => {
-        if (url) {
-          store.nav.handleLink(url)
-        }
-      })
     })
   }, [])
 
@@ -31,12 +25,14 @@ function App() {
   }
 
   return (
-    <RootStoreProvider value={rootStore}>
-      <SafeAreaProvider>
-        <WebShell />
-      </SafeAreaProvider>
-      <ToastContainer />
-    </RootStoreProvider>
+    <RootSiblingParent>
+      <RootStoreProvider value={rootStore}>
+        <SafeAreaProvider>
+          <Shell />
+        </SafeAreaProvider>
+        <ToastContainer />
+      </RootStoreProvider>
+    </RootSiblingParent>
   )
 }