Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove 'withNavigationFallback.js' HOC #29449

Merged
merged 4 commits into from
Oct 17, 2023
Merged

Remove 'withNavigationFallback.js' HOC #29449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
808d2c3
[TS migration] Migrate 'withNavigationFallback.js' HOC
VickyStash Oct 12, 2023
52b6a0e
Fix NavigationContextValue type
VickyStash Oct 12, 2023
8480a8f
Add callbacks types
VickyStash Oct 12, 2023
bdf5836
Remove withNavigationFallback HOC
VickyStash Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ module.exports = {
},
{
selector: ['parameter', 'method'],
format: ['camelCase'],
format: ['camelCase', 'PascalCase'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we using pascal case for method parameters here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akinwale It's left from TS migration. It shouldn't hurt, though, cause it's necessary for other HOCs anyway where we have WrappedComponent as a param (and it's in CamelCase). But I can remove it from this PR if necessary.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, makes sense to leave it in if it's going to be used it in the future. Just wanted to make sure. Thanks.

},
],
'@typescript-eslint/ban-types': [
Expand Down
7 changes: 1 addition & 6 deletions src/components/Button/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import Icon from '../Icon';
import CONST from '../../CONST';
import * as StyleUtils from '../../styles/StyleUtils';
import HapticFeedback from '../../libs/HapticFeedback';
import withNavigationFallback from '../withNavigationFallback';
import compose from '../../libs/compose';
import * as Expensicons from '../Icon/Expensicons';
import withNavigationFocus from '../withNavigationFocus';
import validateSubmitShortcut from './validateSubmitShortcut';
Expand Down Expand Up @@ -328,10 +326,7 @@ class Button extends Component {
Button.propTypes = propTypes;
Button.defaultProps = defaultProps;

export default compose(
withNavigationFallback,
withNavigationFocus,
)(
export default withNavigationFocus(
React.forwardRef((props, ref) => (
<Button
// eslint-disable-next-line react/jsx-props-no-spreading
Expand Down
43 changes: 0 additions & 43 deletions src/components/withNavigationFallback.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/libs/getComponentDisplayName.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {ComponentType} from 'react';

/** Returns the display name of a component */
export default function getComponentDisplayName(component: ComponentType): string {
export default function getComponentDisplayName<TProps>(component: ComponentType<TProps>): string {
return component.displayName ?? component.name ?? 'Component';
}
29 changes: 15 additions & 14 deletions src/stories/Composer.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import ExpensiMark from 'expensify-common/lib/ExpensiMark';
import React, {useState} from 'react';
import React, {useMemo, useState} from 'react';
import {View, Image} from 'react-native';
import {NavigationContext} from '@react-navigation/core';
import Composer from '../components/Composer';
import RenderHTML from '../components/RenderHTML';
import Text from '../components/Text';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import * as StyleUtils from '../styles/StyleUtils';
import CONST from '../CONST';
import withNavigationFallback from '../components/withNavigationFallback';

const ComposerWithNavigation = withNavigationFallback(Composer);

/**
* We use the Component Story Format for writing stories. Follow the docs here:
Expand All @@ -19,7 +17,7 @@ const ComposerWithNavigation = withNavigationFallback(Composer);
*/
const story = {
title: 'Components/Composer',
component: ComposerWithNavigation,
component: Composer,
};

const parser = new ExpensiMark();
Expand All @@ -28,19 +26,22 @@ function Default(args) {
const [pastedFile, setPastedFile] = useState(null);
const [comment, setComment] = useState(args.defaultValue);
const renderedHTML = parser.replace(comment);
const navigationContextValue = useMemo(() => ({addListener: () => () => {}, removeListener: () => () => {}}), []);

return (
<View>
<View style={[styles.border, styles.p4]}>
<ComposerWithNavigation
// eslint-disable-next-line react/jsx-props-no-spreading
{...args}
multiline
textAlignVertical="top"
onChangeText={setComment}
onPasteFile={setPastedFile}
style={[styles.textInputCompose, styles.w100]}
/>
<NavigationContext.Provider value={navigationContextValue}>
<Composer
// eslint-disable-next-line react/jsx-props-no-spreading
{...args}
multiline
textAlignVertical="top"
onChangeText={setComment}
onPasteFile={setPastedFile}
style={[styles.textInputCompose, styles.w100]}
/>
</NavigationContext.Provider>
</View>
<View style={[styles.flexRow, styles.mv5, styles.flexWrap, styles.w100]}>
<View
Expand Down
Loading