[ptmt#18] ScrollView: show bars

Author: ptmt

Libraries/Image/RCTImageView.m

@@ -168,9 +168,6 @@ - (void)setContentMode:(UIViewContentMode)mode
         case UIViewContentModeScaleAspectFill:
           _layer.contentsGravity = kCAGravityResizeAspectFill;
           _layer.masksToBounds = YES;
-//          NSLog(@"bounds: %f %f", self.bounds.size.height,  self.bounds.size.width);
-//          NSLog(@"frame: %f %f", self.frame.size.height,  self.frame.size.width);
-
           _layer.needsDisplayOnBoundsChange = YES;
           break;
 
@@ -286,7 +283,6 @@ - (void)reloadImage
             _onLoad(nil);
           }
         }
-        NSLog(@"bounds: %f %f", self.layer.bounds.size.height,  self.layer.bounds.size.width);
         if (_onLoadEnd) {
            _onLoadEnd(nil);
         }

React/Views/RCTScrollView.m

@@ -912,7 +912,8 @@ - (void)sendScrollEventWithType:(RCTScrollEventType)type
 
 @implementation RCTNativeScrollView
 {
-  NSColor * _backgroundColor; // TODO: why?
+  NSColor * _backgroundColor;
+  RCTEventDispatcher *_eventDispatcher;
 }
 
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
@@ -922,6 +923,7 @@ - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
 {
   if ((self = [super initWithFrame:CGRectZero])) {
     _backgroundColor = [NSColor clearColor];
+    _eventDispatcher = eventDispatcher;
     [self setDrawsBackground:NO];
 
   }
@@ -938,6 +940,16 @@ - (BOOL)opaque
   return NO;
 }
 
+- (void)setShowsVerticalScrollIndicator:(BOOL)value
+{
+  self.hasVerticalScroller = value;
+}
+
+- (void)setShowsHorizontalScrollIndicator:(BOOL)value
+{
+  self.hasHorizontalScroller = value;
+}
+
 - (void)removeReactSubview:(NSView *)subview
 {
   [subview removeFromSuperview];
@@ -964,7 +976,6 @@ - (void)setBackgroundColor:(NSColor *)backgroundColor
   } else {
     [self.layer setBackgroundColor:[backgroundColor CGColor]];
   }
-  [self.layer setNeedsDisplay];
   [self setNeedsDisplay:YES];
 }
 

React/Views/RCTScrollViewManager.m

@@ -127,4 +127,7 @@ - (NSView *)view
   return [[RCTNativeScrollView alloc] initWithEventDispatcher:self.bridge.eventDispatcher];
 }
 
+RCT_EXPORT_VIEW_PROPERTY(showsHorizontalScrollIndicator, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showsVerticalScrollIndicator, BOOL)
+
 @end

React/Views/RCTViewManager.m

@@ -143,16 +143,16 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowViewRegistry:(__unused RCTSpars
 }
 RCT_CUSTOM_VIEW_PROPERTY(transformMatrix, CATransform3D, RCTView)
 {
-  NSLog(@"superview %@", view.superview);
+  CATransform3D transform = json ? [RCTConvert CATransform3D:json] : defaultView.layer.transform;
   if (!view.superview) {
     view.shouldBeTransformed = YES;
-    view.transform = json ? [RCTConvert CATransform3D:json] : defaultView.layer.transform;
+    view.transform = transform;
   } else {
-    view.layer.transform = json ? [RCTConvert CATransform3D:json] : defaultView.layer.transform;
+    view.layer.transform = transform;
   }
 
   // TODO: Improve this by enabling edge antialiasing only for transforms with rotation or skewing
-  view.layer.edgeAntialiasingMask = !CATransform3DIsIdentity(view.layer.transform);
+  view.layer.edgeAntialiasingMask = !CATransform3DIsIdentity(transform);
 }
 
 //RCT_CUSTOM_VIEW_PROPERTY(pointerEvents, RCTPointerEvents, RCTView)