Merge pull request #51 from JBerendes/master

Border width prop is now accessible and warning squashed
shahen94 · Mar 28, 2017 · c52ff0d · c52ff0d
2 parents 694e055 + 92db320
commit c52ff0d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/ios/RNVideoProcessing/RNTrimmerView/RNTrimmerView.swift b/ios/RNVideoProcessing/RNTrimmerView/RNTrimmerView.swift
@@ -19,6 +19,7 @@ class RNTrimmerView: RCTView, ICGVideoTrimmerDelegate {
     var _minLength: CGFloat? = nil
     var _maxLength: CGFloat? = nil
     var _thumbWidth: CGFloat? = nil
+    var _borderWidth: CGFloat? = nil
     var _trackerColor: UIColor = UIColor.clear
 
     var source: NSString? {
@@ -100,6 +101,18 @@ class RNTrimmerView: RCTView, ICGVideoTrimmerDelegate {
         }
     }
 
+    var borderWidth: NSNumber? {
+        set {
+            if newValue != nil {
+                self._borderWidth = RCTConvert.cgFloat(newValue!)
+                self.updateView()
+            }
+        }
+        get {
+            return nil
+        }
+    }
+
     var currentTime: NSNumber? {
         set {
             print("CHANGED: [TrimmerView]: currentTime: \(newValue)")
@@ -147,6 +160,9 @@ class RNTrimmerView: RCTView, ICGVideoTrimmerDelegate {
             if _thumbWidth != nil {
                 trimmerView!.thumbWidth = _thumbWidth!
             }
+            if _borderWidth != nil {
+                trimmerView!.borderWidth = _borderWidth!
+            }
             self.trimmerView!.resetSubviews()
             //      Timer.scheduledTimer(timeInterval: 0.5, target: self, selector: #selector(self.updateTrimmer), userInfo: nil, repeats: false)
         }

diff --git a/ios/RNVideoProcessing/RNTrimmerView/RNTrimmerViewBridge.m b/ios/RNVideoProcessing/RNTrimmerView/RNTrimmerViewBridge.m
@@ -21,5 +21,6 @@ @interface RCT_EXTERN_MODULE(RNTrimmerViewManager, RCTViewManager)
 RCT_EXPORT_VIEW_PROPERTY(currentTime, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(trackerColor, NSString)
 RCT_EXPORT_VIEW_PROPERTY(thumbWidth, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(borderWidth, NSNumber)
 
 @end
diff --git a/lib/Trimmer/Trimmer.android.js b/lib/Trimmer/Trimmer.android.js
@@ -245,9 +245,9 @@ export class Trimmer extends Component {
           });
         }}
       >
-        {images.map((uri) => (
+        {images.map((uri,index) => (
           <Image
-            key={`preview-source-${uri}`}
+            key={`preview-source-${uri}-${index}`}
             source={{ uri }}
             style={styles.imageItem}
           />

diff --git a/lib/Trimmer/Trimmer.ios.js b/lib/Trimmer/Trimmer.ios.js
@@ -15,7 +15,8 @@ export class Trimmer extends Component {
     maxLength: PropTypes.number,
     currentTime: PropTypes.number,
     trackerColor: PropTypes.string,
-    thumbWidth: PropTypes.number
+    thumbWidth: PropTypes.number,
+    borderWidth: PropTypes.number,
   };
 
   static defaultProps = {
@@ -56,6 +57,7 @@ export class Trimmer extends Component {
       currentTime,
       trackerColor,
       thumbWidth,
+      borderWidth,
     } = this.props;
     const actualSource = getActualSource(source);
     return (
@@ -72,6 +74,7 @@ export class Trimmer extends Component {
         minLength={minLength}
         maxLength={maxLength}
         thumbWidth={thumbWidth}
+        borderWidth={borderWidth}
       />
     );
   }