Skip to content

Typescript/action sheet #1336

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

Merged
merged 20 commits into from
Jun 8, 2021
Merged

Typescript/action sheet #1336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f4325a4
actionSheet.js -> .tsx
mendyEdri Jun 2, 2021
0c01b41
migrate ActionSheet to typescript
mendyEdri Jun 2, 2021
4b0fc09
back to 100%
mendyEdri Jun 2, 2021
64554e4
Support `icon` prop of `options`, will be deprecated, use `iconSource…
mendyEdri Jun 3, 2021
0c3a19a
change demo to show we support `icon` and `iconSource` for options
mendyEdri Jun 3, 2021
02acd9d
demo-screen .js -> .tsx
mendyEdri Jun 3, 2021
fdb0e44
prevent of rendering empty Image
mendyEdri Jun 3, 2021
7259f31
migrating ActionSheet demo to typescript
mendyEdri Jun 3, 2021
3c9e759
Fixed demo screen behaviour
mendyEdri Jun 3, 2021
6978c12
export action-sheet, typescript version
mendyEdri Jun 3, 2021
6a4d0ef
Fix api typing
mendyEdri Jun 3, 2021
410c168
remove manual typings
mendyEdri Jun 3, 2021
961f66a
remove manual typing export
mendyEdri Jun 6, 2021
96ca170
Update src/components/actionSheet/index.tsx
mendyEdri Jun 6, 2021
cbe1c95
Update src/components/actionSheet/index.tsx
mendyEdri Jun 6, 2021
e900e41
PR comments
mendyEdri Jun 6, 2021
3187659
Merge branch 'master' into typescript/ActionSheet
mendyEdri Jun 8, 2021
b538e48
add missing export
mendyEdri Jun 8, 2021
e6c29a2
Ignoring ListItem type for now
mendyEdri Jun 8, 2021
2d42442
Send an empty string when label was not provided
mendyEdri Jun 8, 2021
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
34 changes: 18 additions & 16 deletions ...ens/componentScreens/ActionSheetScreen.js → ...ns/componentScreens/ActionSheetScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import _ from 'lodash';
const useCases = [
{label: 'Default (Android/iOS)', useNativeIOS: false, icons: false},
{label: 'Default with icons', useNativeIOS: false, icons: true},
{label: 'Native IOS', useNativeIOS: true},
{label: 'Native IOS', useNativeIOS: true}
];
const collectionsIcon = require('../../assets/icons/collections.png');
const starIcon = require('../../assets/icons/star.png');
Expand All @@ -17,11 +17,12 @@ export default class ActionSheetScreen extends Component {
showNative: false,
showCustom: false,
showCustomIcons: false,
pickedOption: undefined
};

pickOption(index) {
pickOption(index: string) {
this.setState({
pickedOption: index,
pickedOption: index
});
}

Expand All @@ -36,7 +37,7 @@ export default class ActionSheetScreen extends Component {
<Button
key={index}
link
size='small'
size={Button.sizes.small}
text50
marginB-10
dark10
Expand All @@ -45,7 +46,7 @@ export default class ActionSheetScreen extends Component {
this.setState({
showNative: useCase.useNativeIOS,
showCustom: !useCase.useNativeIOS && !useCase.icons,
showCustomIcons: !useCase.useNativeIOS && useCase.icons,
showCustomIcons: !useCase.useNativeIOS && useCase.icons
})}
/>
);
Expand All @@ -58,46 +59,47 @@ export default class ActionSheetScreen extends Component {
)}

<ActionSheet
title='Title'
message='Message of action sheet'
title={'Title'}
message={'Message of action sheet'}
cancelButtonIndex={3}
destructiveButtonIndex={0}
useNativeIOS={false}
options={[
{label: 'option 1', onPress: () => this.pickOption('option 1')},
{label: 'option 2', onPress: () => this.pickOption('option 2')},
{label: 'option 3', onPress: () => this.pickOption('option 3')},
{label: 'cancel', onPress: () => this.pickOption('cancel')},
{label: 'cancel', onPress: () => this.pickOption('cancel')}
]}
visible={showCustom}
onDismiss={() => this.setState({showCustom: false})}
/>

<ActionSheet
title='Title'
message='Message of action sheet'
title={'Title'}
message={'Message of action sheet'}
cancelButtonIndex={3}
destructiveButtonIndex={0}
options={[
{label: 'option 1', onPress: () => this.pickOption('option 1'), icon: collectionsIcon},
{label: 'option 2', onPress: () => this.pickOption('option 2'), icon: shareIcon},
{label: 'option 1', onPress: () => this.pickOption('option 1'), iconSource: collectionsIcon},
{label: 'option 2', onPress: () => this.pickOption('option 2'), iconSource: shareIcon},
// `icon` prop will be deprecated, please use `iconSource`
{label: 'option 3', onPress: () => this.pickOption('option 3'), icon: starIcon},
{label: 'cancel', onPress: () => this.pickOption('cancel')},
{label: 'cancel', onPress: () => this.pickOption('cancel')}
]}
visible={showCustomIcons}
onDismiss={() => this.setState({showCustomIcons: false})}
/>

<ActionSheet
title='Title'
message='Message of action sheet'
title={'Title'}
message={'Message of action sheet'}
cancelButtonIndex={3}
destructiveButtonIndex={0}
options={[
{label: 'option 1', onPress: () => this.pickOption('option 1')},
{label: 'option 2', onPress: () => this.pickOption('option 2')},
{label: 'option 3', onPress: () => this.pickOption('option 3')},
{label: 'cancel', onPress: () => this.pickOption('cancel')},
{label: 'cancel', onPress: () => this.pickOption('cancel')}
]}
visible={showNative}
useNativeIOS
Expand Down
2 changes: 1 addition & 1 deletion generatedTypes/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ export {default as PanDismissibleView, PanDismissibleViewPropTypes, DismissibleA
export {default as Dialog, DialogProps} from './components/dialog';
export {default as PageControl, PageControlProps} from './components/pageControl';
export {default as Carousel, CarouselProps} from './components/carousel';
export {default as ActionSheet} from './components/actionSheet';

/* All components with manual typings */
export {
ActionSheet,
ConnectionStatusBar,
FeatureHighlight,
Hint,
Expand Down
252 changes: 0 additions & 252 deletions src/components/actionSheet/index.js
View file
Open in desktop

This file was deleted.

Loading