Skip to content
This repository was archived by the owner on Jun 3, 2021. It is now read-only.

Commit a31c982

Browse files
wqyfavorjianhan-he
authored andcommitted
Revert "[iOS] Set overflow to hidden by default on iOS to conform to Android. (#2521)" (#2565)
This reverts commit 4553f0f.
1 parent 1201d50 commit a31c982

File tree

5 files changed

+6
-39
lines changed

5 files changed

+6
-39
lines changed

ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,9 +522,6 @@ - (BOOL)_handleConfigCenter
522522
if ([configCenter respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) {
523523
BOOL enableRTLLayoutDirection = [[configCenter configForKey:@"iOS_weex_ext_config.enableRTLLayoutDirection" defaultValue:@(YES) isDefault:NULL] boolValue];
524524
[WXUtility setEnableRTLLayoutDirection:enableRTLLayoutDirection];
525-
526-
BOOL overflowHiddenByDefault = [[configCenter configForKey:@"iOS_weex_ext_config.overflowHiddenByDefault" defaultValue:@(YES) isDefault:NULL] boolValue];
527-
[WXUtility setOverflowHiddenByDefault:overflowHiddenByDefault];
528525
}
529526
return NO;
530527
}

ios/sdk/WeexSDK/Sources/Utility/WXUtility.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,8 @@ BOOL WXFloatGreaterThanWithPrecision(CGFloat a,CGFloat b,double precision);
494494
+ (NSData *_Nonnull)base64DictToData:(NSDictionary *_Nullable)base64Dict;
495495

496496
+ (void)setEnableRTLLayoutDirection:(BOOL)value;
497-
+ (BOOL)enableRTLLayoutDirection;
498497

499-
+ (void)setOverflowHiddenByDefault:(BOOL)value;
500-
+ (BOOL)overflowHiddenByDefault;
498+
+ (BOOL)enableRTLLayoutDirection;
501499

502500
+ (long) getUnixFixTimeMillis;
503501

ios/sdk/WeexSDK/Sources/Utility/WXUtility.m

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#define KEY_USERNAME_PASSWORD @"com.taobao.Weex.weex123456"
4444

4545
static BOOL enableRTLLayoutDirection = YES;
46-
static BOOL overflowHiddenByDefault = YES;
4746

4847
void WXPerformBlockOnMainThread(void (^ _Nonnull block)(void))
4948
{
@@ -771,18 +770,6 @@ + (BOOL)enableRTLLayoutDirection
771770
return enableRTLLayoutDirection;
772771
}
773772

774-
# pragma mark - Overflow
775-
776-
+ (void)setOverflowHiddenByDefault:(BOOL)value
777-
{
778-
overflowHiddenByDefault = value;
779-
}
780-
781-
+ (BOOL)overflowHiddenByDefault
782-
{
783-
return overflowHiddenByDefault;
784-
}
785-
786773
#pragma mark - get deviceID
787774
+ (NSString *)getDeviceID {
788775
NSMutableDictionary *usernamepasswordKVPairs = (NSMutableDictionary *)[self load:KEY_USERNAME_PASSWORD];

ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,7 @@ - (void)_initViewPropertyWithStyles:(NSDictionary *)styles
177177
_backgroundColor = styles[@"backgroundColor"] ? [WXConvert UIColor:styles[@"backgroundColor"]] : [UIColor clearColor];
178178
_backgroundImage = styles[@"backgroundImage"] ? [WXConvert NSString:styles[@"backgroundImage"]]: nil;
179179
_opacity = styles[@"opacity"] ? [WXConvert CGFloat:styles[@"opacity"]] : 1.0;
180-
if ([WXUtility overflowHiddenByDefault]) {
181-
/* If we enable overflow:hidden by default, we cannot use original "overflow" style value.
182-
Unless js explicitly define "ios-overflow: visible", we disable clipToBounds.
183-
*/
184-
_clipToBounds = styles[@"iosOverflow"] ? [WXConvert WXClipType:styles[@"iosOverflow"]] : YES;
185-
}
186-
else {
187-
_clipToBounds = styles[@"overflow"] ? [WXConvert WXClipType:styles[@"overflow"]] : NO;
188-
}
180+
_clipToBounds = styles[@"overflow"] ? [WXConvert WXClipType:styles[@"overflow"]] : NO;
189181
_visibility = styles[@"visibility"] ? [WXConvert WXVisibility:styles[@"visibility"]] : WXVisibilityShow;
190182
_positionType = styles[@"position"] ? [WXConvert WXPositionType:styles[@"position"]] : WXPositionTypeRelative;
191183
_transform = styles[@"transform"] || styles[@"transformOrigin"] ?
@@ -235,17 +227,9 @@ - (void)_updateViewStyles:(NSDictionary *)styles
235227
_layer.opacity = _opacity;
236228
}
237229

238-
if ([WXUtility overflowHiddenByDefault]) {
239-
if (styles[@"iosOverflow"]) {
240-
_clipToBounds = [WXConvert WXClipType:styles[@"iosOverflow"]];
241-
_view.clipsToBounds = _clipToBounds;
242-
}
243-
}
244-
else {
245-
if (styles[@"overflow"]) {
246-
_clipToBounds = [WXConvert WXClipType:styles[@"overflow"]];
247-
_view.clipsToBounds = _clipToBounds;
248-
}
230+
if (styles[@"overflow"]) {
231+
_clipToBounds = [WXConvert WXClipType:styles[@"overflow"]];
232+
_view.clipsToBounds = _clipToBounds;
249233
}
250234

251235
if (styles[@"position"]) {

ios/sdk/WeexSDKTests/WXComponentTests.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ - (void)testDefaultProperties
7171
* View
7272
*/
7373
XCTAssertEqual(component->_backgroundColor, [UIColor clearColor]);
74+
XCTAssertEqual(component->_clipToBounds, NO);
7475
XCTAssertNil(component->_view);
7576
XCTAssertEqual(component->_opacity, 1.0);
7677
XCTAssertEqual(component->_visibility, WXVisibilityShow);

0 commit comments

Comments
 (0)