[iOS] add option to ignore element time calculate (#2580)

apache · Jun 19, 2019 · d20be41 · d20be41
1 parent f95d135
commit d20be41
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -567,8 +567,6 @@ - (void)createInstance:(NSString *)instanceIdString
         sdkInstance.instanceJavaScriptContext.javaScriptContext[@"wxExtFuncInfo"] = funcInfo;
         [self callJSMethod:@"createInstance" args:args];
         sdkInstance.instanceJavaScriptContext.javaScriptContext[@"wxExtFuncInfo"] = nil;
-
-        [WXExceptionUtils commitCriticalExceptionRT:instanceIdString errCode:[NSString stringWithFormat:@"%d", WX_KEY_EXCEPTION_NO_BUNDLE_TYPE] function:@"createInstance" exception:@"Fatal Error : No bundle type in js bundle head, cause white screen or memory leak!!" extParams:nil];
 
         WX_MONITOR_INSTANCE_PERF_END(WXPTJSCreateInstance, [WXSDKManager instanceForID:instanceIdString]);
     }

diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.mm
@@ -320,8 +320,17 @@ - (void)addComponent:(NSString*)ref
     }
     if (supercomponent.ignoreInteraction) {
         component.ignoreInteraction = YES;
+    } else {
+        if ([[attributes objectForKey:@"ignoreInteraction"] boolValue]) {
+            component.ignoreInteraction = YES;
+        } else {
+            if (component->_positionType == WXPositionTypeFixed) {
+                component.ignoreInteraction = YES;
+            } else {
+                component.ignoreInteraction = NO;
+            }
+        }
     }
-    component.ignoreInteraction = [[attributes objectForKey:@"ignoreInteraction"] boolValue];
 
 #ifdef DEBUG
     WXLogDebug(@"flexLayout -> _recursivelyAddComponent : super:(%@,%@):[%f,%f] ,child:(%@,%@):[%f,%f],childClass:%@",

diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
@@ -604,7 +604,6 @@ - (BOOL)_insertSubcomponent:(WXComponent *)subcomponent atIndex:(NSInteger)index
     pthread_mutex_unlock(&_propertyMutex);
 
     if (subcomponent->_positionType == WXPositionTypeFixed) {
-        subcomponent.ignoreInteraction = YES;
         [self.weexInstance.componentManager addFixedComponent:subcomponent];
     }