Skip to content

Incubator.Dialog - header refactor #1845

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

Merged
merged 2 commits into from
Feb 14, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 0 additions & 4 deletions generatedTypes/src/incubator/Dialog/DialogDivider.d.ts

This file was deleted.

4 changes: 0 additions & 4 deletions generatedTypes/src/incubator/Dialog/DialogKnob.d.ts

This file was deleted.

16 changes: 0 additions & 16 deletions src/incubator/Dialog/DialogDivider.tsx

This file was deleted.

40 changes: 32 additions & 8 deletions src/incubator/Dialog/DialogHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,42 @@
import {isEmpty} from 'lodash';
import React, {useMemo} from 'react';
import {StyleSheet} from 'react-native';
import {asBaseComponent} from '../../commons/new';
import {Spacings, Colors, BorderRadiuses, Dividers} from 'style';
import View from '../../components/view';
import DialogText from './DialogText';
import DialogKnob from './DialogKnob';
import DialogDivider from './DialogDivider';
import HeaderContent from './HeaderContent';
import {DialogHeaderProps} from './types';

const DialogHeader = (props: DialogHeaderProps = {}) => {
const {text = {}, renderContent, showKnob = true, showDivider = true, ...others} = props;

const _renderContent = useMemo(() => {
const knob = useMemo(() => {
if (showKnob) {
return <View style={styles.knob}/>;
}
}, [showKnob]);

const headerContent = useMemo(() => {
if (renderContent) {
return renderContent(props);
}

return <DialogText text={text}/>;
return <HeaderContent text={text}/>;
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [renderContent, text]);

const divider = useMemo(() => {
if (showDivider) {
return <View style={Dividers.d10}/>;
}
}, [showDivider]);

if (!isEmpty(props)) {
return (
<View {...others}>
<DialogKnob showKnob={showKnob}/>
{_renderContent}
<DialogDivider showDivider={showDivider}/>
{knob}
{headerContent}
{divider}
</View>
);
}
Expand All @@ -33,3 +45,15 @@ const DialogHeader = (props: DialogHeaderProps = {}) => {
};

export default asBaseComponent<DialogHeaderProps>(DialogHeader);

const styles = StyleSheet.create({
knob: {
alignSelf: 'center',
width: 44,
height: Spacings.s1,
marginTop: Spacings.s2,
marginBottom: Spacings.s2,
backgroundColor: Colors.grey60,
borderRadius: BorderRadiuses.br10
}
});
29 changes: 0 additions & 29 deletions src/incubator/Dialog/DialogKnob.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import View from '../../components/view';
import Text from '../../components/text';
import {DialogHeaderProps} from './types';

const DialogText = (props: Pick<DialogHeaderProps, 'text'>) => {
const HeaderContent = (props: Pick<DialogHeaderProps, 'text'>) => {
const {text = {}} = props;
const {title, titleStyle, titleProps, subtitle, subtitleStyle, subtitleProps} = text;

Expand All @@ -28,4 +28,4 @@ const DialogText = (props: Pick<DialogHeaderProps, 'text'>) => {
return null;
};

export default React.memo(DialogText);
export default React.memo(HeaderContent);