Merge branch 'master' of https://github.com/nandorojo/zeego

nandorojo · Jun 15, 2022 · 3c025af · 3c025af
2 parents 7350317 + 46989b8
commit 3c025af
Show file tree

Hide file tree

Showing 8 changed files with 464 additions and 582 deletions.
diff --git a/README.md b/README.md
@@ -16,15 +16,25 @@ Beautiful, native menus for React Native + Web, inspired by Radix UI.
 yarn add zeego
 ```
 
-Add peer deps:
+### Install peer dependencies
+
+If you're in a monorepo, you should install these in the directory of your native app.
+
+#### iOS
+
+```sh
+yarn add react-native-ios-context-menu
+```
+
+#### Android
 
 ```sh
-yarn add react-native-ios-context-menu react-native-popper
+yarn add @react-native-menu/menu
 ```
 
 ### Solito
 
-Be sure to install `react-native-ios-context-menu` in your Expo folder (likely `apps/expo`).
+As shown above, sure to install `react-native-ios-context-menu` and `@react-native-menu/menu` in your Expo folder (`apps/expo`).
 
 You should also follow the Next.js steps below.
 
@@ -133,7 +143,7 @@ const DropdownMenuExample = () => {
               12 artists fit your search
             </DropdownMenu.ItemSubtitle>
           )}
-          <DropdownMenuItemIcon iosIconName="list.star">
+          <DropdownMenuItemIcon iosIconName="list.star" androidIconName="star_on">
             <Ionicons name="list" size={15} />
           </DropdownMenuItemIcon>
         </DropdownMenuItem>
@@ -143,7 +153,7 @@ const DropdownMenuExample = () => {
           key="second"
         >
           <DropdownMenuItemTitle>Favorite</DropdownMenuItemTitle>
-          <DropdownMenuItemIcon iosIconName="star.fill">
+          <DropdownMenuItemIcon iosIconName="star.fill" androidIconName="star_off">
             <Ionicons name="star" size={15} />
           </DropdownMenuItemIcon>
         </DropdownMenuItem>

diff --git a/examples/expo/package.json b/examples/expo/package.json
@@ -12,6 +12,7 @@
     "test": "jest"
   },
   "dependencies": {
+    "@react-native-menu/menu": "^0.5.2",
     "add": "^2.0.6",
     "expo": "^43.0.0",
     "expo-splash-screen": "^0.13.5",

diff --git a/examples/expo/src/App.tsx b/examples/expo/src/App.tsx
@@ -213,7 +213,10 @@ const DropdownMenuExample = () => {
               12 artists fit your search
             </DropdownMenu.ItemSubtitle>
           )}
-          <DropdownMenuItemIcon iosIconName="list.star">
+          <DropdownMenuItemIcon
+            iosIconName="list.star"
+            androidIconName="star_on"
+          >
             <Ionicons name="list" size={15} />
           </DropdownMenuItemIcon>
         </DropdownMenuItem>
@@ -223,7 +226,10 @@ const DropdownMenuExample = () => {
           key="second"
         >
           <DropdownMenuItemTitle>Favorite</DropdownMenuItemTitle>
-          <DropdownMenuItemIcon iosIconName="star.fill">
+          <DropdownMenuItemIcon
+            iosIconName="star.fill"
+            androidIconName="btn_star"
+          >
             <Ionicons name="star" size={15} />
           </DropdownMenuItemIcon>
         </DropdownMenuItem>

diff --git a/lerna-debug.log b/lerna-debug.log
diff --git a/packages/zeego/package.json b/packages/zeego/package.json
@@ -69,15 +69,14 @@
     "react": "17.0.1",
     "react-native": "0.64.2",
     "react-native-builder-bob": "^0.18.0",
-    "react-native-popper": "^0.3.2",
     "release-it": "^14.2.2",
     "typescript": "^4.4"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
     "react-native-ios-context-menu": "*",
-    "react-native-popper": "*"
+    "@react-native-menu/menu": "*"
   },
   "jest": {
     "preset": "react-native",