diff --git a/web/app.react.js b/web/app.react.js index d472d480c..3fd8ae16a 100644 --- a/web/app.react.js +++ b/web/app.react.js @@ -1,245 +1,248 @@ // @flow import 'basscss/css/basscss.min.css'; import './theme.css'; import { config as faConfig } from '@fortawesome/fontawesome-svg-core'; import _isEqual from 'lodash/fp/isEqual'; import * as React from 'react'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; import { useDispatch } from 'react-redux'; import { fetchEntriesActionTypes, updateCalendarQueryActionTypes, } from 'lib/actions/entry-actions'; import { createLoadingStatusSelector, combineLoadingStatuses, } from 'lib/selectors/loading-selectors'; import { unreadCount } from 'lib/selectors/thread-selectors'; import { isLoggedIn } from 'lib/selectors/user-selectors'; import type { LoadingStatus } from 'lib/types/loading-types'; import type { Dispatch } from 'lib/types/redux-types'; import { registerConfig } from 'lib/utils/config'; import AppsDirectory from './apps/apps-directory.react'; import Calendar from './calendar/calendar.react'; import Chat from './chat/chat.react'; import InputStateContainer from './input/input-state-container.react'; import LoadingIndicator from './loading-indicator.react'; +import { MenuProvider } from './menu-provider.react'; import { ModalProvider, useModalContext } from './modals/modal-provider.react'; import DisconnectedBar from './redux/disconnected-bar'; import DisconnectedBarVisibilityHandler from './redux/disconnected-bar-visibility-handler'; import FocusHandler from './redux/focus-handler.react'; import { useSelector } from './redux/redux-utils'; import VisibilityHandler from './redux/visibility-handler.react'; import history from './router-history'; import AccountSettings from './settings/account-settings.react'; import LeftLayoutAside from './sidebar/left-layout-aside.react'; import Splash from './splash/splash.react'; import './typography.css'; import css from './style.css'; import getTitle from './title/getTitle'; import { type NavInfo, updateNavInfoActionType } from './types/nav-types'; import { canonicalURLFromReduxState, navInfoFromURL } from './url-utils'; // We want Webpack's css-loader and style-loader to handle the Fontawesome CSS, // so we disable the autoAddCss logic and import the CSS file. Otherwise every // icon flashes huge for a second before the CSS is loaded. import '@fortawesome/fontawesome-svg-core/styles.css'; faConfig.autoAddCss = false; registerConfig({ // We can't securely cache credentials on web, so we have no way to recover // from a cookie invalidation resolveInvalidatedCookie: null, // We use httponly cookies on web to protect against XSS attacks, so we have // no access to the cookies from JavaScript setCookieOnRequest: false, setSessionIDOnRequest: true, // Never reset the calendar range calendarRangeInactivityLimit: null, platformDetails: { platform: 'web' }, }); type BaseProps = { +location: { +pathname: string, ... }, }; type Props = { ...BaseProps, // Redux state +navInfo: NavInfo, +entriesLoadingStatus: LoadingStatus, +loggedIn: boolean, +activeThreadCurrentlyUnread: boolean, // Redux dispatch functions +dispatch: Dispatch, +modal: ?React.Node, }; class App extends React.PureComponent { componentDidMount() { const { navInfo, location: { pathname }, loggedIn, } = this.props; const newURL = canonicalURLFromReduxState(navInfo, pathname, loggedIn); if (pathname !== newURL) { history.replace(newURL); } } componentDidUpdate(prevProps: Props) { const { navInfo, location: { pathname }, loggedIn, } = this.props; if (!_isEqual(navInfo)(prevProps.navInfo)) { const newURL = canonicalURLFromReduxState(navInfo, pathname, loggedIn); if (newURL !== pathname) { history.push(newURL); } } else if (pathname !== prevProps.location.pathname) { const newNavInfo = navInfoFromURL(pathname, { navInfo }); if (!_isEqual(newNavInfo)(navInfo)) { this.props.dispatch({ type: updateNavInfoActionType, payload: newNavInfo, }); } } else if (loggedIn !== prevProps.loggedIn) { const newURL = canonicalURLFromReduxState(navInfo, pathname, loggedIn); if (newURL !== pathname) { history.replace(newURL); } } } render() { let content; if (this.props.loggedIn) { content = this.renderMainContent(); } else { content = ; } return ( - - - {content} - {this.props.modal} + + + + {content} + {this.props.modal} + ); } renderMainContent() { let mainContent; if (this.props.navInfo.tab === 'calendar') { mainContent = ; } else if (this.props.navInfo.tab === 'chat') { mainContent = ; } else if (this.props.navInfo.tab === 'apps') { mainContent = ; } else if ( this.props.navInfo.tab === 'settings' && this.props.navInfo.settingsSection === 'account' ) { mainContent = ; } return (

Comm

{mainContent}
); } } const fetchEntriesLoadingStatusSelector = createLoadingStatusSelector( fetchEntriesActionTypes, ); const updateCalendarQueryLoadingStatusSelector = createLoadingStatusSelector( updateCalendarQueryActionTypes, ); const ConnectedApp: React.ComponentType = React.memo( function ConnectedApp(props) { const activeChatThreadID = useSelector( state => state.navInfo.activeChatThreadID, ); const navInfo = useSelector(state => state.navInfo); const fetchEntriesLoadingStatus = useSelector( fetchEntriesLoadingStatusSelector, ); const updateCalendarQueryLoadingStatus = useSelector( updateCalendarQueryLoadingStatusSelector, ); const entriesLoadingStatus = combineLoadingStatuses( fetchEntriesLoadingStatus, updateCalendarQueryLoadingStatus, ); const loggedIn = useSelector(isLoggedIn); const activeThreadCurrentlyUnread = useSelector( state => !activeChatThreadID || !!state.threadStore.threadInfos[activeChatThreadID]?.currentUser.unread, ); const boundUnreadCount = useSelector(unreadCount); React.useEffect(() => { document.title = getTitle(boundUnreadCount); }, [boundUnreadCount]); const dispatch = useDispatch(); const modalContext = useModalContext(); return ( ); }, ); function AppWithProvider(props: BaseProps): React.Node { return ( ); } export default AppWithProvider; diff --git a/web/menu-provider.react.js b/web/menu-provider.react.js new file mode 100644 index 000000000..55265467f --- /dev/null +++ b/web/menu-provider.react.js @@ -0,0 +1,84 @@ +// @flow + +import invariant from 'invariant'; +import * as React from 'react'; + +import type { SetState } from 'lib/types/hook-types'; + +import css from './menu.css'; + +type MenuPosition = { + +top: number, + +left: number, +}; +type Props = { + +children: React.Node, +}; +type MenuContextType = { + +renderMenu: SetState, + +setMenuPosition: SetState, + +closeMenu: React.Node => void, + +currentOpenMenu: symbol, + +setCurrentOpenMenu: SetState, +}; + +const MenuContext: React.Context = React.createContext( + { + renderMenu: () => {}, + setMenuPosition: () => {}, + closeMenu: () => {}, + currentOpenMenu: Symbol(), + setCurrentOpenMenu: () => {}, + }, +); + +function MenuProvider(props: Props): React.Node { + const { children } = props; + const [menu, setMenu] = React.useState(null); + const [currentOpenMenu, setCurrentOpenMenu] = React.useState( + Symbol(), + ); + const [position, setPosition] = React.useState({ + top: 0, + left: 0, + }); + + const closeMenu = React.useCallback((menuToClose: React.Node) => { + setCurrentOpenMenu(Symbol()); + setMenu(oldMenu => { + if (oldMenu === menuToClose) { + return null; + } else { + return oldMenu; + } + }); + }, []); + + const value = React.useMemo( + () => ({ + renderMenu: setMenu, + setMenuPosition: setPosition, + closeMenu, + setCurrentOpenMenu, + currentOpenMenu, + }), + [closeMenu, currentOpenMenu], + ); + return ( + <> + {children} +
+ {menu} +
+ + ); +} + +function useRenderMenu(): MenuContextType { + const context = React.useContext(MenuContext); + invariant(context, 'MenuContext not found'); + + return context; +} + +export { MenuProvider, useRenderMenu }; diff --git a/web/menu.css b/web/menu.css new file mode 100644 index 000000000..9c972ee48 --- /dev/null +++ b/web/menu.css @@ -0,0 +1,3 @@ +div.container { + position: absolute; +}