From f181551ce67ccd225905d691473f60c1a3dab8dd Mon Sep 17 00:00:00 2001 From: Luke De Feo Date: Fri, 21 Jul 2023 07:17:31 -0700 Subject: [PATCH] UID refactor 2/n Split types into client and desktop types Summary: This file was getting overwelhming, and this seemed like a reasonable way to split it Reviewed By: elboman Differential Revision: D47547532 fbshipit-source-id: ab2bfa22daabbed13ec1445da0cf8ba88bda12d7 --- .../{types.tsx => ClientTypes.tsx} | 91 --------------- .../public/ui-debugger/DesktopTypes.tsx | 107 ++++++++++++++++++ .../ui-debugger/components/Controls.tsx | 2 +- .../components/FrameworkEventsTable.tsx | 2 +- .../ui-debugger/components/PerfStats.tsx | 4 +- .../public/ui-debugger/components/Tree.tsx | 10 +- .../components/Visualization2D.tsx | 10 +- .../components/fb-stubs/IDEContextMenu.tsx | 2 +- .../public/ui-debugger/components/main.tsx | 2 +- .../components/sidebar/Inspector.tsx | 2 +- .../sidebar/inspector/AttributesInspector.tsx | 2 +- .../sidebar/inspector/BoundsInspector.tsx | 2 +- .../sidebar/inspector/ColorInspector.tsx | 2 +- .../inspector/Coordinate3DInspector.tsx | 2 +- .../sidebar/inspector/CoordinateInspector.tsx | 2 +- .../inspector/DocumentationInspector.tsx | 2 +- .../inspector/FrameworkEventsInspector.tsx | 2 +- .../sidebar/inspector/IdentityInspector.tsx | 2 +- .../sidebar/inspector/SizeInspector.tsx | 2 +- .../sidebar/inspector/SpaceBoxInspector.tsx | 2 +- .../sidebar/inspector/StackTraceInspector.tsx | 2 +- .../inspector/fb-stubs/CodeInspector.tsx | 2 +- .../fb-stubs/StreamInterceptor.tsx | 3 +- .../public/ui-debugger/hooks/useDelay.tsx | 1 - desktop/plugins/public/ui-debugger/index.tsx | 14 ++- .../ui-debugger/utils/dataTransform.tsx | 7 +- .../public/ui-debugger/utils/tracker.tsx | 5 +- 27 files changed, 149 insertions(+), 137 deletions(-) rename desktop/plugins/public/ui-debugger/{types.tsx => ClientTypes.tsx} (69%) create mode 100644 desktop/plugins/public/ui-debugger/DesktopTypes.tsx diff --git a/desktop/plugins/public/ui-debugger/types.tsx b/desktop/plugins/public/ui-debugger/ClientTypes.tsx similarity index 69% rename from desktop/plugins/public/ui-debugger/types.tsx rename to desktop/plugins/public/ui-debugger/ClientTypes.tsx index faf9d2800..9d593a17d 100644 --- a/desktop/plugins/public/ui-debugger/types.tsx +++ b/desktop/plugins/public/ui-debugger/ClientTypes.tsx @@ -7,67 +7,6 @@ * @format */ -import {Atom} from 'flipper-plugin'; - -export type UIState = { - viewMode: Atom; - isConnected: Atom; - isPaused: Atom; - streamState: Atom; - searchTerm: Atom; - isContextMenuOpen: Atom; - hoveredNodes: Atom; - selectedNode: Atom; - highlightedNodes: Atom>; - focusedNode: Atom; - expandedNodes: Atom>; - visualiserWidth: Atom; - frameworkEventMonitoring: Atom>; - filterMainThreadMonitoring: Atom; -}; - -export type ViewMode = - | {mode: 'default'} - | {mode: 'frameworkEventsTable'; treeRootId: Id}; - -export type NodeSelection = { - id: Id; - source: SelectionSource; -}; - -export type OnSelectNode = ( - node: Id | undefined, - source: SelectionSource, -) => void; - -export type UIActions = { - onHoverNode: (node?: Id) => void; - onFocusNode: (focused?: Id) => void; - onContextMenuOpen: (open: boolean) => void; - onSelectNode: OnSelectNode; - onExpandNode: (node: Id) => void; - onCollapseNode: (node: Id) => void; - setVisualiserWidth: (width: number) => void; - onSetFilterMainThreadMonitoring: (toggled: boolean) => void; - onSetViewMode: (viewMode: ViewMode) => void; -}; - -export type SelectionSource = 'visualiser' | 'tree' | 'keyboard'; - -export type StreamState = - | {state: 'Ok'} - | {state: 'RetryingAfterError'} - | { - state: 'StreamInterceptorRetryableError'; - error: StreamInterceptorError; - retryCallback: () => Promise; - } - | { - state: 'FatalError'; - error: Error; - clearCallBack: () => Promise; - }; - export type Events = { init: InitEvent; subtreeUpdate: SubtreeUpdateEvent; @@ -77,8 +16,6 @@ export type Events = { metadataUpdate: UpdateMetadataEvent; }; -export type StreamFlowState = {paused: boolean}; - export type FrameScanEvent = { frameTime: number; nodes: UINode[]; @@ -170,16 +107,6 @@ export type UpdateMetadataEvent = { attributeMetadata: Record; }; -export type NestedNode = { - id: Id; - name: string; - attributes: Record; - children: NestedNode[]; - bounds: Bounds; - tags: Tag[]; - activeChildIdx?: number; -}; - export type UINode = { id: Id; parent?: Id; @@ -246,7 +173,6 @@ export type SnapshotInfo = {nodeId: Id; data: Snapshot}; export type Id = number | string; export type MetadataId = number; -export type TreeState = {expandedNodes: Id[]}; export type Tag = | 'Native' @@ -338,20 +264,3 @@ export type InspectableUnknown = { type: 'unknown'; value: string; }; - -export interface StreamInterceptor { - transformNodes( - nodes: Map, - ): Promise<[Map, Metadata[]]>; - - transformMetadata(metadata: Metadata): Promise; -} - -export class StreamInterceptorError extends Error { - title: string; - - constructor(title: string, message: string) { - super(message); - this.title = title; - } -} diff --git a/desktop/plugins/public/ui-debugger/DesktopTypes.tsx b/desktop/plugins/public/ui-debugger/DesktopTypes.tsx new file mode 100644 index 000000000..4cab00c6e --- /dev/null +++ b/desktop/plugins/public/ui-debugger/DesktopTypes.tsx @@ -0,0 +1,107 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @format + */ + +import {Atom} from 'flipper-plugin'; +import { + Id, + FrameworkEventType, + Inspectable, + Bounds, + Tag, + UINode, + Metadata, +} from './ClientTypes'; + +export type UIState = { + viewMode: Atom; + isConnected: Atom; + isPaused: Atom; + streamState: Atom; + searchTerm: Atom; + isContextMenuOpen: Atom; + hoveredNodes: Atom; + selectedNode: Atom; + highlightedNodes: Atom>; + focusedNode: Atom; + expandedNodes: Atom>; + visualiserWidth: Atom; + frameworkEventMonitoring: Atom>; + filterMainThreadMonitoring: Atom; +}; + +export type StreamFlowState = {paused: boolean}; + +export type NestedNode = { + id: Id; + name: string; + attributes: Record; + children: NestedNode[]; + bounds: Bounds; + tags: Tag[]; + activeChildIdx?: number; +}; + +export type ViewMode = + | {mode: 'default'} + | {mode: 'frameworkEventsTable'; treeRootId: Id}; + +export type NodeSelection = { + id: Id; + source: SelectionSource; +}; + +export type OnSelectNode = ( + node: Id | undefined, + source: SelectionSource, +) => void; + +export type UIActions = { + onHoverNode: (node?: Id) => void; + onFocusNode: (focused?: Id) => void; + onContextMenuOpen: (open: boolean) => void; + onSelectNode: OnSelectNode; + onExpandNode: (node: Id) => void; + onCollapseNode: (node: Id) => void; + setVisualiserWidth: (width: number) => void; + onSetFilterMainThreadMonitoring: (toggled: boolean) => void; + onSetViewMode: (viewMode: ViewMode) => void; +}; + +export type SelectionSource = 'visualiser' | 'tree' | 'keyboard'; + +export type StreamState = + | {state: 'Ok'} + | {state: 'RetryingAfterError'} + | { + state: 'StreamInterceptorRetryableError'; + error: StreamInterceptorError; + retryCallback: () => Promise; + } + | { + state: 'FatalError'; + error: Error; + clearCallBack: () => Promise; + }; + +export interface StreamInterceptor { + transformNodes( + nodes: Map, + ): Promise<[Map, Metadata[]]>; + + transformMetadata(metadata: Metadata): Promise; +} + +export class StreamInterceptorError extends Error { + title: string; + + constructor(title: string, message: string) { + super(message); + this.title = title; + } +} diff --git a/desktop/plugins/public/ui-debugger/components/Controls.tsx b/desktop/plugins/public/ui-debugger/components/Controls.tsx index 604089cb2..3a37664ca 100644 --- a/desktop/plugins/public/ui-debugger/components/Controls.tsx +++ b/desktop/plugins/public/ui-debugger/components/Controls.tsx @@ -26,7 +26,7 @@ import { SearchOutlined, } from '@ant-design/icons'; import {usePlugin, useValue, Layout} from 'flipper-plugin'; -import {FrameworkEventType} from '../types'; +import {FrameworkEventType} from '../ClientTypes'; import {tracker} from '../utils/tracker'; import {debounce} from 'lodash'; diff --git a/desktop/plugins/public/ui-debugger/components/FrameworkEventsTable.tsx b/desktop/plugins/public/ui-debugger/components/FrameworkEventsTable.tsx index 93d74aae5..746cbd606 100644 --- a/desktop/plugins/public/ui-debugger/components/FrameworkEventsTable.tsx +++ b/desktop/plugins/public/ui-debugger/components/FrameworkEventsTable.tsx @@ -16,7 +16,7 @@ import { usePlugin, } from 'flipper-plugin'; import React, {useEffect, useRef} from 'react'; -import {FrameworkEvent, Id} from '../types'; +import {FrameworkEvent, Id} from '../ClientTypes'; import {plugin} from '../index'; import {Button, Tooltip} from 'antd'; diff --git a/desktop/plugins/public/ui-debugger/components/PerfStats.tsx b/desktop/plugins/public/ui-debugger/components/PerfStats.tsx index 6a2166e41..f6f892f6d 100644 --- a/desktop/plugins/public/ui-debugger/components/PerfStats.tsx +++ b/desktop/plugins/public/ui-debugger/components/PerfStats.tsx @@ -10,11 +10,11 @@ import { PerformanceStatsEvent, DynamicPerformanceStatsEvent, - UIState, Id, UINode, FrameworkEvent, -} from '../types'; +} from '../ClientTypes'; +import {UIState} from '../DesktopTypes'; import React, {useMemo} from 'react'; import { DataInspector, diff --git a/desktop/plugins/public/ui-debugger/components/Tree.tsx b/desktop/plugins/public/ui-debugger/components/Tree.tsx index d310911a0..5927de1a7 100644 --- a/desktop/plugins/public/ui-debugger/components/Tree.tsx +++ b/desktop/plugins/public/ui-debugger/components/Tree.tsx @@ -7,14 +7,8 @@ * @format */ -import { - FrameworkEvent, - FrameworkEventType, - Id, - OnSelectNode, - UINode, - ViewMode, -} from '../types'; +import {FrameworkEvent, FrameworkEventType, Id, UINode} from '../ClientTypes'; +import {OnSelectNode, ViewMode} from '../DesktopTypes'; import React, { ReactNode, Ref, diff --git a/desktop/plugins/public/ui-debugger/components/Visualization2D.tsx b/desktop/plugins/public/ui-debugger/components/Visualization2D.tsx index 95d403051..a7e87a52d 100644 --- a/desktop/plugins/public/ui-debugger/components/Visualization2D.tsx +++ b/desktop/plugins/public/ui-debugger/components/Visualization2D.tsx @@ -8,14 +8,8 @@ */ import React, {useEffect, useMemo, useRef} from 'react'; -import { - Bounds, - Coordinate, - Id, - NestedNode, - OnSelectNode, - UINode, -} from '../types'; +import {Bounds, Coordinate, Id, UINode} from '../ClientTypes'; +import {NestedNode, OnSelectNode} from '../DesktopTypes'; import {produce, styled, theme, usePlugin, useValue} from 'flipper-plugin'; import {plugin} from '../index'; diff --git a/desktop/plugins/public/ui-debugger/components/fb-stubs/IDEContextMenu.tsx b/desktop/plugins/public/ui-debugger/components/fb-stubs/IDEContextMenu.tsx index 9084e29c1..b465a02cf 100644 --- a/desktop/plugins/public/ui-debugger/components/fb-stubs/IDEContextMenu.tsx +++ b/desktop/plugins/public/ui-debugger/components/fb-stubs/IDEContextMenu.tsx @@ -9,7 +9,7 @@ import React from 'react'; -import {UINode} from '../../types'; +import {UINode} from '../../ClientTypes'; export async function prefetchSourceFileLocation(_: UINode) {} diff --git a/desktop/plugins/public/ui-debugger/components/main.tsx b/desktop/plugins/public/ui-debugger/components/main.tsx index 7800a72ab..cc4a64479 100644 --- a/desktop/plugins/public/ui-debugger/components/main.tsx +++ b/desktop/plugins/public/ui-debugger/components/main.tsx @@ -18,7 +18,7 @@ import { theme, } from 'flipper-plugin'; import {useHotkeys} from 'react-hotkeys-hook'; -import {Id, Metadata, MetadataId, UINode} from '../types'; +import {Id, Metadata, MetadataId, UINode} from '../ClientTypes'; import {PerfStats} from './PerfStats'; import {Visualization2D} from './Visualization2D'; import {Inspector} from './sidebar/Inspector'; diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/Inspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/Inspector.tsx index de02cae08..fccaf5796 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/Inspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/Inspector.tsx @@ -19,7 +19,7 @@ import { usePlugin, useValue, } from 'flipper-plugin'; -import {Id, Metadata, MetadataId, UINode} from '../../types'; +import {Id, Metadata, MetadataId, UINode} from '../../ClientTypes'; import {IdentityInspector} from './inspector/IdentityInspector'; import {AttributesInspector} from './inspector/AttributesInspector'; import {Tooltip} from 'antd'; diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/AttributesInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/AttributesInspector.tsx index af5e273eb..c9641d193 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/AttributesInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/AttributesInspector.tsx @@ -14,7 +14,7 @@ import { Metadata, MetadataId, UINode, -} from '../../../types'; +} from '../../../ClientTypes'; import {DataInspector, Panel, styled} from 'flipper-plugin'; import {Col, Row} from 'antd'; import {displayableName} from '../utilities/displayableName'; diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/BoundsInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/BoundsInspector.tsx index d45fd9066..65648efef 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/BoundsInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/BoundsInspector.tsx @@ -8,7 +8,7 @@ */ import React from 'react'; -import {Bounds} from '../../../types'; +import {Bounds} from '../../../ClientTypes'; import {InspectorStyle} from './Styles'; type Props = { diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/ColorInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/ColorInspector.tsx index 6bc67cd5a..3eef54560 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/ColorInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/ColorInspector.tsx @@ -9,7 +9,7 @@ import React from 'react'; import {Col, Popover, Row} from 'antd'; -import {Color} from '../../../types'; +import {Color} from '../../../ClientTypes'; import {SketchPicker, ColorResult} from 'react-color'; import {styled} from 'flipper-plugin'; import { diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/Coordinate3DInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/Coordinate3DInspector.tsx index 79f1beba9..0c401478b 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/Coordinate3DInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/Coordinate3DInspector.tsx @@ -8,7 +8,7 @@ */ import React from 'react'; -import {Coordinate3D} from '../../../types'; +import {Coordinate3D} from '../../../ClientTypes'; import {Col, Row} from 'antd'; import { CenteredContentStyle, diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/CoordinateInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/CoordinateInspector.tsx index 2315c42d8..f57e3b075 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/CoordinateInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/CoordinateInspector.tsx @@ -8,7 +8,7 @@ */ import React from 'react'; -import {Coordinate} from '../../../types'; +import {Coordinate} from '../../../ClientTypes'; import {Col, Row} from 'antd'; import { CenteredContentStyle, diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/DocumentationInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/DocumentationInspector.tsx index a5bf2ef5b..c828fa6be 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/DocumentationInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/DocumentationInspector.tsx @@ -8,7 +8,7 @@ */ import React from 'react'; -import {UINode} from '../../../types'; +import {UINode} from '../../../ClientTypes'; type Props = { node: UINode; diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/FrameworkEventsInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/FrameworkEventsInspector.tsx index ff89f2136..355ed8a46 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/FrameworkEventsInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/FrameworkEventsInspector.tsx @@ -9,7 +9,7 @@ import {Button} from 'antd'; import {theme, TimelineDataDescription} from 'flipper-plugin'; -import {FrameworkEvent, UINode} from '../../../types'; +import {FrameworkEvent, UINode} from '../../../ClientTypes'; import React, {ReactNode, useState} from 'react'; import {StackTraceInspector} from './StackTraceInspector'; diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/IdentityInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/IdentityInspector.tsx index d6765a194..e4fbed8d2 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/IdentityInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/IdentityInspector.tsx @@ -9,7 +9,7 @@ import React from 'react'; import {Col, Row} from 'antd'; -import {UINode} from '../../../types'; +import {UINode} from '../../../ClientTypes'; import {styled, theme} from 'flipper-plugin'; import {CodeInspector} from './fb-stubs/CodeInspector'; import {TopSpacedContainerStyle} from './Styles'; diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/SizeInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/SizeInspector.tsx index 123266651..b83b55e5f 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/SizeInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/SizeInspector.tsx @@ -8,7 +8,7 @@ */ import React from 'react'; -import {Size} from '../../../types'; +import {Size} from '../../../ClientTypes'; import {Col, Row} from 'antd'; import { CenteredContentStyle, diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/SpaceBoxInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/SpaceBoxInspector.tsx index 285ed2c96..70dea0714 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/SpaceBoxInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/SpaceBoxInspector.tsx @@ -8,7 +8,7 @@ */ import React from 'react'; -import {SpaceBox} from '../../../types'; +import {SpaceBox} from '../../../ClientTypes'; import {InspectorStyle} from './Styles'; type Props = { diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/StackTraceInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/StackTraceInspector.tsx index ccc07a473..12260cc19 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/StackTraceInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/StackTraceInspector.tsx @@ -10,7 +10,7 @@ import React from 'react'; // eslint-disable-next-line rulesdir/no-restricted-imports-clone import {StackTrace} from 'flipper'; -import {Tag} from '../../../types'; +import {Tag} from '../../../ClientTypes'; const FacebookLibraries = ['Facebook']; const CKFilter = ['UIDCKAnalyticsListener']; diff --git a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/fb-stubs/CodeInspector.tsx b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/fb-stubs/CodeInspector.tsx index f0772d85c..2b9b6a3b5 100644 --- a/desktop/plugins/public/ui-debugger/components/sidebar/inspector/fb-stubs/CodeInspector.tsx +++ b/desktop/plugins/public/ui-debugger/components/sidebar/inspector/fb-stubs/CodeInspector.tsx @@ -8,7 +8,7 @@ */ import React from 'react'; -import {Tag} from '../../../../types'; +import {Tag} from '../../../../ClientTypes'; type CodeInspectorProps = { name: string; diff --git a/desktop/plugins/public/ui-debugger/fb-stubs/StreamInterceptor.tsx b/desktop/plugins/public/ui-debugger/fb-stubs/StreamInterceptor.tsx index fbc5ea82b..cfb927542 100644 --- a/desktop/plugins/public/ui-debugger/fb-stubs/StreamInterceptor.tsx +++ b/desktop/plugins/public/ui-debugger/fb-stubs/StreamInterceptor.tsx @@ -8,7 +8,8 @@ */ import {DeviceOS} from 'flipper-plugin'; -import {Id, Metadata, StreamInterceptor, UINode} from '../types'; +import {Id, Metadata, UINode} from '../ClientTypes'; +import {StreamInterceptor} from '../DesktopTypes'; export function getStreamInterceptor(_: DeviceOS): StreamInterceptor { return new NoOpStreamInterceptor(); diff --git a/desktop/plugins/public/ui-debugger/hooks/useDelay.tsx b/desktop/plugins/public/ui-debugger/hooks/useDelay.tsx index 81dda2aa9..73216cc91 100644 --- a/desktop/plugins/public/ui-debugger/hooks/useDelay.tsx +++ b/desktop/plugins/public/ui-debugger/hooks/useDelay.tsx @@ -7,7 +7,6 @@ * @format */ -import {Atom} from 'flipper-plugin'; import {useEffect, useRef, useState} from 'react'; export function useDelay(delayTimeMs: number) { diff --git a/desktop/plugins/public/ui-debugger/index.tsx b/desktop/plugins/public/ui-debugger/index.tsx index 7b418f6d4..fe6ba899e 100644 --- a/desktop/plugins/public/ui-debugger/index.tsx +++ b/desktop/plugins/public/ui-debugger/index.tsx @@ -22,17 +22,19 @@ import { Id, Metadata, MetadataId, - NodeSelection, PerformanceStatsEvent, - SelectionSource, SnapshotInfo, + UINode, +} from './ClientTypes'; +import { + UIState, + NodeSelection, + SelectionSource, StreamInterceptorError, StreamState, UIActions, - UINode, - UIState, ViewMode, -} from './types'; +} from './DesktopTypes'; import {Draft} from 'immer'; import {tracker} from './utils/tracker'; import {getStreamInterceptor} from './fb-stubs/StreamInterceptor'; @@ -531,4 +533,4 @@ function collapseinActiveChildren(node: UINode, expandedNodes: Draft>) { const HighlightTime = 300; export {Component} from './components/main'; -export * from './types'; +export * from './ClientTypes'; diff --git a/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx b/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx index 5340a898b..d9170ebc2 100644 --- a/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx +++ b/desktop/plugins/public/ui-debugger/utils/dataTransform.tsx @@ -7,7 +7,12 @@ * @format */ -import {Inspectable, InspectableObject, Metadata, MetadataId} from '../types'; +import { + Inspectable, + InspectableObject, + Metadata, + MetadataId, +} from '../ClientTypes'; function transformAny( metadata: Map, diff --git a/desktop/plugins/public/ui-debugger/utils/tracker.tsx b/desktop/plugins/public/ui-debugger/utils/tracker.tsx index 36c6e125b..73d71fc62 100644 --- a/desktop/plugins/public/ui-debugger/utils/tracker.tsx +++ b/desktop/plugins/public/ui-debugger/utils/tracker.tsx @@ -8,8 +8,9 @@ */ import {getFlipperLib} from 'flipper-plugin'; -import {SelectionSource} from '..'; -import {FrameworkEventType, Tag} from '../types'; + +import {FrameworkEventType, Tag} from '../ClientTypes'; +import {SelectionSource} from '../DesktopTypes'; const UI_DEBUGGER_IDENTIFIER = 'ui-debugger';