* [ios] fix element cssstyle selected bug

alibaba · Jun 27, 2016 · 41450a9 · 41450a9
1 parent e079e5c
commit 41450a9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Debug/inspector/PonyDebugger/PDCSSDomainController.m b/ios/sdk/WeexSDK/Sources/Debug/inspector/PonyDebugger/PDCSSDomainController.m
@@ -73,9 +73,12 @@ - (void)domain:(PDCSSDomain *)domain getMatchedStylesForNodeWithNodeId:(NSNumber
     PDDOMNode *rootDomNode = [PDDOMDomainController defaultInstance].rootDomNode;
     PDDOMNode *node = [self p_getNodeFromNodeId:nodeId rootNode:rootDomNode];
     if (!node) {
-        NSLog(@"breakpoint error");
-        callback(nil,pseudoElements,inherited,nil);
-        return;
+        rootDomNode = [PDDOMDomainController defaultInstance].rootNode;
+        node = [self p_getNodeFromNodeId:nodeId rootNode:rootDomNode];
+        if (!node) {
+            callback(nil,pseudoElements,inherited,nil);
+            return;
+        }
     }
     PDCSSSelectorListData *selectorData = [[PDCSSSelectorListData alloc] init];
     selectorData.text = node.nodeName;

diff --git a/ios/sdk/WeexSDK/Sources/Debug/inspector/PonyDebugger/PDDOMDomainController.h b/ios/sdk/WeexSDK/Sources/Debug/inspector/PonyDebugger/PDDOMDomainController.h
@@ -32,4 +32,6 @@
 - (void)removeView:(UIView *)view;
 - (void)addView:(UIView *)view;
 
+- (PDDOMNode *)rootNode;
+
 @end
diff --git a/ios/sdk/WeexSDK/Sources/Debug/inspector/PonyDebugger/PDDOMDomainController.m b/ios/sdk/WeexSDK/Sources/Debug/inspector/PonyDebugger/PDDOMDomainController.m
@@ -172,7 +172,7 @@ - (void)domain:(PDDOMDomain *)domain getDocumentWithCallback:(void (^)(PDDOMNode
 {
     self.objectsForNodeIds = [[NSMutableDictionary alloc] init];
     self.nodeIdsForObjects = [[NSMutableDictionary alloc] init];
-    self.nodeIdCounter = 0;
+    self.nodeIdCounter = 2;
     callback([self rootNode], nil);
 }
 
@@ -623,7 +623,7 @@ - (NSNumber *)getAndIncrementNodeIdCount;
 - (PDDOMNode *)rootNode;
 {
     PDDOMNode *rootNode = [[PDDOMNode alloc] init];
-    rootNode.nodeId = [self getAndIncrementNodeIdCount];
+    rootNode.nodeId = [NSNumber numberWithInt:0];//[self getAndIncrementNodeIdCount];
     rootNode.nodeType = @(kPDDOMNodeTypeDocument);
     rootNode.nodeName = @"#document";
     rootNode.children = @[ [self rootElement] ];
@@ -634,7 +634,7 @@ - (PDDOMNode *)rootNode;
 - (PDDOMNode *)rootElement;
 {
     PDDOMNode *rootElement = [[PDDOMNode alloc] init];
-    rootElement.nodeId = [self getAndIncrementNodeIdCount];
+    rootElement.nodeId = [NSNumber numberWithInt:1];//[self getAndIncrementNodeIdCount];
     rootElement.nodeType = @(kPDDOMNodeTypeElement);
     rootElement.nodeName = @"iosml";
     rootElement.children = [self windowNodes];
@@ -694,7 +694,12 @@ - (PDDOMNode *)elementNodeForObject:(id)object withChildNodes:(NSArray *)childre
 
     elementNode.children = children;
     elementNode.childNodeCount = @([elementNode.children count]);
-    elementNode.nodeId = [self getAndIncrementNodeIdCount];
+    NSNumber *nodeId = [self.nodeIdsForObjects objectForKey:[NSValue valueWithNonretainedObject:object]];
+    if (nodeId) {
+        elementNode.nodeId = nodeId;
+    }else {
+        elementNode.nodeId = [self getAndIncrementNodeIdCount];
+    }
     elementNode.attributes = [self attributesArrayForObject:object];
 
     return elementNode;
@@ -902,4 +907,5 @@ - (void)pd_swizzled_exchangeSubviewAtIndex:(NSInteger)index1 withSubviewAtIndex:
     }
 }
 
+
 @end