migrate FloatingActionButtonAndPopover to function component #21851
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import React, {useState, useEffect, useCallback, useImperativeHandle, forwardRef} from 'react'; | ||
| import _ from 'underscore'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
@@ -25,6 +25,7 @@ import withNavigationFocus from '../../../../components/withNavigationFocus'; | |
| import * as Task from '../../../../libs/actions/Task'; | ||
| import * as Session from '../../../../libs/actions/Session'; | ||
| import * as IOU from '../../../../libs/actions/IOU'; | ||
| import usePrevious from '../../../../hooks/usePrevious'; | ||
|
|
||
| /** | ||
| * @param {Object} [policy] | ||
|
|
@@ -56,51 +57,30 @@ const propTypes = { | |
|
|
||
| /** Indicated whether the report data is loading */ | ||
| isLoading: PropTypes.bool, | ||
|
|
||
| /** Forwarded ref to FloatingActionButtonAndPopover */ | ||
| innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]), | ||
| }; | ||
| const defaultProps = { | ||
| onHideCreateMenu: () => {}, | ||
| onShowCreateMenu: () => {}, | ||
| allPolicies: {}, | ||
| betas: [], | ||
| isLoading: false, | ||
| innerRef: null, | ||
| }; | ||
|
|
||
| /** | ||
| * Responsible for rendering the {@link PopoverMenu}, and the accompanying | ||
| * FAB that can open or close the menu. | ||
| * @param {Object} props | ||
| * @returns {JSX.Element} | ||
| */ | ||
| function FloatingActionButtonAndPopover(props) { | ||
| const [isCreateMenuActive, setIsCreateMenuActive] = useState(false); | ||
| const isAnonymousUser = Session.isAnonymousUser(); | ||
|
|
||
| const prevIsFocused = usePrevious(props.isFocused); | ||
|
|
||
| /** | ||
| * Check if LHN status changed from active to inactive. | ||
|
|
@@ -109,151 +89,180 @@ class FloatingActionButtonAndPopover extends React.Component { | |
| * @param {Object} prevProps | ||
| * @return {Boolean} | ||
| */ | ||
| const didScreenBecomeInactive = useCallback( | ||
| () => | ||
| // When any other page is opened over LHN | ||
| !props.isFocused && prevIsFocused, | ||
| [props.isFocused, prevIsFocused], | ||
| ); | ||
|
|
||
| /** | ||
| * Method called when we click the floating action button | ||
| */ | ||
| const showCreateMenu = useCallback( | ||
| () => { | ||
| if (!props.isFocused && props.isSmallScreenWidth) { | ||
| return; | ||
| } | ||
| setIsCreateMenuActive(true); | ||
| props.onShowCreateMenu(); | ||
| }, | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| [props.isFocused, props.isSmallScreenWidth], | ||
| ); | ||
|
|
||
| /** | ||
| * Method called either when: | ||
| * - Pressing the floating action button to open the CreateMenu modal | ||
| * - Selecting an item on CreateMenu or closing it by clicking outside of the modal component | ||
| */ | ||
| const hideCreateMenu = useCallback( | ||
| () => { | ||
| if (!isCreateMenuActive) { | ||
| return; | ||
| } | ||
| props.onHideCreateMenu(); | ||
| setIsCreateMenuActive(false); | ||
| }, | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| [isCreateMenuActive], | ||
| ); | ||
|
|
||
| /** | ||
| * Checks if user is anonymous. If true, shows the sign in modal, else, | ||
| * executes the callback. | ||
| * | ||
| * @param {Function} callback | ||
| */ | ||
| const interceptAnonymousUser = (callback) => { | ||
| if (isAnonymousUser) { | ||
| Session.signOutAndRedirectToSignIn(); | ||
| } else { | ||
| callback(); | ||
| } | ||
| }; | ||
|
|
||
| useEffect( | ||
| () => { | ||
| const navigationState = props.navigation.getState(); | ||
| const routes = lodashGet(navigationState, 'routes', []); | ||
| const currentRoute = routes[navigationState.index]; | ||
| if (currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) { | ||
| return; | ||
| } | ||
| Welcome.show({routes, showCreateMenu}); | ||
| }, | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| [], | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| if (!didScreenBecomeInactive()) { | ||
| return; | ||
| } | ||
|
|
||
| // Hide menu manually when other pages are opened using shortcut key | ||
| hideCreateMenu(); | ||
| }, [didScreenBecomeInactive, hideCreateMenu]); | ||
|
|
||
| useImperativeHandle(props.innerRef, () => ({ | ||
| hideCreateMenu() { | ||
| hideCreateMenu(); | ||
| }, | ||
| })); | ||
|
|
||
| // Workspaces are policies with type === 'free' | ||
|
Contributor
There was a problem hiding this comment. Add a blank line above the comment please
Contributor
Author
There was a problem hiding this comment. Added a blank line. |
||
| const workspaces = _.filter(props.allPolicies, (policy) => policy && policy.type === CONST.POLICY.TYPE.FREE); | ||
|
|
||
| return ( | ||
| <View> | ||
| <PopoverMenu | ||
| onClose={hideCreateMenu} | ||
| isVisible={isCreateMenuActive} | ||
| anchorPosition={styles.createMenuPositionSidebar(props.windowHeight)} | ||
| onItemSelected={hideCreateMenu} | ||
| fromSidebarMediumScreen={!props.isSmallScreenWidth} | ||
| menuItems={[ | ||
| { | ||
| icon: Expensicons.ChatBubble, | ||
| text: props.translate('sidebarScreen.newChat'), | ||
| onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.NEW_CHAT)), | ||
| }, | ||
| { | ||
| icon: Expensicons.Users, | ||
| text: props.translate('sidebarScreen.newGroup'), | ||
| onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.NEW_GROUP)), | ||
| }, | ||
| ...(Permissions.canUsePolicyRooms(props.betas) && workspaces.length | ||
| ? [ | ||
| { | ||
| icon: Expensicons.Hashtag, | ||
| text: props.translate('sidebarScreen.newRoom'), | ||
| onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.WORKSPACE_NEW_ROOM)), | ||
| }, | ||
| ] | ||
| : []), | ||
| ...(Permissions.canUseIOUSend(props.betas) | ||
| ? [ | ||
| { | ||
| icon: Expensicons.Send, | ||
| text: props.translate('iou.sendMoney'), | ||
| onSelected: () => interceptAnonymousUser(() => IOU.startMoneyRequest(CONST.IOU.MONEY_REQUEST_TYPE.SEND)), | ||
| }, | ||
| ] | ||
| : []), | ||
| { | ||
| icon: Expensicons.MoneyCircle, | ||
| text: props.translate('iou.requestMoney'), | ||
| onSelected: () => interceptAnonymousUser(() => IOU.startMoneyRequest(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)), | ||
| }, | ||
| { | ||
| icon: Expensicons.Receipt, | ||
| text: props.translate('iou.splitBill'), | ||
| onSelected: () => interceptAnonymousUser(() => IOU.startMoneyRequest(CONST.IOU.MONEY_REQUEST_TYPE.SPLIT)), | ||
| }, | ||
| ...(Permissions.canUseTasks(props.betas) | ||
| ? [ | ||
| { | ||
| icon: Expensicons.Task, | ||
| text: props.translate('newTaskPage.assignTask'), | ||
| onSelected: () => interceptAnonymousUser(() => Task.clearOutTaskInfoAndNavigate()), | ||
| }, | ||
| ] | ||
| : []), | ||
| ...(!props.isLoading && !Policy.hasActiveFreePolicy(props.allPolicies) | ||
| ? [ | ||
| { | ||
| icon: Expensicons.NewWorkspace, | ||
| iconWidth: 46, | ||
| iconHeight: 40, | ||
| text: props.translate('workspace.new.newWorkspace'), | ||
| description: props.translate('workspace.new.getTheExpensifyCardAndMore'), | ||
| onSelected: () => interceptAnonymousUser(() => Policy.createWorkspace()), | ||
| }, | ||
| ] | ||
| : []), | ||
| ]} | ||
| /> | ||
| <FloatingActionButton | ||
| accessibilityLabel={props.translate('sidebarScreen.fabNewChat')} | ||
| accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON} | ||
| isActive={isCreateMenuActive} | ||
| onPress={showCreateMenu} | ||
| /> | ||
| </View> | ||
| ); | ||
| } | ||
|
|
||
| FloatingActionButtonAndPopover.propTypes = propTypes; | ||
| FloatingActionButtonAndPopover.defaultProps = defaultProps; | ||
| FloatingActionButtonAndPopover.displayName = 'FloatingActionButtonAndPopover'; | ||
|
|
||
| export default compose( | ||
| withLocalize, | ||
| withNavigation, | ||
| withNavigationFocus, | ||
| withWindowDimensions, | ||
| withOnyx({ | ||
| allPolicies: { | ||
| key: ONYXKEYS.COLLECTION.POLICY, | ||
|
|
@@ -266,4 +275,12 @@ export default compose( | |
| key: ONYXKEYS.IS_LOADING_REPORT_DATA, | ||
|
Contributor
There was a problem hiding this comment. Looks like there is two
Contributor
Author
There was a problem hiding this comment. Yes, I checked and removed the duplication. It was from the original class component. |
||
| }, | ||
| }), | ||
| )( | ||
| forwardRef((props, ref) => ( | ||
| <FloatingActionButtonAndPopover | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| {...props} | ||
| innerRef={ref} | ||
| /> | ||
| )), | ||
| ); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dayana7204 Kindly add comment for this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done. thank you :)