uilib-native 5.0.0-snapshot.7396 → 5.0.0-snapshot.7406
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -173,11 +173,14 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
|
|
|
173
173
|
CGFloat bottomSafeArea = [self getBottomSafeArea];
|
|
174
174
|
CGFloat tabBarHeight = [self getTabBarHeight];
|
|
175
175
|
CGFloat yOffset = MIN(-bottomSafeArea, -_ObservingInputAccessoryViewTemp.keyboardHeight + tabBarHeight);
|
|
176
|
+
|
|
176
177
|
if (self.frame.origin.y != yOffset) {
|
|
178
|
+
[self removeObserver:self forKeyPath:@"frame"];
|
|
177
179
|
self.frame = CGRectMake(self.frame.origin.x,
|
|
178
180
|
yOffset,
|
|
179
181
|
self.frame.size.width,
|
|
180
182
|
self.frame.size.height);
|
|
183
|
+
[self addObserver:self forKeyPath:@"frame" options:NSKeyValueObservingOptionNew context:NULL];
|
|
181
184
|
}
|
|
182
185
|
|
|
183
186
|
[self updateBottomViewFrame];
|
|
@@ -431,7 +434,9 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
|
|
|
431
434
|
|
|
432
435
|
- (void)_updateScrollViewInsets
|
|
433
436
|
{
|
|
434
|
-
|
|
437
|
+
// Because our view is now being transformed inside it's superview (from RN77 it inherited a RCTLegacyViewManagerInteropComponentView as superview) we no longer need the scrollview to also update because it's inside our view
|
|
438
|
+
return;
|
|
439
|
+
/*if(self.scrollViewToManage != nil)
|
|
435
440
|
{
|
|
436
441
|
UIEdgeInsets insets = self.scrollViewToManage.contentInset;
|
|
437
442
|
CGFloat bottomSafeArea = [self getBottomSafeArea];
|
|
@@ -441,6 +446,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
|
|
|
441
446
|
CGPoint originalOffset = self.scrollViewToManage.contentOffset;
|
|
442
447
|
|
|
443
448
|
bottomInset += (_ObservingInputAccessoryViewTemp.keyboardHeight == 0 ? bottomSafeArea : 0);
|
|
449
|
+
|
|
444
450
|
if(self.scrollIsInverted)
|
|
445
451
|
{
|
|
446
452
|
insets.top = bottomInset;
|
|
@@ -477,7 +483,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
|
|
|
477
483
|
insets.bottom = bottomInset;
|
|
478
484
|
}
|
|
479
485
|
self.scrollViewToManage.scrollIndicatorInsets = insets;
|
|
480
|
-
}
|
|
486
|
+
}*/
|
|
481
487
|
}
|
|
482
488
|
|
|
483
489
|
#pragma mark - bottom view
|
|
@@ -590,7 +596,11 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
|
|
|
590
596
|
}
|
|
591
597
|
[self updateBottomViewFrame];
|
|
592
598
|
|
|
593
|
-
self.transform
|
|
599
|
+
CGAffineTransform oldTransform = self.transform;
|
|
600
|
+
CGAffineTransform newTransform = CGAffineTransformMakeTranslation(0, accessoryTranslation);
|
|
601
|
+
if (oldTransform.tx != newTransform.tx || oldTransform.ty != newTransform.ty) {
|
|
602
|
+
self.transform = CGAffineTransformMakeTranslation(0, accessoryTranslation);
|
|
603
|
+
}
|
|
594
604
|
|
|
595
605
|
[self _updateScrollViewInsets];
|
|
596
606
|
}
|
package/package.json
CHANGED