Skip to content

react-native-animatable - remove dep #1544

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 2 commits into from
Sep 12, 2021
Merged

react-native-animatable - remove dep #1544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5893a31
react-native-animatable - removing dep
Inbal-Tish Sep 12, 2021
7aea17e
Merge branch 'V6_2' of github.com:wix/react-native-ui-lib into react-…
Inbal-Tish Sep 12, 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
43 changes: 5 additions & 38 deletions demo/src/screens/componentScreens/BasicListScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,18 @@
import {sample} from 'lodash';
import React, {Component} from 'react';
import {StyleSheet, Alert, FlatList} from 'react-native';
import * as Animatable from 'react-native-animatable';
import {Colors, BorderRadiuses, ListItem, Text} from 'react-native-ui-lib';
import {Colors, BorderRadiuses, View, Image, ListItem, Text} from 'react-native-ui-lib';
import orders, {OrderType} from '../../data/orders';

type BasicListScreenState = {
onEdit: boolean;
updating: boolean;
}

export default class BasicListScreen extends Component<{}, BasicListScreenState> {

constructor(props: any) {
super(props);

this.state = {
onEdit: false,
updating: false
};
}

getRandomDelay(delays = [20, 120, 220], options: any) {
return {
animation: 'fadeInLeft',
easing: 'ease-out-expo',
duration: 600,
delay: sample(delays),
useNativeDriver: true,
...options
};
}
export default class BasicListScreen extends Component {

keyExtractor = (item: OrderType) => item.name;

renderRow(row: OrderType, id: number) {
const statusColor = row.inventory.status === 'Paid' ? Colors.green30 : Colors.red30;
const animationProps = {
animation: 'fadeInRight',
easing: 'ease-out-expo',
duration: 500,
useNativeDriver: true
};
const imageAnimationProps = this.getRandomDelay(undefined, undefined);

return (
<Animatable.View {...animationProps}>
<View>
<ListItem
// @ts-expect-error
activeBackgroundColor={Colors.dark60}
Expand All @@ -54,7 +21,7 @@ export default class BasicListScreen extends Component<{}, BasicListScreenState>
onPress={() => Alert.alert(`pressed on order #${id + 1}`)}
>
<ListItem.Part left>
<Animatable.Image source={{uri: row.mediaUrl}} style={styles.image} {...imageAnimationProps} />
<Image source={{uri: row.mediaUrl}} style={styles.image}/>
</ListItem.Part>
<ListItem.Part middle column containerStyle={[styles.border, {paddingRight: 17}]}>
<ListItem.Part containerStyle={{marginBottom: 3}}>
Expand All @@ -78,7 +45,7 @@ export default class BasicListScreen extends Component<{}, BasicListScreenState>
</ListItem.Part>
</ListItem.Part>
</ListItem>
</Animatable.View>
</View>
);
}

Expand Down
31 changes: 4 additions & 27 deletions demo/src/screens/componentScreens/ContactsListScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,17 @@
import React, {Component} from 'react';
import {StyleSheet, Alert, FlatList} from 'react-native';
import {View as AnimatableView} from 'react-native-animatable';
import {Colors, ListItem, Text, Avatar, AvatarHelper} from 'react-native-ui-lib'; //eslint-disable-line
import {Colors, View, ListItem, Text, Avatar, AvatarHelper} from 'react-native-ui-lib'; //eslint-disable-line
import conversations from '../../data/conversations';


export default class ContactsListScreen extends Component {

constructor(props) {
super(props);

this.state = {
onEdit: false,
updating: false
};
}

getEntranceByIndex = (index = 0, options) => {
return {
animation: 'itemEntrance',
easing: 'ease-out-quint',
duration: 600,
delay: 10 + (Number(index) % 12) * 100,
useNativeDriver: true,
...options
};
};

keyExtractor = item => item.name;
keyExtractor = (item, index) => `${item.name}.${index}`;

renderRow(row, id) {
const initials = AvatarHelper.getInitials(row.name);
const animationProps = this.getEntranceByIndex(id);

return (
<AnimatableView {...animationProps}>
<View>
<ListItem
key={id}
onPress={() => Alert.alert(`pressed on contact #${id + 1}`)}
Expand All @@ -51,7 +28,7 @@ export default class ContactsListScreen extends Component {
<Text text70>{row.name}</Text>
</ListItem.Part>
</ListItem>
</AnimatableView>
</View>
);
}

Expand Down
1 change: 0 additions & 1 deletion ...b/components/Keyboard/KeyboardTracking/KeyboardTrackingView/KeyboardTrackingView.ios.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { KeyboardTrackingViewProps } from './index';
*/
declare class KeyboardTrackingView extends PureComponent<KeyboardTrackingViewProps> {
static displayName: string;
/** V6 should be change to default false */
Copy link
Collaborator

Choose a reason for hiding this comment

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

This doesn't seem relevant to this PR?
Did you already change the useSafeArea default on another PR?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes. It's already merged

static defaultProps: {
useSafeArea: boolean;
};
Expand Down
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"memoize-one": "^5.0.5",
"moment": "^2.24.0",
"prop-types": "^15.5.10",
"react-native-animatable": "^1.1.0",
"react-native-color": "0.0.10",
"react-native-redash": "^12.0.3",
"react-native-text-size": "4.0.0-rc.1",
Expand Down Expand Up @@ -124,7 +123,7 @@
"jest": {
"preset": "react-native",
"transformIgnorePatterns": [
"node_modules/(?!(@react-native|react-native|react-native-animatable|react-native-reanimated|react-native-redash)/)"
"node_modules/(?!(@react-native|react-native|react-native-reanimated|react-native-redash)/)"
],
"testPathIgnorePatterns": [
"/e2e/",
Expand Down