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

UID Refactor 3/n UINode -> ClientNode

Browse Source 
Summary:
UINode has never been a good name, we have 3 versions of a node.
ClientNode Previously UINode (the raw data from the client)
NestedNode (for the visualiser)
TreeNode (extends ClientNode and adds stuff specific to the tree like indentation and expanded states)

Arguablely we dont need nested node but that is another story

Reviewed By: elboman

Differential Revision: D47547529

fbshipit-source-id: 9a3b119d1230ea7b6734e7a3270c28287b04faf1
This commit is contained in:
Luke De Feo
2023-07-21 07:17:31 -07:00
committed by Facebook GitHub Bot
parent f181551ce6
commit 87a1b657c3
14 changed files with 77 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
desktop/plugins/public/ui-debugger/index.tsx
View File

@@ -24,7 +24,7 @@ import {
MetadataId,
PerformanceStatsEvent,
SnapshotInfo,
UINode,
ClientNode,
} from './ClientTypes';
import {
UIState,
@@ -42,7 +42,7 @@ import {prefetchSourceFileLocation} from './components/fb-stubs/IDEContextMenu';
type LiveClientState = {
snapshotInfo: SnapshotInfo | null;
nodes: Map<Id, UINode>;
nodes: Map<Id, ClientNode>;
};
type PendingData = {
@@ -193,7 +193,7 @@ export function plugin(client: PluginClient<Events>) {
perfEvents.append(event);
});
const nodesAtom = createState<Map<Id, UINode>>(new Map());
const nodesAtom = createState<Map<Id, ClientNode>>(new Map());
const frameworkEvents = createDataSource<FrameworkEvent>([], {
indices: [['nodeId']],
limit: 10000,
@@ -327,7 +327,7 @@ export function plugin(client: PluginClient<Events>) {
//todo deal with racecondition, where bloks screen is fetching, takes time then you go back get more recent frame then bloks screen comes and overrites it
function applyFrameData(
nodes: Map<Id, UINode>,
nodes: Map<Id, ClientNode>,
snapshotInfo: SnapshotInfo | undefined,
) {
liveClientData = produce(liveClientData, (draft) => {
@@ -390,7 +390,10 @@ export function plugin(client: PluginClient<Events>) {
};
}
function uiActions(uiState: UIState, nodes: Atom<Map<Id, UINode>>): UIActions {
function uiActions(
uiState: UIState,
nodes: Atom<Map<Id, ClientNode>>,
): UIActions {
const onExpandNode = (node: Id) => {
uiState.expandedNodes.update((draft) => {
draft.add(node);
@@ -483,7 +486,10 @@ function uiActions(uiState: UIState, nodes: Atom<Map<Id, UINode>>): UIActions {
};
}
function checkFocusedNodeStillActive(uiState: UIState, nodes: Map<Id, UINode>) {
function checkFocusedNodeStillActive(
uiState: UIState,
nodes: Map<Id, ClientNode>,
) {
const focusedNodeId = uiState.focusedNode.get();
const focusedNode = focusedNodeId && nodes.get(focusedNodeId);
if (!focusedNode || !isFocusedNodeAncestryAllActive(focusedNode, nodes)) {
@@ -492,8 +498,8 @@ function checkFocusedNodeStillActive(uiState: UIState, nodes: Map<Id, UINode>) {
}
function isFocusedNodeAncestryAllActive(
focused: UINode,
nodes: Map<Id, UINode>,
focused: ClientNode,
nodes: Map<Id, ClientNode>,
): boolean {
let node = focused;
@@ -519,7 +525,10 @@ function isFocusedNodeAncestryAllActive(
return false;
}
function collapseinActiveChildren(node: UINode, expandedNodes: Draft<Set<Id>>) {
function collapseinActiveChildren(
node: ClientNode,
expandedNodes: Draft<Set<Id>>,
) {
if (node.activeChild) {
expandedNodes.add(node.activeChild);
for (const child of node.children) {