jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expand/Collapse Plugin Sidebar v1

Browse Source 
Summary:
* Change the way to determine recently used plugins
* Show all plugins if there are just a few hidden plugins
  * Not all of plugins in client list can be showed, so checking happens when rendering
* Add action to clear the history internally (for testing) (not sure if needed)

Reviewed By: danielbuechele

Differential Revision: D16965302

fbshipit-source-id: 6efeedac8c0fad7e89a96e7fc5ba9101d3516fe7
This commit is contained in:
Chaiwat Ekkaewnumchai
2019-08-23 04:40:41 -07:00
committed by Facebook Github Bot
parent 620383bae3
commit f9fa80d93b
3 changed files with 101 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/reducers/connections.tsx
View File

@@ -12,6 +12,7 @@ import {UninitializedClient} from '../UninitializedClient';
import {isEqual} from 'lodash';
import iosUtil from '../fb-stubs/iOSContainerUtility';
import {performance} from 'perf_hooks';
import {SAVED_PLUGINS_COUNT} from '../Client';
export type State = {
devices: Array<BaseDevice>;
@@ -33,8 +34,6 @@ export type State = {
deepLinkPayload: null | string;
};
const MAX_MINIMUM_PLUGINS = 5;
export type Action =
| {
type: 'UNREGISTER_DEVICES';
@@ -99,7 +98,8 @@ export type Action =
| {
type: 'CLIENT_SHOW_MORE_OR_LESS';
payload: string;
};
}
| {type: 'CLEAR_LRU_PLUGINS_HISTORY'};
const DEFAULT_PLUGIN = 'DeviceLogs';
const DEFAULT_DEVICE_BLACKLIST = [MacDevice];
@@ -215,20 +215,19 @@ const reducer = (state: State = INITAL_STATE, action: Action): State => {
performance.mark(`activePlugin-${selectedPlugin}`);
}
const LRUPlugins = (
state.userLRUPlugins[selectedApp || state.userPreferredApp] || []
).slice();
const userPreferredApp = selectedApp || state.userPreferredApp;
const LRUPlugins = (state.userLRUPlugins[userPreferredApp] || []).slice();
const idxLRU = LRUPlugins.indexOf(selectedPlugin);
if (idxLRU >= 0) {
LRUPlugins.splice(idxLRU, 1);
}
LRUPlugins.unshift(selectedPlugin);
LRUPlugins.splice(MAX_MINIMUM_PLUGINS);
LRUPlugins.splice(SAVED_PLUGINS_COUNT);
return {
...state,
...payload,
userPreferredApp: selectedApp || state.userPreferredApp,
userPreferredApp: userPreferredApp,
userPreferredPlugin: selectedPlugin,
userLRUPlugins: {...state.userLRUPlugins, [selectedApp]: LRUPlugins},
};
@@ -242,15 +241,7 @@ const reducer = (state: State = INITAL_STATE, action: Action): State => {
const {userPreferredApp, userPreferredPlugin, userLRUPlugins} = state;
let {selectedApp, selectedPlugin} = state;
const lessPlugins = (userLRUPlugins[payload.id] || []).slice();
if (lessPlugins) {
payload.lessPlugins = lessPlugins.concat(
payload.plugins.filter(p => !lessPlugins.includes(p)),
);
} else {
payload.lessPlugins = payload.plugins.slice();
}
payload.lessPlugins = payload.lessPlugins.slice(0, MAX_MINIMUM_PLUGINS);
payload.lessPlugins = (userLRUPlugins[payload.id] || []).slice();
if (
userPreferredApp &&
@@ -383,6 +374,18 @@ const reducer = (state: State = INITAL_STATE, action: Action): State => {
}),
};
}
case 'CLEAR_LRU_PLUGINS_HISTORY': {
const clearLRUPlugins: Map<string, Array<string>> = new Map();
state.userLRUPlugins.forEach((_, key) => {
if (key !== null) {
clearLRUPlugins.set(key, []);
}
});
return {
...state,
userLRUPlugins: clearLRUPlugins,
};
}
default:
return state;
}