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.

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

[No QA] [TS Migration] Migrate CollapsibleSection to TypeScript #31060

Merged
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
11 changes: 7 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"react-native": "0.72.4",
"react-native-android-location-enabler": "^1.2.2",
"react-native-blob-util": "^0.17.3",
"react-native-collapsible": "^1.6.0",
"react-native-collapsible": "^1.6.1",
"react-native-config": "^1.4.5",
"react-native-dev-menu": "^4.1.1",
"react-native-device-info": "^10.3.0",
Expand Down
3 changes: 0 additions & 3 deletions src/components/CollapsibleSection/Collapsible/index.js

This file was deleted.

24 changes: 0 additions & 24 deletions src/components/CollapsibleSection/Collapsible/index.native.js

This file was deleted.

10 changes: 10 additions & 0 deletions src/components/CollapsibleSection/Collapsible/index.native.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react';
import CollapsibleRN from 'react-native-collapsible';
import CollapsibleProps from './types';

function Collapsible({isOpened = false, children}: CollapsibleProps) {
return <CollapsibleRN collapsed={!isOpened}>{children}</CollapsibleRN>;
}

Collapsible.displayName = 'Collapsible';
export default Collapsible;
8 changes: 8 additions & 0 deletions src/components/CollapsibleSection/Collapsible/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react';
import {Collapse} from 'react-collapse';
import CollapsibleProps from './types';

function Collapsible({isOpened = false, children}: CollapsibleProps) {
return <Collapse isOpened={isOpened}>{children}</Collapse>;
}
export default Collapsible;
8 changes: 8 additions & 0 deletions src/components/CollapsibleSection/Collapsible/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import ChildrenProps from '@src/types/utils/ChildrenProps';

type CollapsibleProps = ChildrenProps & {
/** Whether the section should start expanded. False by default */
isOpened?: boolean;
};

export default CollapsibleProps;
70 changes: 0 additions & 70 deletions src/components/CollapsibleSection/index.js

This file was deleted.

55 changes: 55 additions & 0 deletions src/components/CollapsibleSection/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import React, {useState} from 'react';
import {View} from 'react-native';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
import Text from '@components/Text';
import styles from '@styles/styles';
import CONST from '@src/CONST';
import ChildrenProps from '@src/types/utils/ChildrenProps';
import Collapsible from './Collapsible';

type CollapsibleSectionProps = ChildrenProps & {
/** Title of the Collapsible section */
title: string;
};

function CollapsibleSection(props: CollapsibleSectionProps) {
JKobrynski marked this conversation as resolved.
Show resolved Hide resolved
const [isExpanded, setIsExpanded] = useState(false);

/**
* Expands/collapses the section
*/
const toggleSection = () => {
setIsExpanded(!isExpanded);
};

const src = isExpanded ? Expensicons.UpArrow : Expensicons.DownArrow;

return (
<View style={styles.mt4}>
<PressableWithFeedback
onPress={toggleSection}
style={[styles.pb4, styles.flexRow]}
role={CONST.ACCESSIBILITY_ROLE.BUTTON}
accessibilityLabel={props.title}
hoverDimmingValue={1}
pressDimmingValue={0.2}
>
<Text
style={[styles.flex1, styles.textStrong, styles.userSelectNone]}
dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
>
{props.title}
</Text>
<Icon src={src} />
</PressableWithFeedback>
<View style={styles.collapsibleSectionBorder} />
<Collapsible isOpened={isExpanded}>
<View>{props.children}</View>
</Collapsible>
</View>
);
}

export default CollapsibleSection;
Loading