Add regex support for the actions filtering

Related to #45.

Author: zalmoxisus

package.json

@@ -63,7 +63,7 @@
     "redux-devtools": "^3.1.0",
     "redux-devtools-chart-monitor": "^1.1.3",
     "redux-devtools-diff-monitor": "^4.0.1",
-    "redux-devtools-filter-actions": "^1.0.1",
+    "redux-devtools-filter-actions": "^1.1.0",
     "redux-devtools-log-monitor": "^1.0.4",
     "redux-slider-monitor": "^1.0.1",
     "redux-thunk": "^1.0.3",

src/browser/extension/inject/pageScript.js

@@ -19,6 +19,7 @@ window.devToolsExtension = function(config = {}) {
 
   function relay(type, state, action, nextActionId) {
     setTimeout(() => {
+      if (type === 'STATE') addFilter(state);
       const message = {
         payload: state,
         action: action || '',
@@ -64,15 +65,15 @@ window.devToolsExtension = function(config = {}) {
     if (!window.devToolsOptions.filter) return false;
     const { whitelist, blacklist } = window.devToolsOptions;
     return (
-      whitelist && whitelist.indexOf(action.type) === -1 ||
-      blacklist && blacklist.indexOf(action.type) !== -1
+      whitelist && !action.type.match(whitelist) ||
+      blacklist && action.type.match(blacklist)
     );
   }
 
   function addFilter(state) {
     if (window.devToolsOptions.filter) {
-      if (window.devToolsOptions.whitelist) state.whitelist = window.devToolsOptions.whitelist;
-      else if (window.devToolsOptions.blacklist) state.blacklist = window.devToolsOptions.blacklist;
+      if (window.devToolsOptions.whitelist) state.whitelist = [window.devToolsOptions.whitelist];
+      else if (window.devToolsOptions.blacklist) state.blacklist = [window.devToolsOptions.blacklist];
     }
   }
 
@@ -131,7 +132,6 @@ window.devToolsExtension = function(config = {}) {
       relay('ACTION', state, liftedAction, nextActionId);
     } else {
       if (errorOccurred && !liftedState.computedStates[liftedState.currentStateIndex].error) errorOccurred = false;
-      addFilter(liftedState);
       relay('STATE', liftedState);
     }
   }

src/browser/extension/options/syncOptions.js

@@ -31,15 +31,15 @@ const get = callback => {
   }
 };
 
-const toArray = str => (
-  str !== '' ? str.split('\n') : null
+const toReg = str => (
+  str !== '' ? str.split('\n').join('|') : null
 );
 
 const injectOptions = newOptions => {
   if (!newOptions) return;
   if (newOptions.filter) {
-    newOptions.whitelist = toArray(newOptions.whitelist);
-    newOptions.blacklist = toArray(newOptions.blacklist);
+    newOptions.whitelist = toReg(newOptions.whitelist);
+    newOptions.blacklist = toReg(newOptions.blacklist);
   }
 
   options = newOptions;
@@ -61,7 +61,7 @@ export const getOptionsFromBg = () => {
 
 export const isAllowed = (localOptions = options) => (
   !localOptions || localOptions.inject || !localOptions.urls
-    || location.href.match(localOptions.urls.split('\n').join('|'))
+    || location.href.match(toReg(localOptions.urls))
 );
 
 export default {