Merge pull request #118 from JairajJangle/develop

Upgraded zustand to v5 and upgraded other deps

Author: JairajJangle

example/package.json

@@ -21,8 +21,8 @@
     "react-native-gesture-handler": "2.17.1",
     "react-native-paper": "^5.13.1",
     "react-native-safe-area-context": "^4.7.1",
-    "react-native-screens": "^3.22.1",
-    "react-native-vector-icons": "^10.1.0"
+    "react-native-screens": "3.35.0",
+    "react-native-vector-icons": "^10.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

example/yarn.lock

@@ -37,7 +37,8 @@
     "build:android": "cd example/android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
     "build:ios": "cd example/ios && pod install && xcodebuild -workspace TreeMultiSelectExample.xcworkspace -scheme TreeMultiSelectExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO",
     "bootstrap": "yarn example && yarn install && yarn example pods",
-    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build"
+    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build",
+    "postinstall": "patch-package"
   },
   "keywords": [
     "react-native",
@@ -85,7 +86,7 @@
     "@commitlint/config-conventional": "^19.7.1",
     "@evilmartians/lefthook": "^1.10.10",
     "@react-native-community/eslint-config": "^3.2.0",
-    "@release-it/conventional-changelog": "^8.0.2",
+    "@release-it/conventional-changelog": "^10.0.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^11.0.1",
@@ -95,8 +96,8 @@
     "@testing-library/react-native": "^12.6.1",
     "@types/color": "^3.0.6",
     "@types/jest": "^29.5.3",
-    "@types/lodash": "^4.17.13",
-    "@types/react": "~17.0.21",
+    "@types/lodash": "^4.17.16",
+    "@types/react": "^18.0.24",
     "@types/react-native": "0.70.0",
     "@types/react-native-vector-icons": "^6.4.18",
     "@types/react-test-renderer": "18.3.0",
@@ -106,21 +107,19 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^29.7.0",
+    "patch-package": "^8.0.0",
     "prettier": "^3.3.3",
     "react": "18.2.0",
     "react-native": "^0.72.15",
     "react-native-builder-bob": "^0.30.0",
     "react-native-paper": "5.x.x",
     "react-test-renderer": "18.2.0",
-    "release-it": "^17.6.0",
+    "release-it": "^18.1.2",
     "semantic-release": "^24.1.0",
     "ts-jest": "^29.1.1",
     "turbo": "^2.1.0",
     "typescript": "^5.0.2"
   },
-  "resolutions": {
-    "@types/react": "17.0.21"
-  },
   "peerDependencies": {
     "@shopify/flash-list": "1.x.x",
     "react": "*",
@@ -211,7 +210,7 @@
   "dependencies": {
     "lodash": "^4.17.21",
     "react-native-uuid": "^2.0.3",
-    "zustand": "^4.5.6"
+    "zustand": "^5.0.3"
   },
   "funding": [
     {

package-lock.json

@@ -0,0 +1,11 @@
+diff --git a/node_modules/react-native-paper/src/utils/forwardRef.tsx b/node_modules/react-native-paper/src/utils/forwardRef.tsx
+index bca954b..0761712 100644
+--- a/node_modules/react-native-paper/src/utils/forwardRef.tsx
++++ b/node_modules/react-native-paper/src/utils/forwardRef.tsx
+@@ -19,5 +19,5 @@ export type ForwardRefComponent<T, P = {}> = ForwardRefExoticComponent<
+  * More info: https://github.com/callstack/react-native-paper/pull/3603
+  */
+ export const forwardRef: <T, P = {}>(
+-  render: ForwardRefRenderFunction<T, P>
++  render: ForwardRefRenderFunction<T, PropsWithoutRef<P>>
+ ) => ForwardRefComponent<T, P> = React.forwardRef;

package.json

@@ -1,7 +1,7 @@
-import { act } from '@testing-library/react-native';
-import { StateCreator } from 'zustand';
+import { act } from "@testing-library/react-native";
+import { StateCreator } from "zustand";
 
-const { create: actualCreate } = jest.requireActual('zustand');
+const { create: actualCreate } = jest.requireActual("zustand");
 
 // a variable to hold reset functions for all stores declared in the app
 const storeResetFns = new Set<() => void>();

patches/react-native-paper+5.13.1.patch

@@ -1,3 +1,5 @@
+jest.mock('zustand');
+
 import { tree3d2b } from "../__mocks__/generateTree.mock";
 import {
     getFilteredTreeData,
@@ -12,8 +14,6 @@ import { getTreeViewStore } from "../store/treeView.store";
 import { act } from 'react-test-renderer';
 import { testStoreId } from "../constants/tests.constants";
 
-jest.mock('zustand');
-
 describe('selectAll helpers functions', () => {
     const useTreeViewStore = getTreeViewStore(testStoreId);
 

src/__mocks__/zustand.ts

@@ -25,7 +25,7 @@ import {
 import { CheckboxView } from "./CheckboxView";
 import { CustomExpandCollapseIcon } from "./CustomExpandCollapseIcon";
 import { defaultIndentationMultiplier } from "../constants/treeView.constants";
-import { useShallow } from 'zustand/react/shallow';
+import { useShallow } from "zustand/react/shallow";
 import { typedMemo } from "../utils/typedMemo";
 import { ScrollToNodeHandler } from "../handlers/ScrollToNodeHandler";
 
@@ -157,7 +157,7 @@ function getValue(
     isIndeterminate: boolean
 ): CheckboxValueType {
     if (isIndeterminate) {
-        return 'indeterminate';
+        return "indeterminate";
     } else if (isChecked) {
         return true;
     } else {
@@ -249,8 +249,8 @@ const styles = StyleSheet.create({
     },
     nodeCheckboxAndArrowRow: {
         flex: 1,
-        flexDirection: 'row',
-        alignItems: 'center',
+        flexDirection: "row",
+        alignItems: "center",
         minWidth: "100%"
     }
 });

src/__tests__/selectAll.helper.test.ts

@@ -1,5 +1,5 @@
 import type { SelectionPropagation, TreeNode } from "src/types/treeView.types";
-import { create, StoreApi, UseBoundStore } from 'zustand';
+import { create, StoreApi, UseBoundStore } from "zustand";
 
 export type TreeViewState<ID> = {
     // Store ids of checked tree nodes

src/components/NodeList.tsx

@@ -5,7 +5,8 @@
   "compilerOptions": {
     "baseUrl": "./",
     "paths": {
-      "react-native-tree-multi-select": ["./src/index"]
+      "react-native-tree-multi-select": ["./src/index"],
+      "react": [ "./node_modules/@types/react" ]
     },
     "allowUnreachableCode": false,
     "allowUnusedLabels": false,