cobrowse-sdk-react-native 2.14.0 → 2.15.0

package/.github/workflows/lint.yaml

@@ -18,3 +18,5 @@ jobs:
       - run: npm ci
 
       - run: npm run lint
+
+      - run: npm run test:types

package/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "eslint.enable": false,
+  "prettier.enable": false,
+  "standard.enable": true,
+  "standard.autoFixOnSave": true,
+  "standard.engine": "standard"
+}

package/android/build.gradle

@@ -30,5 +30,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+' // support react-native-v0.22-rc+
-    implementation 'io.cobrowse:cobrowse-sdk-android:2.23.0'
+    implementation 'io.cobrowse:cobrowse-sdk-android:2.25.1'
 }

package/android/src/main/java/io/cobrowse/reactnative/CobrowseIOCommonDelegates.java

@@ -5,9 +5,9 @@ import com.facebook.react.bridge.ReadableArray;
 
 import io.cobrowse.CobrowseIO;
 
-interface CobrowseIOCommonDelegates  extends io.cobrowse.CobrowseIO.Delegate, io.cobrowse.CobrowseIO.SessionRequestDelegate,
-  io.cobrowse.CobrowseIO.SessionLoadDelegate, io.cobrowse.CobrowseIO.RedactionDelegate,
-  io.cobrowse.CobrowseIO.RemoteControlRequestDelegate, CobrowseIO.FullDeviceRequestDelegate {
+interface CobrowseIOCommonDelegates  extends CobrowseIO.Delegate, CobrowseIO.SessionRequestDelegate,
+  CobrowseIO.SessionLoadDelegate, CobrowseIO.RedactionDelegate, CobrowseIO.UnredactionDelegate,
+  CobrowseIO.RemoteControlRequestDelegate, CobrowseIO.FullDeviceRequestDelegate {
 
   public void findNodeManager();
   public void setUnredactedTags(final ReadableArray reactTags, final Promise promise);

package/android/src/main/java/io/cobrowse/reactnative/CommonDelegates.java

@@ -7,7 +7,6 @@ import android.view.ViewGroup;
 import android.view.ViewParent;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.util.Predicate;
 
 import com.facebook.react.bridge.Promise;
@@ -40,7 +39,25 @@ class CommonDelegates implements CobrowseIOCommonDelegates {
     this.reactApplicationContext = context;
   }
 
-  private Set<View> getUnredactedViews(@NonNull final Activity activity) {
+  @Override
+  public void handleFullDeviceRequest(@NonNull Activity activity, @NonNull Session session) {
+    // no-op, this will be handed on the JS side via an "updated" event handler
+    // this stub just disables the default native prompt in the SDK
+  }
+
+  @Override
+  public List<View> redactedViews(@NonNull Activity activity) {
+    HashSet<View> redacted = new HashSet<>(RedactedViewManager.redactedViews.keySet());
+    if (CobrowseIOModule.delegate instanceof io.cobrowse.reactnative.CobrowseIO.RedactionDelegate) {
+      List<View> views = ((io.cobrowse.reactnative.CobrowseIO.RedactionDelegate) CobrowseIOModule.delegate).redactedViews(activity);
+      if (views != null) redacted.addAll(views);
+    }
+
+    return new ArrayList<>(redacted);
+  }
+
+  @Override
+  public List<View> unredactedViews(@NonNull Activity activity) {
     synchronized (unredactedTags) {
       HashSet<View> unredacted = new HashSet<>();
       for (Integer i : unredactedTags) {
@@ -54,89 +71,9 @@ class CommonDelegates implements CobrowseIOCommonDelegates {
         List<View> views = ((io.cobrowse.reactnative.CobrowseIO.RedactionDelegate) CobrowseIOModule.delegate).unredactedViews(activity);
         if (views != null) unredacted.addAll(views);
       }
-      return unredacted;
-    }
-  }
 
-  private Set<View> getRedactedViews(@NonNull final Activity activity) {
-    HashSet<View> redacted = new HashSet<>(RedactedViewManager.redactedViews.keySet());
-    if (CobrowseIOModule.delegate instanceof io.cobrowse.reactnative.CobrowseIO.RedactionDelegate) {
-      List<View> views = ((io.cobrowse.reactnative.CobrowseIO.RedactionDelegate) CobrowseIOModule.delegate).redactedViews(activity);
-      if (views != null) redacted.addAll(views);
+      return new ArrayList<>(unredacted);
     }
-    return redacted;
-  }
-
-  @Override
-  public void handleFullDeviceRequest(@NonNull Activity activity, @NonNull Session session) {
-    // no-op, this will be handed on the JS side via an "updated" event handler
-    // this stub just disables the default native prompt in the SDK
-  }
-
-  @Override
-  public List<View> redactedViews(@NonNull Activity activity) {
-    final Set<View> redacted = this.getRedactedViews(activity);
-    final Set<View> unredacted = this.getUnredactedViews(activity);
-
-    // Project all unredactions to the root to get the full set of unredacted nodes
-    HashSet<View> projectedUnredacted = new HashSet<>();
-    for (View view : unredacted) {
-      projectedUnredacted.add(view);
-      projectedUnredacted.addAll(TreeUtils.allParents(view));
-    }
-
-    // Work out which nodes are explicitly redacted but need to be unredacted
-    // due to a nested unredaction tag (these redactions will be moved towards the
-    // leaves of the view hierarchy instead)
-    HashSet<View> redactedProjectedUnredactions = new HashSet<>(redacted);
-    redactedProjectedUnredactions.retainAll(projectedUnredacted);
-
-    // Start to build the set of redactions we should actually apply. We start off with
-    // the set of explicitly redacted nodes
-    HashSet<View> toRedact = new HashSet<>(redacted);
-
-    // remove any redactions that have unredacted decendants (i.e. any that appear in the
-    // projection of the unredaction). These are the redacted nodes we need to move towards
-    // the leaves of the tree
-    toRedact.removeAll(redactedProjectedUnredactions);
-
-    // Work out the set of all nodes that are siblings of any projected unredacted node
-    HashSet<View> projectedUnredactionSiblings = new HashSet<>();
-    for (View view : projectedUnredacted) {
-      ViewParent parent = view.getParent();
-      if (parent instanceof ViewGroup)
-        projectedUnredactionSiblings.addAll(TreeUtils.directChildren((ViewGroup) parent));
-    }
-
-    // Subtract the projected unredactions from the set of all siblings of projected
-    // unredactions. i.e. subtract things that should be definitely unredacted to leave
-    // a set we're not sure yet whether to redact or not
-    HashSet<View> potentiallyRedactedUnredactedSiblings = new HashSet<View>(projectedUnredactionSiblings);
-    potentiallyRedactedUnredactedSiblings.removeAll(projectedUnredacted);
-
-    // for each node we're not sure about yet, check if the closest redacted or unredacted ancestor
-    // is a redacted node, if so this descendant should also be redacted
-    for (View view : potentiallyRedactedUnredactedSiblings) {
-      View closest = TreeUtils.closest(view, new Predicate<View>() {
-        @Override
-        public boolean test(View view) {
-          return redacted.contains(view) || unredacted.contains(view);
-        }
-      });
-      if (redacted.contains(closest)) toRedact.add(view);
-    }
-
-    // Remove any empty ViewGroup from the redacted set, they're often used for wrapping
-    // or sizing other elements, and do not usually need to be redacted
-    // If it's absolutely necessary they are redacted, they can always be replaced with
-    // a <Redacted> tag instead
-    for (View v : new HashSet<>(toRedact)) {
-      if (v instanceof ViewGroup && ((ViewGroup) v).getChildCount() == 0) {
-        toRedact.remove(v);
-      }
-    }
-
-    return new ArrayList<>(toRedact);
   }
 
   @Override

package/cobrowse-sdk-react-native.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.homepage      = package["homepage"]
   s.source        = { :git => 'https://github.com/cobrowseio/cobrowse-sdk-react-native.git' }
   s.platform      = :ios, '11.0'
-  s.dependency      'CobrowseIO/XCFramework', '2.22.1'
+  s.dependency      'CobrowseIO/XCFramework', '2.25.0'
   s.dependency      'React'
   s.source_files =  'ios/*.{h,m}'
 end

package/ios/RCTCobrowseIO.m

@@ -67,28 +67,6 @@ RCT_EXPORT_MODULE();
     if (hasListeners) [self sendEventWithName:@SESSION_LOADED body:[session toDict]];
 }
 
--(NSSet<UIView*>*) redactedViews: (UIViewController*) vc {
-    NSMutableSet* views = [CBIOCobrowseRedactedManager.redactedViews mutableCopy];
-    if ([RCTCobrowseIO.delegate respondsToSelector:@selector(cobrowseRedactedViewsForViewController:)]) {
-        [views addObjectsFromArray: [RCTCobrowseIO.delegate cobrowseRedactedViewsForViewController:vc]];
-    }
-    return views;
-}
-
--(NSSet<UIView*>*) unredactedViews: (UIViewController*) vc {
-    NSMutableSet* views = [NSMutableSet set];
-    @synchronized(unredactedTags) {
-        for (id tag in unredactedTags) {
-            UIView* v = [self.bridge.uiManager viewForReactTag: tag];
-            if (v != nil) [views addObject:v];
-        }
-    }
-    if ([RCTCobrowseIO.delegate respondsToSelector:@selector(cobrowseUnredactedViewsForViewController:)]) {
-        [views addObjectsFromArray: [RCTCobrowseIO.delegate cobrowseUnredactedViewsForViewController:vc]];
-    }
-    return views;
-}
-
 -(void)cobrowseSessionDidUpdate:(CBIOSession *)session {
     if (hasListeners) [self sendEventWithName:@SESSION_UPDATED body:[session toDict]];
 }
@@ -107,60 +85,27 @@ RCT_EXPORT_MODULE();
 }
 
 -(NSArray<UIView *> *)cobrowseRedactedViewsForViewController:(UIViewController *)vc {
-    NSSet* redacted = [self redactedViews: vc];
-    NSSet* unredacted = [self unredactedViews: vc];
-    
-    // Project all unredactions to the root to get the full set of unredacted nodes
-    NSMutableSet* projectedUnredacted = [NSMutableSet set];
-    for (id view in unredacted) {
-        [projectedUnredacted addObject:view];
-        [projectedUnredacted addObjectsFromArray: [RCTCBIOTreeUtils allParents: view]];
+    NSMutableSet* views = [CBIOCobrowseRedactedManager.redactedViews mutableCopy];
+    if ([RCTCobrowseIO.delegate respondsToSelector:@selector(cobrowseRedactedViewsForViewController:)]) {
+        [views addObjectsFromArray: [RCTCobrowseIO.delegate cobrowseRedactedViewsForViewController:vc]];
     }
     
-    // Work out which nodes are explicitly redacted but need to be unredacted
-    // due to a nested unredaction tag (these redactions will be moved towards the
-    // leaves of the view hierarchy instead)
-    NSMutableSet* redactedProjectedUnredactions = [redacted mutableCopy];
-    [redactedProjectedUnredactions intersectSet: projectedUnredacted];
-    
-    // Start to build the set of redactions we should actually apply. We start off with
-    // the set of explicitly redacted nodes
-    NSMutableSet* toRedact = [redacted mutableCopy];
-    
-    // remove any redactions that have unredacted decendants (i.e. any that appear in the
-    // projection of the unredaction). These are the redacted nodes we need to move towards
-    // the leaves of the tree
-    [toRedact minusSet: redactedProjectedUnredactions];
-    
-    // Work out the set of all nodes that are siblings of any projected unredacted node
-    NSMutableSet* projectedUnredactionSiblings = [NSMutableSet set];
-    for (UIView* view in projectedUnredacted) {
-        [projectedUnredactionSiblings addObjectsFromArray: view.superview.subviews];
+    return [views allObjects];
+}
+
+- (NSArray<UIView *> *)cobrowseUnredactedViewsForViewController:(UIViewController *)vc {
+    NSMutableSet* views = [NSMutableSet set];
+    @synchronized(unredactedTags) {
+        for (id tag in unredactedTags) {
+            UIView* v = [self.bridge.uiManager viewForReactTag: tag];
+            if (v != nil) [views addObject:v];
+        }
     }
-    
-    // Subtract the projected unredactions from the set of all siblings of projected
-    // unredactions. i.e. subtract things that should be definitely unredacted to leave
-    // a set we're not sure yet whether to redact or not
-    NSMutableSet* potentiallyRedactedUnredactedSiblings = [projectedUnredactionSiblings mutableCopy];
-    [potentiallyRedactedUnredactedSiblings minusSet:projectedUnredacted];
-    
-    // for each node we're not sure about yet, check if the closest redacted or unredacted ancestor
-    // is a redacted node, if so this descendant should also be redacted
-    for (UIView* view in potentiallyRedactedUnredactedSiblings) {
-        UIView* closest = [RCTCBIOTreeUtils closest:^BOOL(UIView *v) {
-            return [redacted containsObject:v] || [unredacted containsObject:v];
-        } from: view];
-        if ([redacted containsObject: closest]) [toRedact addObject: view];
+    if ([RCTCobrowseIO.delegate respondsToSelector:@selector(cobrowseUnredactedViewsForViewController:)]) {
+        [views addObjectsFromArray: [RCTCobrowseIO.delegate cobrowseUnredactedViewsForViewController:vc]];
     }
     
-    // Remove any empty RCTViews from the redacted set, they're often used for wrapping
-    // or sizing other elements, and do not usually need to be redacted
-    // If it's absolutely necessary they are redacted, they can always be replaced with
-    // a <Redacted> tag instead
-    for (UIView* v in [toRedact copy])
-        if ([v isKindOfClass:RCTView.class] && v.subviews.count == 0) [toRedact removeObject: v];
-    
-    return toRedact.allObjects;
+    return [views allObjects];
 }
 
 - (bool) cobrowseShouldCaptureWindow:(UIWindow *)window {

package/js/CobrowseIO.js

@@ -72,18 +72,22 @@ export default class CobrowseIO {
     return CobrowseIONative.stop()
   }
 
+  // eslint-disable-next-line accessor-pairs
   static set api (api) {
     CobrowseIONative.api(api)
   }
 
+  // eslint-disable-next-line accessor-pairs
   static set license (license) {
     CobrowseIONative.license(license)
   }
 
+  // eslint-disable-next-line accessor-pairs
   static set customData (customData) {
     CobrowseIONative.customData(customData)
   }
 
+  // eslint-disable-next-line accessor-pairs
   static set deviceToken (token) {
     CobrowseIONative.deviceToken(token)
   }
@@ -128,8 +132,8 @@ CobrowseIO.addListener('session.requested', (session) => {
 CobrowseIO.addListener('session.updated', (session) => {
   if (session.isActive() && session.remote_control === 'requested') {
     CobrowseIO.handleRemoteControlRequest(session)
-  } 
-  
+  }
+
   if (session.isActive() && session.full_device_state === 'requested') {
     if (CobrowseIO.handleFullDeviceRequest) {
       CobrowseIO.handleFullDeviceRequest(session)

package/js/CobrowseView.js

@@ -100,7 +100,7 @@ export default class CobrowseView extends Component {
   renderManageSession () {
     return (
       <View>
-        <Text style={[styles.text]}>You{"'"}re sharing screens from this app with a support agent.</Text>
+        <Text style={[styles.text]}>You're sharing screens from this app with a support agent.</Text>
         <TouchableOpacity onPress={() => this.endSession()}>
           <Text style={[styles.text, styles.button]}>End Session</Text>
         </TouchableOpacity>

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "cobrowse-sdk-react-native",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "description": "Cobrowse SDK for React Native",
   "main": "js/index.js",
   "types": "ts/index.d.ts",
   "scripts": {
-    "lint": "ts-standard ts/*.d.ts",
-    "lint:fix": "ts-standard ts/*.d.ts --fix",
-    "start:dev": "nodemon --exec ./scripts/copy.sh"
+    "lint": "ts-standard",
+    "lint:fix": "npm run lint -- --fix",
+    "start:dev": "nodemon --exec ./scripts/copy.sh",
+    "test:types": "tsc -p tsconfig.eslint.json --noEmit"
   },
   "author": {
     "name": "Andy Pritchard"
@@ -38,7 +39,13 @@
     "@types/react": "^18.0.24",
     "@types/react-native": "^0.70.6",
     "nodemon": "^2.0.20",
-    "ts-standard": "^12.0.1",
+    "ts-standard": "^12.0.2",
     "typescript": "^4.8.4"
+  },
+  "ts-standard": {
+    "project": "tsconfig.eslint.json",
+    "env": [
+      "jest"
+    ]
   }
 }

package/ts/CobrowseView.d.ts

@@ -1,5 +1,5 @@
-import type { Component } from 'react'
-import type { View, Text } from 'react-native'
+import type { Component, ReactElement } from 'react'
+import type { ViewProps, TextProps } from 'react-native'
 
 export default class CobrowseView extends Component {
   componentDidMount (): Promise<void>
@@ -8,13 +8,13 @@ export default class CobrowseView extends Component {
 
   endSession (): Promise<void>
 
-  renderError (): Text
+  renderError (): ReactElement<TextProps>
 
-  renderCode (): View
+  renderCode (): ReactElement<ViewProps>
 
-  renderManageSession (): View
+  renderManageSession (): ReactElement<ViewProps>
 
-  renderContent (): Text | View
+  renderContent (): ReactElement<TextProps | ViewProps>
 
-  render (): View
+  render (): ReactElement<ViewProps>
 }

package/ts/Unredacted.d.ts

@@ -5,6 +5,7 @@ export function useUnredaction<
   T = View | ScrollView | Text | Image | FlatList | SectionList
 > (shouldWarnUnhandledRefs?: boolean, componentName?: string): (elem: T) => void
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 type ForwardedRefType<T, P> = typeof React.forwardRef
 
 // HOC for adding unredaction to a whole component class