1 files changed, 36 insertions, 13 deletions
diff --git a/src/client/views/DocComponent.tsx b/src/client/views/DocComponent.tsx
index eba55e30c..ab97691ee 100644
--- a/src/client/views/DocComponent.tsx
+++ b/src/client/views/DocComponent.tsx
@@ -209,21 +209,44 @@ export function ViewBoxAnnotatableComponent<P extends ViewBoxAnnotatableProps>()
                         Doc.AddDocToList(targetDataDoc, annotationKey ?? this.annotationKey, doc);
                     });
                 } else {
-                    added
-                        .filter(doc => [AclAdmin, AclEdit].includes(GetEffectiveAcl(doc)))
-                        .map(doc => {
-                            // only make a pushpin if we have acl's to edit the document
-                            //DocUtils.LeavePushpin(doc);
-                            doc._stayInCollection = undefined;
-                            doc.context = this.props.Document;
-                            if (annotationKey ?? this._annotationKeySuffix()) Doc.GetProto(doc).annotationOn = this.rootDoc;
+                    if (this.props.Document[AclSym] && Object.keys(this.props.Document[AclSym]).length) {
+                        added.forEach(d => {
+                            for (const [key, value] of Object.entries(this.props.Document[AclSym])) {
+                                if (d.author === denormalizeEmail(key.substring(4)) && !d.aliasOf) distributeAcls(key, SharingPermissions.Admin, d);
+                            }
+                        });
+                    }
 
-                            Doc.ActiveDashboard && inheritParentAcls(Doc.ActiveDashboard, doc);
+                    if (effectiveAcl === AclAugment) {
+                        added.map(doc => {
+                            doc.context = this.props.Document;
+                            const contextDoc = Cast(doc.context, Doc, null);
+                            if ([AclAdmin, AclEdit].includes(GetEffectiveAcl(doc))) {
+                                if (contextDoc) inheritParentAcls(contextDoc, doc);
+                                else if (Doc.ActiveDashboard) inheritParentAcls(Doc.ActiveDashboard, doc);
+                            }
+                            if (annotationKey ?? this._annotationKeySuffix()) Doc.GetProto(doc).annotationOn = this.props.Document;
+                            Doc.AddDocToList(targetDataDoc, annotationKey ?? this.annotationKey, doc);
                         });
-                    const annoDocs = targetDataDoc[annotationKey ?? this.annotationKey] as List<Doc>;
-                    if (annoDocs instanceof List) annoDocs.push(...added);
-                    else targetDataDoc[annotationKey ?? this.annotationKey] = new List<Doc>(added);
-                    targetDataDoc[(annotationKey ?? this.annotationKey) + '-lastModified'] = new DateField(new Date(Date.now()));
+                    } else {
+                        added
+                            .filter(doc => [AclAdmin, AclEdit].includes(GetEffectiveAcl(doc)))
+                            .map(doc => {
+                                // only make a pushpin if we have acl's to edit the document
+                                //DocUtils.LeavePushpin(doc);
+                                doc._stayInCollection = undefined;
+                                doc.context = this.props.Document;
+                                if (annotationKey ?? this._annotationKeySuffix()) Doc.GetProto(doc).annotationOn = this.rootDoc;
+
+                                const contextDoc = Cast(doc.context, Doc, null);
+                                if (contextDoc) inheritParentAcls(contextDoc, doc);
+                                else if (Doc.ActiveDashboard) inheritParentAcls(Doc.ActiveDashboard, doc);
+                            });
+                        const annoDocs = targetDataDoc[annotationKey ?? this.annotationKey] as List<Doc>;
+                        if (annoDocs instanceof List) annoDocs.push(...added);
+                        else targetDataDoc[annotationKey ?? this.annotationKey] = new List<Doc>(added);
+                        targetDataDoc[(annotationKey ?? this.annotationKey) + '-lastModified'] = new DateField(new Date(Date.now()));
+                    }
                 }
             }
             return true;