[WEEX-502][iOS] Weex Template List Support Animation & queryElement

ios/sdk/WeexSDK/Sources/Component/RecycleList/WXCellSlotComponent.h

@@ -26,8 +26,6 @@ static const NSString *WXDefaultRecycleTemplateType = @"default";
 @property (nonatomic, strong) NSString *templateCaseType;
 
 - (void)updateCellData:(NSDictionary *)data;
-
 - (void)triggerLayout;
 
-
 @end

ios/sdk/WeexSDK/Sources/Component/RecycleList/WXCellSlotComponent.mm

@@ -40,7 +40,7 @@ - (instancetype)initWithRef:(NSString *)ref
         if (attributes[@"default"]) {
             _templateCaseType = @"default";
         }
-        _templateCaseType = attributes[@"case"] ? [WXConvert NSString:attributes[@"case"]] :const_cast<NSString *>(WXDefaultRecycleTemplateType) ;
+        _templateCaseType = attributes[@"case"] ? [WXConvert NSString:attributes[@"case"]] :const_cast<NSString *>(WXDefaultRecycleTemplateType);
         _lazyCreateView = YES;
         _isNeedJoinLayoutSystem = NO;
     }
@@ -55,9 +55,9 @@ - (void)updateAttributes:(NSDictionary *)attributes
 
 - (void)updateCellData:(NSDictionary *)data
 {
-    WXAssertComponentThread();    
-
+    WXAssertComponentThread();
     [self updateBindingData:data];
+    [self _attachSlotEvent:data];
     [self triggerLayout];
 }
 
@@ -69,21 +69,16 @@ - (void)_didInserted
 - (void)triggerLayout
 {
     WXAssertComponentThread();
-
-        if (flexIsUndefined(self.flexCssNode->getStyleWidth())) {
-            self.flexCssNode->setStyleWidth(((WXScrollerComponent *)(self.supercomponent)).flexScrollerCSSNode->getStyleWidth(),NO);
-        }
-
-        if ([self needsLayout]) {
-            std::pair<float, float> renderPageSize;
-            renderPageSize.first = self.weexInstance.frame.size.width;
-            renderPageSize.second = self.weexInstance.frame.size.height;
-            self.flexCssNode->calculateLayout(renderPageSize);
-            if ([WXLog logLevel] >= WXLogLevelDebug) {
-
-            }
-        }
+    if (flexIsUndefined(self.flexCssNode->getStyleWidth())) {
+        self.flexCssNode->setStyleWidth(((WXScrollerComponent *)(self.supercomponent)).flexScrollerCSSNode->getStyleWidth(),NO);
+    }
 
+    if ([self needsLayout]) {
+        std::pair<float, float> renderPageSize;
+        renderPageSize.first = self.weexInstance.frame.size.width;
+        renderPageSize.second = self.weexInstance.frame.size.height;
+        self.flexCssNode->calculateLayout(renderPageSize);
+    }
     NSMutableSet<WXComponent *> *dirtyComponents = [NSMutableSet set];
     [self _calculateFrameWithSuperAbsolutePosition:CGPointZero gatherDirtyComponents:dirtyComponents];
     for (WXComponent *dirtyComponent in dirtyComponents) {
@@ -92,5 +87,4 @@ - (void)triggerLayout
         }];
     }
 }
-
 @end

ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.mm

@@ -89,44 +89,46 @@ - (void)updateBindingData:(NSDictionary *)data
         return;
     }
 
-    if (templateComponent->_bindingProps) {
-        __block NSMutableDictionary *newData = [NSMutableDictionary dictionary];
-        [templateComponent->_bindingProps enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, WXDataBindingBlock  _Nonnull block, BOOL * _Nonnull stop) {
-            BOOL needUpdate;
-            id value = block(data, &needUpdate);
-            if (value) {
-                newData[key] = value;
-            }
-        }];
-
-        if (self.attributes[@"@isComponentRoot"]) {
-            if (![recycleListComponent.dataManager virtualComponentDataWithIndexPath:indexPath]) {
-                static NSUInteger __componentId = 0;
-                self->_virtualComponentId = [NSString stringWithFormat:@"%@%lu", listRef, (unsigned long)__componentId % (2048*1024)];
-                __componentId++;
-                dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-                [[WXSDKManager bridgeMgr] callComponentHook:self.weexInstance.instanceId componentId:self.attributes[@"@templateId"] type:@"lifecycle" hook:@"create" args:@[self->_virtualComponentId, newData] competion:^(JSValue *value) {
-                    [newData addEntriesFromDictionary:[value toDictionary][@"0"]];
-                    [newData setObject:indexPath forKey:@"indexPath"];
-                    [newData setObject:listRef forKey:@"recycleListComponentRef"];
-                    [[recycleListComponent dataManager] updateVirtualComponentData:self->_virtualComponentId data:newData];
-                    dispatch_semaphore_signal(semaphore);
-                }];
-                dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-
-                [[WXSDKManager bridgeMgr] callComponentHook:self.weexInstance.instanceId componentId:self->_virtualComponentId type:@"lifecycle" hook:@"attach" args:nil competion:nil];
-                if ([newData count]) {
-                    data = newData;
-                }
-            } else {
-                newData[@"componentDataId"] = self->_virtualComponentId;
-                NSDictionary * virtualComponentData = [recycleListComponent.dataManager virtualComponentDataWithIndexPath:indexPath];
-                [newData addEntriesFromDictionary:virtualComponentData];
-                [newData addEntriesFromDictionary:data];
+    __block NSMutableDictionary *newData = [NSMutableDictionary dictionary];
+    [templateComponent->_bindingProps enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, WXDataBindingBlock  _Nonnull block, BOOL * _Nonnull stop) {
+        BOOL needUpdate;
+        id value = block(data, &needUpdate);
+        if (value) {
+            newData[key] = value;
+        }
+    }];
+
+    if (self.attributes[@"@isComponentRoot"]) {
+        if (![recycleListComponent.dataManager virtualComponentDataWithIndexPath:indexPath]) {
+            static NSUInteger __componentId = 0;
+            self->_virtualComponentId = [NSString stringWithFormat:@"%@@%lu", listRef, (unsigned long)__componentId % (2048*1024)];
+            __componentId++;
+            dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+            [[WXSDKManager bridgeMgr] callComponentHook:self.weexInstance.instanceId componentId:self.attributes[@"@templateId"] type:@"lifecycle" hook:@"create" args:@[self->_virtualComponentId, newData] competion:^(JSValue *value) {
+                [newData addEntriesFromDictionary:[value toDictionary][@"0"]];
+                [newData setObject:indexPath forKey:@"indexPath"];
+                [newData setObject:listRef forKey:@"recycleListComponentRef"];
+                [[recycleListComponent dataManager] updateVirtualComponentData:self->_virtualComponentId data:newData];
+                dispatch_semaphore_signal(semaphore);
+            }];
+            dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+
+            [self _refsConventFromData:newData];
+            NSIndexPath *indexPath = newData[@"item"][@"indexPath"];
+            NSUInteger position = [indexPath indexAtPosition:1];
+            [[WXSDKManager bridgeMgr] callComponentHook:self.weexInstance.instanceId componentId:self->_virtualComponentId type:@"lifecycle" hook:@"attach" args:@[@{@"virtualComponentId":self->_virtualComponentId,@"position":@(position),@"refs":self->_virtalElementInfo[@"refs"]?:@{}}] competion:nil];
+            if ([newData count]) {
                 data = newData;
             }
+        } else {
+            newData[@"componentDataId"] = self->_virtualComponentId;
+            NSDictionary * virtualComponentData = [recycleListComponent.dataManager virtualComponentDataWithIndexPath:indexPath];
+            [newData addEntriesFromDictionary:virtualComponentData];
+            [newData addEntriesFromDictionary:data];
+            data = newData;
         }
     }
+
     if (phase) {
         NSMutableDictionary * newData = [data mutableCopy];
         newData[@"@phase"] = phase;
@@ -532,4 +534,71 @@ - (WXDataBindingBlock)bindingBlockWithExpression:(WXJSExpression *)expression
     return block;
 }
 
+- (void)_attachSlotEvent:(NSDictionary *)data
+{
+    [self _refsConventFromData:data];
+    if (_virtalElementInfo.count != 0) {
+        NSIndexPath *indexPath = data[@"item"][@"indexPath"];
+        NSUInteger position = [indexPath indexAtPosition:1];
+        [_virtalElementInfo addEntriesFromDictionary:@{@"position":@(position)}];
+        [[WXSDKManager bridgeMgr] fireEvent:self.weexInstance.instanceId ref:data[@"item"][@"recycleListComponentRef"] type:@"_attach_slot" params:_virtalElementInfo domChanges:nil handlerArguments:nil];
+    }
+}
+
+- (void)_detachSlotEvent:(NSDictionary *)data
+{
+    [self _refsConventFromData:data];
+    if (_virtalElementInfo.count != 0) {
+        NSIndexPath *indexPath = data[@"item"][@"indexPath"];
+        NSUInteger position = [indexPath indexAtPosition:1];
+        [_virtalElementInfo addEntriesFromDictionary:@{@"position":@(position)}];
+        [[WXSDKManager bridgeMgr] fireEvent:self.weexInstance.instanceId ref:data[@"item"][@"recycleListComponentRef"] type:@"_detach_slot" params:_virtalElementInfo domChanges:nil handlerArguments:nil];
+    }
+}
+
+- (void )_refsConventFromData:(NSDictionary *)data
+{
+    _virtalElementInfo = [NSMutableDictionary new];
+    if (self.attributes[@"ref"]) {
+        NSMutableDictionary *subInfo = [NSMutableDictionary new];
+        [self _componentInfoOfRef:self subInfo:subInfo data:data];
+        [self _recursiveSlotComponent:self subInfo:subInfo data:data];
+    }
+    else
+    {
+        [self _recursiveSlotComponent:self subInfo:nil data:data];
+    }
+}
+
+- (void)_recursiveSlotComponent:(WXComponent *)component subInfo:(NSMutableDictionary *)subInfo data:(NSDictionary *)data
+{
+    subInfo = subInfo ? : [NSMutableDictionary new];
+    for (WXComponent *subcomponent in component.subcomponents) {
+        if (subcomponent.subcomponents.count != 0) {
+            [self _recursiveSlotComponent:subcomponent subInfo:subInfo data:data];
+        }
+        [self _componentInfoOfRef:subcomponent subInfo:subInfo data:data];
+    }
+    if (subInfo.count !=0) {
+        [_virtalElementInfo setObject:subInfo forKey:@"refs"];
+    }
+}
+
+- (void)_componentInfoOfRef:(WXComponent *)component subInfo:(NSMutableDictionary *)subInfo data:(NSDictionary *)data
+{
+    if (component.attributes[@"ref"]) {
+        NSIndexPath *indexPath = data[@"item"][@"indexPath"];
+        NSUInteger position = [indexPath indexAtPosition:1];
+        NSString *virtalElementInfo = [NSString stringWithFormat:@"%@@%lu",component.ref,position];
+        NSDictionary *refInfo = @{@"attrs":component.attributes,@"type":component->_type,@"ref":virtalElementInfo,@"[[VirtualElement]]":@"true"};
+        if (subInfo[component.attributes[@"ref"]]) {
+            [subInfo[component.attributes[@"ref"]] addObject:refInfo];
+        }
+        else
+        {
+            [subInfo setValue:@[refInfo] forKey:component.attributes[@"ref"]];
+        }
+    }
+}
+
 @end

ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.h

@@ -29,6 +29,4 @@
 @property(nonatomic, strong) WXRecycleListDataManager *dataManager;
 @property(nonatomic, strong) WXRecycleListTemplateManager *templateManager;
 @property(nonatomic, strong) WXRecycleListUpdateManager *updateManager;
-
-
 @end