Merge 34c50b5f90 into a1c2f068b5

packages/redux-devtools-inspector/src/ActionList.jsx

@@ -85,7 +85,8 @@ export default class ActionList extends Component {
       startActionId,
       onSelect,
       onSearch,
-      searchValue,
+      searchInclude,
+      searchExclude,
       currentActionId,
       hideMainButtons,
       hideActionButtons,
@@ -93,14 +94,14 @@ export default class ActionList extends Component {
       onSweep,
       onJumpToState
     } = this.props;
-    const lowerSearchValue = searchValue && searchValue.toLowerCase();
-    const filteredActionIds = searchValue
-      ? actionIds.filter(
-          id =>
-            actions[id].action.type.toLowerCase().indexOf(lowerSearchValue) !==
-            -1
-        )
-      : actionIds;
+
+    const filteredActionIds = actionIds.filter(id => {
+      const type = actions[id].action.type.toLowerCase();
+      return (
+        searchExclude.every(searchData => !type.includes(searchData)) &&
+        searchInclude.every(searchData => type.includes(searchData))
+      );
+    });
 
     return (
       <div

packages/redux-devtools-inspector/src/DevtoolsInspector.js

@@ -221,7 +221,8 @@ export default class DevtoolsInspector extends Component {
     const {
       selectedActionId,
       startActionId,
-      searchValue,
+      searchInclude,
+      searchExclude,
       tabName
     } = monitorState;
     const inspectedPathType =
@@ -250,7 +251,8 @@ export default class DevtoolsInspector extends Component {
             actions,
             actionIds,
             isWideLayout,
-            searchValue,
+            searchInclude,
+            searchExclude,
             selectedActionId,
             startActionId,
             skippedActionIds,
@@ -324,8 +326,22 @@ export default class DevtoolsInspector extends Component {
     this.props.dispatch(sweep());
   };
 
-  handleSearch = val => {
-    this.updateMonitorState({ searchValue: val });
+  handleSearch = value => {
+    const segments = value.toLowerCase().trim().split(/\s+/);
+    const searchInclude = [];
+    const searchExclude = [];
+
+    segments.forEach(segment => {
+      if (segment.charAt(0) === '-') {
+        if (segment.length > 1) {
+          searchExclude.push(segment.substr(1));
+        }
+      } else {
+        searchInclude.push(segment);
+      }
+    });
+
+    this.updateMonitorState({ searchInclude, searchExclude });
   };
 
   handleSelectAction = (e, actionId) => {

packages/redux-devtools-inspector/src/redux.js

@@ -5,7 +5,9 @@ export const DEFAULT_STATE = {
   startActionId: null,
   inspectedActionPath: [],
   inspectedStatePath: [],
-  tabName: 'Diff'
+  tabName: 'Diff',
+  searchInclude: [],
+  searchExclude: []
 };
 
 export function updateMonitorState(monitorState) {