Merge pull request #284 from fleur-js/fix-breaking-change-in-use-store

Accept null in `useStore(_, <here>)` for prevent to v3.2.0 likes update behaviour
hanakla · Aug 21, 2020 · 6deffe4 · 6deffe4
2 parents 2c5bb82 + 9e66752
commit 6deffe4
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 15 deletions.
diff --git a/packages/di/package.json b/packages/di/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "jest": "25.1.0",
     "ts-jest": "25.2.1",
-    "typescript": "3.7.4"
+    "typescript": "3.9.7"
   },
   "sideEffects": false
 }
diff --git a/packages/fleur/package.json b/packages/fleur/package.json
@@ -22,7 +22,7 @@
     "tslib": "1.11.1",
     "tslint": "6.1.0",
     "tslint-config-prettier": "1.18.0",
-    "typescript": "3.7.4"
+    "typescript": "3.9.7"
   },
   "dependencies": {
     "immer": "^5.0.0",

diff --git a/packages/fleur/src/Action.ts b/packages/fleur/src/Action.ts
@@ -37,7 +37,11 @@ export function actions<T extends ActionMap>(
         value: `${namePrefix}${separator}${key}`,
       })
     } else {
-      actions(`${namePrefix}${separator}${key}`, actionMap[key], '.')
+      actions(
+        `${namePrefix}${separator}${key}`,
+        actionMap[key] as ActionMap,
+        '.',
+      )
     }
   })
 

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@types/serialize-javascript": "1.5.0",
     "next": "^9.5.2",
-    "typescript": "3.7.4"
+    "typescript": "3.9.7"
   },
   "peerDependencies": {
     "next": "^9.3.2"

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -39,7 +39,7 @@
     "rollup-plugin-typescript2": "0.25.2",
     "ts-jest": "25.2.1",
     "tslib": "1.11.1",
-    "typescript": "3.7.4"
+    "typescript": "3.9.7"
   },
   "sideEffects": false
 }
diff --git a/packages/react/src/connectToStores.ts b/packages/react/src/connectToStores.ts
@@ -7,14 +7,14 @@ import { WithRef } from './WithRef'
 type StoreToPropMapper<P, T> = (getStore: StoreGetter, props: P) => T
 
 type ConnectedComponent<Props, MappedProps> = React.ComponentType<
-  WithRef<Pick<Props, Exclude<keyof Props, keyof MappedProps>>>
+  Pick<Props, Exclude<keyof Props, keyof MappedProps>> & {}
 >
 
 export const connectToStores = <Props, MappedProps = {}>(
   mapStoresToProps: StoreToPropMapper<Props, MappedProps>,
 ) => <ComponentProps extends object>(
   Component: React.ComponentType<ComponentProps>,
-): ConnectedComponent<ComponentProps, MappedProps> => {
+): ConnectedComponent<WithRef<ComponentProps>, MappedProps> => {
   return React.forwardRef((props: any, ref) => {
     const mappedProps = useStore(getStore => mapStoresToProps(getStore, props))
 

diff --git a/packages/react/src/useStore.ts b/packages/react/src/useStore.ts
@@ -72,10 +72,12 @@ const isEqual = (prev: any, next: any) => {
 
 export const useStore = <Mapper extends StoreToPropMapper>(
   mapStoresToProps: Mapper,
-  checkEquality: (
-    prev: Readonly<ReturnType<Mapper>>,
-    next: Readonly<ReturnType<Mapper>>,
-  ) => boolean = isEqual,
+  checkEquality:
+    | ((
+        prev: Readonly<ReturnType<Mapper>>,
+        next: Readonly<ReturnType<Mapper>>,
+      ) => boolean)
+    | null = isEqual,
 ): ReturnType<Mapper> => {
   const {
     context: { getStore },
@@ -108,7 +110,7 @@ export const useStore = <Mapper extends StoreToPropMapper>(
 
   const handleStoreMutation = useCallback(() => {
     const nextState = mapStoresToProps(getStoreInspector)
-    if (checkEquality(latestState.current!, nextState)) return
+    if (checkEquality?.(latestState.current!, nextState)) return
     latestState.current = nextState
     rerender()
   }, [mapStoresToProps, getStoreInspector])

diff --git a/packages/react/src/withFleurContext.ts b/packages/react/src/withFleurContext.ts
@@ -16,7 +16,7 @@ type ExcludeContextProp<P extends ContextProp> = Pick<
 
 export const withFleurContext = <Props extends ContextProp>(
   Component: React.ComponentType<Props>,
-): React.ComponentType<WithRef<ExcludeContextProp<Props>>> => {
+): React.ComponentType<ExcludeContextProp<WithRef<Props>>> => {
   return React.forwardRef((props: any, ref) => {
     const { getStore, executeOperation, depend } = useFleurContext()
 

diff --git a/packages/route-store-dom/package.json b/packages/route-store-dom/package.json
@@ -29,7 +29,7 @@
     "jest": "25.1.0",
     "react-test-renderer": "16.13.1",
     "ts-jest": "25.2.1",
-    "typescript": "3.7.4"
+    "typescript": "3.9.7"
   },
   "sideEffects": false
 }
diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -18,7 +18,7 @@
     "@testing-library/react": "9.4.1",
     "jest": "25.1.0",
     "ts-jest": "25.2.1",
-    "typescript": "3.7.4"
+    "typescript": "3.9.7"
   },
   "dependencies": {
     "immer": "^5.0.0"

diff --git a/yarn.lock b/yarn.lock
@@ -10859,6 +10859,11 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.4.tgz#1743a5ec5fef6a1fa9f3e4708e33c81c73876c19"
   integrity sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==
 
+[email protected]:
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
+  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"