Live-editing: root set at edit time

Summary: Otherwise it may be null. Reason the application is also set inside the context when the plugin connects. Instead of just doing something similar, just set it when editing values. Reviewed By: LukeDefeo Differential Revision: D53312024 fbshipit-source-id: a4a98b938f36a6d5e19bcc40ed22d68fc5e563b7
facebook · Feb 2, 2024 · 35bcc75 · 35bcc75
1 parent a055857
commit 35bcc75
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/iOS/Plugins/FlipperKitUIDebuggerPlugin/FlipperKitUIDebuggerPlugin/Core/UIDAttributeEditor.h b/iOS/Plugins/FlipperKitUIDebuggerPlugin/FlipperKitUIDebuggerPlugin/Core/UIDAttributeEditor.h
@@ -33,14 +33,14 @@ typedef void (^ReportAttributeEditorResult)(NSError* _Nullable);
 @class UIDDescriptorRegister;
 @interface UIDAttributeEditor : NSObject
 
-+ (instancetype)attributeEditorForApplication:(UIApplication*)application
-                       withDescriptorRegister:
-                           (UIDDescriptorRegister*)descriptorRegister;
++ (instancetype)attributeEditorWithDescriptorRegister:
+    (UIDDescriptorRegister*)descriptorRegister;
 
 - (void)editNodeWithId:(NSNumber*)nodeId
                   value:(id)value
     metadataIdentifiers:(NSArray<UIDMetadataId>*)metadataIdentifiers
        compoundTypeHint:(UIDCompoundTypeHint)compoundTypeHint
+                   root:(id _Nullable)root
            reportResult:(ReportAttributeEditorResult)reportResult;
 
 @end

diff --git a/iOS/Plugins/FlipperKitUIDebuggerPlugin/FlipperKitUIDebuggerPlugin/Core/UIDAttributeEditor.m b/iOS/Plugins/FlipperKitUIDebuggerPlugin/FlipperKitUIDebuggerPlugin/Core/UIDAttributeEditor.m
@@ -67,36 +67,33 @@ + (NSDictionary*)UID_errorPayloadWithError:(NSError*)error {
 @end
 
 @interface UIDAttributeEditor () {
-  __weak UIApplication* _application;
   __weak UIDDescriptorRegister* _descriptorRegister;
 }
 
 @end
 
 @implementation UIDAttributeEditor
 
-- (id)initWithApplication:(UIApplication*)application
-    withDescriptorRegister:(UIDDescriptorRegister*)descriptorRegister {
+- (id)initWithDescriptorRegister:(UIDDescriptorRegister*)descriptorRegister {
   self = [super init];
   if (self) {
-    _application = application;
     _descriptorRegister = descriptorRegister;
   }
 
   return self;
 }
 
-+ (instancetype)attributeEditorForApplication:(UIApplication*)application
-                       withDescriptorRegister:
-                           (UIDDescriptorRegister*)descriptorRegister {
-  return [[UIDAttributeEditor alloc] initWithApplication:application
-                                  withDescriptorRegister:descriptorRegister];
++ (instancetype)attributeEditorWithDescriptorRegister:
+    (UIDDescriptorRegister*)descriptorRegister {
+  return [[UIDAttributeEditor alloc]
+      initWithDescriptorRegister:descriptorRegister];
 }
 
 - (void)editNodeWithId:(NSNumber*)nodeId
                   value:(id)value
     metadataIdentifiers:(NSArray<UIDMetadataId>*)metadataIdentifiers
        compoundTypeHint:(UIDCompoundTypeHint)compoundTypeHint
+                   root:(id)root
            reportResult:(ReportAttributeEditorResult)reportResult {
   UIDHierarchyTraversal* const traversal =
       [UIDHierarchyTraversal createWithDescriptorRegister:_descriptorRegister];
@@ -110,7 +107,7 @@ - (void)editNodeWithId:(NSNumber*)nodeId
     }
 
     id<NSObject> node = [traversal findWithId:[nodeId unsignedIntegerValue]
-                          inHierarchyWithRoot:editor->_application];
+                          inHierarchyWithRoot:root];
     if (!node) {
       reportResult(
           [NSError UID_errorWithType:AttributeEditorErrorTypeNodeNotFound]);

diff --git a/iOS/Plugins/FlipperKitUIDebuggerPlugin/FlipperKitUIDebuggerPlugin/Core/UIDContext.mm b/iOS/Plugins/FlipperKitUIDebuggerPlugin/FlipperKitUIDebuggerPlugin/Core/UIDContext.mm
@@ -31,9 +31,8 @@ - (instancetype)initWithApplication:(UIApplication*)application
     _observerFactory = observerFactory;
     _connection = nil;
     _frameworkEventManager = [UIDSerialFrameworkEventManager new];
-    _attributeEditor =
-        [UIDAttributeEditor attributeEditorForApplication:application
-                                   withDescriptorRegister:descriptorRegister];
+    _attributeEditor = [UIDAttributeEditor
+        attributeEditorWithDescriptorRegister:descriptorRegister];
     _connectionListeners = [NSMutableSet new];
     _accessQueue =
         dispatch_queue_create("ui-debugger.context", DISPATCH_QUEUE_SERIAL);

diff --git a/...s/FlipperKitUIDebuggerPlugin/FlipperKitUIDebuggerPlugin/Observer/UIDTreeObserverManager.m b/...s/FlipperKitUIDebuggerPlugin/FlipperKitUIDebuggerPlugin/Observer/UIDTreeObserverManager.m
@@ -162,10 +162,12 @@ - (void)startWithContext:(UIDContext*)context {
             [responder error:[NSError UID_errorPayloadWithError:error]];
           }
         };
+        id root = strongSelf->_context.application;
         [strongSelf->_context.attributeEditor editNodeWithId:nodeId
                                                        value:value
                                          metadataIdentifiers:metadataIds
                                             compoundTypeHint:hint
+                                                        root:root
                                                 reportResult:reportResult];
       }];
 }