Merge branch 'master' into feature/remove-connectadvanced

reduxjs · Sep 4, 2021 · d98c91c · d98c91c
2 parents c7c2f0c + a3503c1
commit d98c91c
Show file tree

Hide file tree

Showing 19 changed files with 2,721 additions and 2,468 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,6 +5,7 @@ on:
     branches: [master, typescript-port]
   pull_request:
     branches: [master, typescript-port]
+  workflow_dispatch:
 
 jobs:
   build:

diff --git a/jest.config.js b/jest.config.js
@@ -1,18 +1,13 @@
+const { defaults: tsjPreset } = require('ts-jest/presets')
+
 const defaults = {
   coverageDirectory: './coverage/',
   collectCoverage: true,
   testURL: 'http://localhost',
 }
-const testFolderPath = (folderName) => `<rootDir>/test/${folderName}/**/*.js`
 
 const NORMAL_TEST_FOLDERS = ['components', 'hooks', 'integration', 'utils']
 
-const standardConfig = {
-  ...defaults,
-  displayName: 'ReactDOM',
-  testMatch: NORMAL_TEST_FOLDERS.map(testFolderPath),
-}
-
 const tsTestFolderPath = (folderName) =>
   `<rootDir>/test/${folderName}/**/*.{ts,tsx}`
 
@@ -26,13 +21,14 @@ const tsStandardConfig = {
 const rnConfig = {
   ...defaults,
   displayName: 'React Native',
-  testMatch: [testFolderPath('react-native')],
+  testMatch: [tsTestFolderPath('react-native')],
   preset: 'react-native',
   transform: {
     '^.+\\.js$': '<rootDir>/node_modules/react-native/jest/preprocessor.js',
+    ...tsjPreset.transform,
   },
 }
 
 module.exports = {
-  projects: [tsStandardConfig, standardConfig, rnConfig],
+  projects: [tsStandardConfig, rnConfig],
 }
diff --git a/package.json b/package.json
@@ -80,10 +80,12 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^3.4.2",
     "@testing-library/react-native": "^7.1.0",
+    "@types/create-react-class": "^15.6.3",
     "@types/object-assign": "^4.0.30",
     "@types/react": "^17.0.14",
     "@types/react-dom": "^17.0.9",
     "@types/react-is": "^17.0.1",
+    "@types/react-native": "^0.64.12",
     "@types/react-redux": "^7.1.18",
     "@typescript-eslint/eslint-plugin": "^4.28.0",
     "@typescript-eslint/parser": "^4.28.0",

diff --git a/src/hooks/useSelector.ts b/src/hooks/useSelector.ts
@@ -71,6 +71,11 @@ function useSelectorWithStoreAndSubscription<TStoreState, TSelectedState>(
     function checkForUpdates() {
       try {
         const newStoreState = store.getState()
+        // Avoid calling selector multiple times if the store's state has not changed
+        if (newStoreState === latestStoreState.current) {
+          return
+        }
+
         const newSelectedState = latestSelector.current!(newStoreState)
 
         if (equalityFn(newSelectedState, latestSelectedState.current)) {