2.6.1 #206

aksonov · Aug 7, 2019 · f4d7723 · f4d7723
2 parents 73576c1 + 9c0b685
commit f4d7723
Show file tree

Hide file tree

Showing 15 changed files with 452 additions and 367 deletions.
diff --git a/README.md b/README.md
@@ -182,44 +182,48 @@ in [Editable Complex Components](#editable-complex-components).
 ![demo-3](./.github/large-network-example.gif)
 
 ```jsx
-state = {
-  loading: true,
-  users: [],
-}
-
-async componentWillMount() {
-  const response = await fetch('https://randomuser.me/api/?results=5000')
-  const data = await response.json()
-
-  this.setState({
-    loading: false,
-    users: data.results.map(a => ({
-      name: `${a.name.first} ${a.name.last}`,
-      id: a.registered,
-    })),
-  })
-}
+() => {
+  const [loading, setLoading] = useState(true);
+  const [users, setUsers] = useState([]);
+
+  useEffect(() => {
+    const getUsers = async () => {
+      const response = await fetch('https://randomuser.me/api/?results=5000');
+      const data = await response.json();
+
+      setLoading(false);
+      setUsers(
+        data.results.map(a => ({
+          name: `${a.name.first} ${a.name.last}`,
+          id: a.registered,
+        }))
+      );
+    };
+
+    getUsers();
+  }, []);
 
-render() {
   return (
     <View style={{ flex: 1 }}>
       <Text style={styles.title}>
-        {this.state.loading ? 'Fetching' : 'Fetched'} 5000 users
+        {loading ? 'Fetching' : 'Fetched'} 5000 users
       </Text>
 
-      {this.state.loading && <ActivityIndicator />}
+      {loading && <ActivityIndicator />}
 
       <TableView
         style={{ flex: 1 }}
         tableViewCellStyle={TableView.Consts.CellStyle.Subtitle}
       >
         <Section>
-          {this.state.users.map(a => <Item key={a.id}>{a.name}</Item>)}
+          {users.map(a => (
+            <Item key={a.id}>{a.name}</Item>
+          ))}
         </Section>
       </TableView>
     </View>
-  )
-}
+  );
+};
 ```
 
 ### App-bundled JSON with filter and selected value checkmarked
@@ -256,7 +260,7 @@ render() {
     <View style={{ flex: 1 }}>
       <TableView
         style={{ flex: 1 }}
-        editing={this.props.navigation.state.params.editing}
+        editing={navigation.getParam('editing')}
       >
         <Section canMove canEdit>
           <Item canEdit={false}>Item 1</Item>
@@ -279,59 +283,84 @@ render() {
 ![pull to refresh example](./.github/pull-to-refresh-example.gif)
 
 ```jsx
-state = {
-  loading: true,
-  users: [],
-  refreshing: false,
-  amount: 10,
+function reducer(state, action) {
+  switch (action.type) {
+    case 'getUsers':
+      return { ...state, loading: false, users: action.payload };
+    case 'startRefresh':
+      return { ...state, refreshing: true };
+    case 'endRefresh':
+      return {
+        ...state,
+        refreshing: false,
+        amount: state.amount + 10,
+        users: [...state.users, ...action.payload],
+      };
+    default:
+      return state;
+  }
 }
 
-async componentWillMount() {
-  const users = await this.fetchUsers()
+() => {
+  const [{ loading, amount, refreshing, users }, dispatch] = useReducer(
+    reducer,
+    {
+      loading: true,
+      users: [],
+      refreshing: false,
+      amount: 10,
+    }
+  );
 
-  this.setState({
-    loading: false,
-    users,
-  })
-}
+  useEffect(() => {
+    const getUsers = async () => {
+      const data = await fetchUsers();
+      dispatch({ type: 'getUsers', payload: data });
+    };
 
-fetchUsers = async () => {
-  const response = await fetch('https://randomuser.me/api/?results=10')
-  const data = await response.json()
+    getUsers();
+  }, []);
 
-  return data.results.map(a => ({
-    name: `${a.name.first} ${a.name.last}`,
-    id: a.registered,
-  }))
-}
+  const fetchUsers = async () => {
+    const response = await fetch('https://randomuser.me/api/?results=10');
+    const data = await response.json();
 
-fetchMore = () => {
-  this.setState({ refreshing: true }, async () => {
-    const users = await this.fetchUsers()
-    this.setState({ users: [...users, ...this.state.users], refreshing: false, amount: this.state.amount + 10 })
-  })
-}
+    return data.results.map(a => ({
+      name: `${a.name.first} ${a.name.last}`,
+      id: a.login.uuid,
+    }));
+  };
+
+  const fetchMore = async () => {
+    dispatch({ type: 'startRefresh' });
+    const data = await fetchUsers();
+    dispatch({ type: 'endRefresh', payload: data });
+  };
 
-render() {
   return (
     <View style={{ flex: 1 }}>
       <Text style={styles.title}>
-        {this.state.loading ? 'Fetching' : 'Fetched'} {this.state.amount} users
+        {loading ? 'Fetching' : 'Fetched'} {amount} users
       </Text>
 
-      {this.state.loading && <ActivityIndicator />}
+      {loading && <ActivityIndicator />}
 
       <TableView
         style={{ flex: 1 }}
         tableViewCellStyle={TableView.Consts.CellStyle.Subtitle}
         canRefresh
-        refreshing={this.state.refreshing}
-        onRefresh={this.fetchMore}
+        refreshing={refreshing}
+        onRefresh={fetchMore}
       >
-        <Section>{this.state.users.map(a => <Item key={a.id}>{a.name}</Item>)}</Section>
+        <Section>
+          {users.map(a => (
+            <Item key={a.id}>{a.name}</Item>
+          ))}
+        </Section>
       </TableView>
     </View>
-  )
+  );
+};
 }
 ```
 
@@ -395,14 +424,14 @@ An `image` prop can be a string pointing to the name of an asset in your "Asset
 Catalog". In this case an `imageWidth` prop is recommended.
 
 ```jsx
-<Item image="icon-success.png" imageWidth={40} />;
+<Item image="icon-success.png" imageWidth={40} />
 ```
 
 Alternatively, you can `require` the image from your local app code. In this case
 an `imageWidth` is unnecessary.
 
 ```jsx
-<Item image={require('../images/icon-success.png')} />;
+<Item image={require('../images/icon-success.png')} />
 ```
 
 ### Editable Complex Components
@@ -492,7 +521,7 @@ For more examples, see examples/TableViewDemo.
       />
     );
   })}
-</Section>;
+</Section>
 ```
 
 Note that the props you pass must be primitive types: they cannot be objects.

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -138,6 +138,7 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-reanimated')
     implementation project(':react-native-gesture-handler')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"

diff --git a/example/android/app/src/main/java/com/tableviewdemo/MainActivity.java b/example/android/app/src/main/java/com/tableviewdemo/MainActivity.java
@@ -1,6 +1,9 @@
 package com.tableviewdemo;
 
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 
 public class MainActivity extends ReactActivity {
 
@@ -12,4 +15,14 @@ public class MainActivity extends ReactActivity {
     protected String getMainComponentName() {
         return "TableViewDemo";
     }
+
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+      return new ReactActivityDelegate(this, getMainComponentName()) {
+        @Override
+        protected ReactRootView createRootView() {
+         return new RNGestureHandlerEnabledRootView(MainActivity.this);
+        }
+      };
+    }
 }
diff --git a/example/android/app/src/main/java/com/tableviewdemo/MainApplication.java b/example/android/app/src/main/java/com/tableviewdemo/MainApplication.java
@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import com.swmansion.reanimated.ReanimatedPackage;
 import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
@@ -24,6 +25,7 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new ReanimatedPackage(),
             new RNGestureHandlerPackage()
       );
     }

diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -1,4 +1,6 @@
 rootProject.name = 'TableViewDemo'
+include ':react-native-reanimated'
+project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
 include ':react-native-gesture-handler'
 project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')