Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into sharing_scenario

3 files changed, 16 insertions, 16 deletions

diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 90a2378fe..be99d6ce4 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -916,7 +916,7 @@ export class CurrentUserUtils {
                 (sharedDocs as Doc)["acl-Public"] = (sharedDocs as Doc)[DataSym]["acl-Public"] = SharingPermissions.Add;
             }
             if (sharedDocs instanceof Doc) {
-                sharedDocs.userColor = sharedDocs.userColor || "rgb(202, 202, 202)";
+                Doc.GetProto(sharedDocs).userColor = sharedDocs.userColor || "rgb(202, 202, 202)";
             }
             doc.mySharedDocs = new PrefetchProxy(sharedDocs);
         }
diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index ff7ce68ee..777394b05 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -58,7 +58,7 @@ export class SettingsManager extends React.Component<{}> {
     @undoBatch changeFontFamily = action((e: React.ChangeEvent) => Doc.UserDoc().fontFamily = (e.currentTarget as any).value);
     @undoBatch changeFontSize = action((e: React.ChangeEvent) => Doc.UserDoc().fontSize = (e.currentTarget as any).value);
     @undoBatch switchActiveBackgroundColor = action((color: ColorState) => Doc.UserDoc().activeCollectionBackground = String(color.hex));
-    @undoBatch switchUserColor = action((color: ColorState) => Doc.SharingDoc().userColor = String(color.hex));
+    @undoBatch switchUserColor = action((color: ColorState) => { Doc.SharingDoc().userColor = undefined; Doc.GetProto(Doc.SharingDoc()).userColor = String(color.hex); });
     @undoBatch
     playgroundModeToggle = action(() => {
         this.playgroundMode = !this.playgroundMode;
diff --git a/src/client/util/SharingManager.tsx b/src/client/util/SharingManager.tsx
index db23941c7..d283510b7 100644
--- a/src/client/util/SharingManager.tsx
+++ b/src/client/util/SharingManager.tsx
@@ -148,7 +148,7 @@ export class SharingManager extends React.Component<{}> {
                             const a1 = await Cast(link?.anchor1, Doc, null);
                             const a2 = await Cast(link?.anchor2, Doc, null);
                         });
-                        sharingDocs.push({ user, sharingDoc, linkDatabase, userColor: StrCast(sharingDoc.color) });
+                        sharingDocs.push({ user, sharingDoc, linkDatabase, userColor: StrCast(sharingDoc.userColor) });
                     }
                 }
             });
@@ -367,11 +367,11 @@ export class SharingManager extends React.Component<{}> {
         if (!uniform) dropdownValues.unshift("-multiple-");
         if (override) dropdownValues.unshift("None");
         return dropdownValues.filter(permission => permission !== SharingPermissions.View).map(permission =>
-        (
-            <option key={permission} value={permission}>
-                {permission === SharingPermissions.Add ? "Can Augment" : permission}
-            </option>
-        )
+            (
+                <option key={permission} value={permission}>
+                    {permission === SharingPermissions.Add ? "Can Augment" : permission}
+                </option>
+            )
         );
     }
 
@@ -545,10 +545,10 @@ export class SharingManager extends React.Component<{}> {
                                 {this.sharingOptions(uniform)}
                             </select>
                         ) : (
-                            <div className={"permissions-dropdown"}>
-                                {permissions === SharingPermissions.Add ? "Can Augment" : permissions}
-                            </div>
-                        )}
+                                <div className={"permissions-dropdown"}>
+                                    {permissions === SharingPermissions.Add ? "Can Augment" : permissions}
+                                </div>
+                            )}
                     </div>
                 </div>
             );
@@ -619,10 +619,10 @@ export class SharingManager extends React.Component<{}> {
                                 {this.sharingOptions(uniform, group.title === "Override")}
                             </select>
                         ) : (
-                            <div className={"permissions-dropdown"}>
-                                {permissions}
-                            </div>
-                        )}
+                                <div className={"permissions-dropdown"}>
+                                    {permissions}
+                                </div>
+                            )}
                     </div>
                 </div>
             );