From 939ed27aad767723eb99803a414812a60d4b52f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Wielg=C3=B3rski?= Date: Mon, 17 Aug 2020 10:18:07 -0700 Subject: [PATCH] Detect if given Component is LithoComponent Summary: Useful for next diffs: enables to detect whether we have LithoComponent or CKComponent Reviewed By: adityasharat Differential Revision: D23128972 fbshipit-source-id: b9aef358c1426df4f05213c42e43402e8cae984f --- .../flipper/plugins/litho/DebugComponentDescriptor.java | 7 ++++++- .../flipper/plugins/litho/DebugSectionDescriptor.java | 8 +++++++- desktop/app/src/index.tsx | 1 + .../components/elements-inspector/ElementsInspector.tsx | 9 ++++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java index 90ffbf0a0..6399b17c2 100644 --- a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java +++ b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java @@ -332,7 +332,12 @@ public class DebugComponentDescriptor extends NodeDescriptor { // doesn't add linked node descriptor } } - extraInfo.put("className", node.getComponent().getClass().getName()); + final FlipperObject.Builder metaData = new FlipperObject.Builder(); + metaData.put("className", node.getComponent().getClass().getName()); + metaData.put("framework", "LITHO"); + + extraInfo.put("metaData", metaData); + return extraInfo.build(); } diff --git a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java index b4d9b6219..168514f45 100644 --- a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java +++ b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java @@ -110,7 +110,13 @@ public class DebugSectionDescriptor extends NodeDescriptor { @Override public FlipperObject getExtraInfo(DebugSection node) { FlipperObject.Builder extraInfo = new FlipperObject.Builder(); - extraInfo.put("className", node.getSection().getClass().getName()); + + final FlipperObject.Builder metaData = new FlipperObject.Builder(); + metaData.put("className", node.getSection().getClass().getName()); + metaData.put("framework", "LITHO"); + + extraInfo.put("metaData", metaData); + return extraInfo.build(); } diff --git a/desktop/app/src/index.tsx b/desktop/app/src/index.tsx index c263d657c..61c1eb2c6 100644 --- a/desktop/app/src/index.tsx +++ b/desktop/app/src/index.tsx @@ -171,6 +171,7 @@ export {default as SearchableTable_immutable} from './ui/components/searchable/S export { ElementID, ElementData, + ElementFramework, ElementAttribute, Element, ElementSearchResultSet, diff --git a/desktop/app/src/ui/components/elements-inspector/ElementsInspector.tsx b/desktop/app/src/ui/components/elements-inspector/ElementsInspector.tsx index 03c61a141..92474ae1c 100644 --- a/desktop/app/src/ui/components/elements-inspector/ElementsInspector.tsx +++ b/desktop/app/src/ui/components/elements-inspector/ElementsInspector.tsx @@ -32,6 +32,11 @@ export type ElementData = { }; }; +export enum ElementFramework { + 'LITHO', + 'CK', +} + export type ElementAttribute = { name: string; value: string; @@ -41,7 +46,9 @@ export type ElementExtraInfo = { linkedNode?: string; // id of linked node in opposite tree expandWithParent?: boolean; linkedTree?: string; - className?: string; + metaData?: { + [key: string]: any; + }; }; export type Element = {