From c753cac000ae9af6b4d461c12578b1bc76646e35 Mon Sep 17 00:00:00 2001
From: Daniel Steigerwald <daniel@steigerwald.cz>
Date: Mon, 27 Nov 2023 00:06:04 +0100
Subject: [PATCH] Fix native example and lint

---
 apps/native/App.tsx                   | 24 +++++++++---------------
 packages/eslint-config-evolu/index.js |  3 +--
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/apps/native/App.tsx b/apps/native/App.tsx
index 7f406bc28..3c2cf7c8e 100644
--- a/apps/native/App.tsx
+++ b/apps/native/App.tsx
@@ -56,20 +56,15 @@ const Database = S.struct({
   todoCategory: TodoCategoryTable,
 });
 
-const {
-  useEvoluError,
-  createQuery,
-  useQuery,
-  useCreate,
-  useUpdate,
-  useOwner,
-  useEvolu,
-} = Evolu.create(Database, {
+const evolu = Evolu.create(Database, {
   ...(process.env.NODE_ENV === "development" && {
     syncUrl: "http://localhost:4000",
   }),
 });
 
+// React Hooks
+const { useEvolu, useEvoluError, useQuery, useOwner } = evolu;
+
 export default function App(): JSX.Element {
   return (
     <ScrollView style={appStyles.container}>
@@ -175,7 +170,7 @@ const OwnerActions: FC = () => {
   );
 };
 
-const todosWithCategories = createQuery((db) =>
+const todosWithCategories = evolu.createQuery((db) =>
   db
     .selectFrom("todo")
     .select(["id", "title", "isCompleted", "categoryId"])
@@ -199,7 +194,7 @@ const todosWithCategories = createQuery((db) =>
 );
 
 const Todos: FC = () => {
-  const create = useCreate();
+  const { create } = useEvolu();
   const { rows } = useQuery(todosWithCategories);
 
   const [text, setText] = useState("");
@@ -242,7 +237,7 @@ const TodoItem = memo<{
 }>(function TodoItem({
   row: { id, title, isCompleted, categoryId, categories },
 }) {
-  const update = useUpdate();
+  const { update } = useEvolu();
 
   return (
     <View style={{ marginBottom: 16 }}>
@@ -311,7 +306,7 @@ interface TodoCategoryForSelect {
   readonly name: TodoCategoryTable["name"] | null;
 }
 
-const todoCategories = createQuery((db) =>
+const todoCategories = evolu.createQuery((db) =>
   db
     .selectFrom("todoCategory")
     .select(["id", "name", "json"])
@@ -323,8 +318,7 @@ const todoCategories = createQuery((db) =>
 );
 
 const TodoCategories: FC = () => {
-  const create = useCreate();
-  const update = useUpdate();
+  const { create, update } = useEvolu();
   const { rows } = useQuery(todoCategories);
 
   const [text, setText] = useState("");
diff --git a/packages/eslint-config-evolu/index.js b/packages/eslint-config-evolu/index.js
index fe6961027..5766ffc39 100644
--- a/packages/eslint-config-evolu/index.js
+++ b/packages/eslint-config-evolu/index.js
@@ -31,9 +31,8 @@ module.exports = {
   },
   parser: "@typescript-eslint/parser",
 
-  // https://github.com/facebook/react-native/issues/28549#issuecomment-1464986589
   settings: {
-    "import/ignore": ["react-native"],
+    "import/ignore": ["node_modules/react-native/index\\.js$"],
   },
 
   parserOptions: {