diff --git a/desktop/flipper-plugin/src/index.tsx b/desktop/flipper-plugin/src/index.tsx
index 7b6e0ce6a..4935c88f8 100644
--- a/desktop/flipper-plugin/src/index.tsx
+++ b/desktop/flipper-plugin/src/index.tsx
@@ -38,9 +38,8 @@ export {Sidebar as _Sidebar} from './ui/Sidebar';
export {DetailSidebar} from './ui/DetailSidebar';
export {Toolbar} from './ui/Toolbar';
-export {MasterDetail} from './ui/MasterDetail';
+export {MasterDetailWithPowerSearch as MasterDetail} from './ui/MasterDetailWithPowerSearch';
export {MasterDetail as MasterDetailLegacy} from './ui/MasterDetail';
-export {MasterDetailWithPowerSearch as _MasterDetailWithPowerSearch} from './ui/MasterDetailWithPowerSearch';
export {CodeBlock} from './ui/CodeBlock';
export {renderReactRoot, _PortalsManager} from './utils/renderReactRoot';
@@ -59,19 +58,17 @@ export {DataFormatter} from './ui/DataFormatter';
export {useLogger, _LoggerContext} from './utils/useLogger';
-export {DataTable, DataTableColumn} from './ui/data-table/DataTable';
+export {
+ DataTable,
+ DataTableColumn,
+} from './ui/data-table/DataTableWithPowerSearch';
export {
DataTable as DataTableLegacy,
DataTableColumn as DataTableColumnLegacy,
} from './ui/data-table/DataTable';
-export {DataTableManager} from './ui/data-table/DataTableManager';
+export {DataTableManager} from './ui/data-table/DataTableWithPowerSearchManager';
export {DataTableManager as DataTableManagerLegacy} from './ui/data-table/DataTableManager';
-export {
- DataTable as _DataTableWithPowerSearch,
- DataTableColumn as _DataTableColumnWithPowerSearch,
-} from './ui/data-table/DataTableWithPowerSearch';
export {dataTablePowerSearchOperators} from './ui/data-table/DataTableDefaultPowerSearchOperators';
-export {DataTableManager as _DataTableWithPowerSearchManager} from './ui/data-table/DataTableWithPowerSearchManager';
export {DataList} from './ui/DataList';
export {Spinner} from './ui/Spinner';
export * from './ui/PowerSearch';
diff --git a/desktop/flipper-ui-core/src/chrome/__tests__/flipper_messages.node.tsx b/desktop/flipper-ui-core/src/chrome/__tests__/flipper_messages.node.tsx
index c29eb592c..d10ccab3b 100644
--- a/desktop/flipper-ui-core/src/chrome/__tests__/flipper_messages.node.tsx
+++ b/desktop/flipper-ui-core/src/chrome/__tests__/flipper_messages.node.tsx
@@ -121,82 +121,49 @@ test('It can render rows', async () => {
(await renderer.findByText('unique-string')).parentElement?.parentElement,
).toMatchInlineSnapshot(`
-
-
+
00:00:00.000
-
-
-
-
-
+
+
Android Phone
-
-
-
-
-
+
+
FB4A
-
-
-
-
-
+
+
unique-string
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
toClient:send
-
+
`);
diff --git a/desktop/flipper-ui-core/src/dispatcher/plugins.tsx b/desktop/flipper-ui-core/src/dispatcher/plugins.tsx
index 49364b099..63597fca8 100644
--- a/desktop/flipper-ui-core/src/dispatcher/plugins.tsx
+++ b/desktop/flipper-ui-core/src/dispatcher/plugins.tsx
@@ -105,11 +105,11 @@ class UIPluginInitializer extends AbstractPluginInitializer {
let uiPluginInitializer: UIPluginInitializer;
export default async (store: Store, _logger: Logger) => {
let FlipperPlugin = FlipperPluginSDK;
- if (getRenderHostInstance().GK('flipper_power_search')) {
+ if (!getRenderHostInstance().GK('flipper_power_search')) {
FlipperPlugin = {
...FlipperPlugin,
- MasterDetail: FlipperPlugin._MasterDetailWithPowerSearch as any,
- DataTable: FlipperPlugin._DataTableWithPowerSearch as any,
+ MasterDetail: FlipperPlugin.MasterDetailLegacy as any,
+ DataTable: FlipperPlugin.DataTableLegacy as any,
};
}
diff --git a/desktop/plugins/public/logs/index.tsx b/desktop/plugins/public/logs/index.tsx
index e865a884e..5d0e6de10 100644
--- a/desktop/plugins/public/logs/index.tsx
+++ b/desktop/plugins/public/logs/index.tsx
@@ -13,10 +13,10 @@ import {
usePlugin,
createDataSource,
dataTablePowerSearchOperators,
- _DataTableColumnWithPowerSearch,
- _DataTableWithPowerSearch,
+ DataTableColumn,
+ DataTable,
theme,
- _DataTableWithPowerSearchManager,
+ DataTableManager,
createState,
useValue,
DataFormatter,
@@ -48,7 +48,7 @@ const logLevelEnumLabels = Object.entries(logTypes).reduce(
function createColumnConfig(
_os: 'iOS' | 'Android' | 'Metro',
-): _DataTableColumnWithPowerSearch[] {
+): DataTableColumn[] {
return [
{
key: 'type',
@@ -153,7 +153,7 @@ export function devicePlugin(client: DevicePluginClient) {
});
const isPaused = createState(true);
const tableManagerRef = createRef<
- undefined | _DataTableWithPowerSearchManager
+ undefined | DataTableManager
>();
client.onDeepLink((payload: unknown) => {
@@ -264,7 +264,7 @@ export function Component() {
const plugin = usePlugin(devicePlugin);
const paused = useValue(plugin.isPaused);
return (
- <_DataTableWithPowerSearch
+
dataSource={plugin.rows}
columns={plugin.columns}
enableAutoScroll
diff --git a/desktop/plugins/public/network/index.tsx b/desktop/plugins/public/network/index.tsx
index 023647e3a..1b364a8c2 100644
--- a/desktop/plugins/public/network/index.tsx
+++ b/desktop/plugins/public/network/index.tsx
@@ -28,9 +28,9 @@ import {
usePlugin,
useValue,
createDataSource,
- _DataTableWithPowerSearch as DataTable,
- _DataTableColumnWithPowerSearch as DataTableColumn,
- _DataTableWithPowerSearchManager as DataTableManager,
+ DataTable,
+ DataTableColumn,
+ DataTableManager,
theme,
renderReactRoot,
batch,
diff --git a/desktop/plugins/public/network/request-mocking/NetworkRouteManager.tsx b/desktop/plugins/public/network/request-mocking/NetworkRouteManager.tsx
index ab3163bf8..9322d0bc8 100644
--- a/desktop/plugins/public/network/request-mocking/NetworkRouteManager.tsx
+++ b/desktop/plugins/public/network/request-mocking/NetworkRouteManager.tsx
@@ -7,11 +7,7 @@
* @format
*/
-import {
- Atom,
- _DataTableWithPowerSearchManager as DataTableManager,
- getFlipperLib,
-} from 'flipper-plugin';
+import {Atom, DataTableManager, getFlipperLib} from 'flipper-plugin';
import {createContext} from 'react';
import {Header, Request} from '../types';
diff --git a/desktop/plugins/public/ui-debugger/components/FrameworkEventsTable.tsx b/desktop/plugins/public/ui-debugger/components/FrameworkEventsTable.tsx
index fa05a353b..3eb3cf0e6 100644
--- a/desktop/plugins/public/ui-debugger/components/FrameworkEventsTable.tsx
+++ b/desktop/plugins/public/ui-debugger/components/FrameworkEventsTable.tsx
@@ -9,12 +9,11 @@
import {DeleteOutlined, PartitionOutlined} from '@ant-design/icons';
import {
- _DataTableWithPowerSearch as DataTable,
+ DataTable,
DataTableColumn,
DetailSidebar,
Layout,
- _DataTableColumnWithPowerSearch,
- _DataTableWithPowerSearchManager,
+ DataTableManager,
dataTablePowerSearchOperators,
usePlugin,
useValue,
@@ -44,10 +43,9 @@ export function FrameworkEventsTable({
const focusedNode = useValue(instance.uiState.focusedNode);
- const managerRef =
- useRef<_DataTableWithPowerSearchManager | null>(
- null,
- );
+ const managerRef = useRef | null>(
+ null,
+ );
useEffect(() => {
tracker.track('framework-event-table-opened', {});
@@ -175,74 +173,73 @@ const inferredEnum = [
dataTablePowerSearchOperators.enum_is_not({}),
];
-const staticColumns: _DataTableColumnWithPowerSearch[] =
- [
- {
- key: 'timestamp',
- sortable: true,
- onRender: (row: FrameworkEvent) => formatTimestampMillis(row.timestamp),
- title: 'Timestamp',
- formatters: MonoSpace,
+const staticColumns: DataTableColumn[] = [
+ {
+ key: 'timestamp',
+ sortable: true,
+ onRender: (row: FrameworkEvent) => formatTimestampMillis(row.timestamp),
+ title: 'Timestamp',
+ formatters: MonoSpace,
- powerSearchConfig: [
- dataTablePowerSearchOperators.newer_than_absolute_date(),
- dataTablePowerSearchOperators.older_than_absolute_date(),
- ],
+ powerSearchConfig: [
+ dataTablePowerSearchOperators.newer_than_absolute_date(),
+ dataTablePowerSearchOperators.older_than_absolute_date(),
+ ],
+ },
+ {
+ key: 'type',
+ title: 'Event type',
+ onRender: (row: FrameworkEvent) => eventTypeToName(row.type),
+ powerSearchConfig: {
+ inferEnumOptionsFromData: true,
+ operators: inferredEnum,
},
- {
- key: 'type',
- title: 'Event type',
- onRender: (row: FrameworkEvent) => eventTypeToName(row.type),
- powerSearchConfig: {
- inferEnumOptionsFromData: true,
- operators: inferredEnum,
- },
- },
- {
- key: 'duration',
- title: 'Duration (Nanos)',
- onRender: (row: FrameworkEvent) =>
- row.duration != null ? formatDuration(row.duration) : null,
- formatters: MonoSpace,
+ },
+ {
+ key: 'duration',
+ title: 'Duration (Nanos)',
+ onRender: (row: FrameworkEvent) =>
+ row.duration != null ? formatDuration(row.duration) : null,
+ formatters: MonoSpace,
- powerSearchConfig: [
- dataTablePowerSearchOperators.int_greater_or_equal(),
- dataTablePowerSearchOperators.int_greater_than(),
- dataTablePowerSearchOperators.int_equals(),
- dataTablePowerSearchOperators.int_less_or_equal(),
- dataTablePowerSearchOperators.int_less_than(),
- ],
- },
- {
- key: 'treeId',
- title: 'TreeId',
- powerSearchConfig: idConfig,
+ powerSearchConfig: [
+ dataTablePowerSearchOperators.int_greater_or_equal(),
+ dataTablePowerSearchOperators.int_greater_than(),
+ dataTablePowerSearchOperators.int_equals(),
+ dataTablePowerSearchOperators.int_less_or_equal(),
+ dataTablePowerSearchOperators.int_less_than(),
+ ],
+ },
+ {
+ key: 'treeId',
+ title: 'TreeId',
+ powerSearchConfig: idConfig,
- formatters: MonoSpace,
- },
- {
- key: 'rootComponentName',
- title: 'Root component name',
- powerSearchConfig: stringConfig,
- formatters: MonoSpace,
- },
- {
- key: 'nodeId',
- title: 'Component ID',
- powerSearchConfig: idConfig,
- formatters: MonoSpace,
- },
- {
- key: 'nodeName',
- title: 'Component name',
- powerSearchConfig: stringConfig,
- formatters: MonoSpace,
- },
- {
- key: 'thread',
- title: 'Thread',
- onRender: (row: FrameworkEvent) => startCase(row.thread),
- powerSearchConfig: stringConfig,
- formatters: MonoSpace,
- },
- ];
+ formatters: MonoSpace,
+ },
+ {
+ key: 'rootComponentName',
+ title: 'Root component name',
+ powerSearchConfig: stringConfig,
+ formatters: MonoSpace,
+ },
+ {
+ key: 'nodeId',
+ title: 'Component ID',
+ powerSearchConfig: idConfig,
+ formatters: MonoSpace,
+ },
+ {
+ key: 'nodeName',
+ title: 'Component name',
+ powerSearchConfig: stringConfig,
+ formatters: MonoSpace,
+ },
+ {
+ key: 'thread',
+ title: 'Thread',
+ onRender: (row: FrameworkEvent) => startCase(row.thread),
+ powerSearchConfig: stringConfig,
+ formatters: MonoSpace,
+ },
+];