Merge branch 'master' into advanced-trails-2-jesus

6 files changed, 62 insertions, 28 deletions

diff --git a/src/client/util/SharingManager.tsx b/src/client/util/SharingManager.tsx
index 9a9097bf7..8d59426ec 100644
--- a/src/client/util/SharingManager.tsx
+++ b/src/client/util/SharingManager.tsx
@@ -378,15 +378,17 @@ export class SharingManager extends React.Component<{}> {
                     }
                 });
 
-                const { left, width, top, height } = this.shareDocumentButtonRef.current!.getBoundingClientRect();
-                TaskCompletionBox.popupX = left - 1.5 * width;
-                TaskCompletionBox.popupY = top - 1.5 * height;
-                TaskCompletionBox.textDisplayed = 'Document shared!';
-                TaskCompletionBox.taskCompleted = true;
-                setTimeout(
-                    action(() => (TaskCompletionBox.taskCompleted = false)),
-                    2000
-                );
+                if (this.shareDocumentButtonRef.current) {
+                    const { left, width, top, height } = this.shareDocumentButtonRef.current.getBoundingClientRect();
+                    TaskCompletionBox.popupX = left - 1.5 * width;
+                    TaskCompletionBox.popupY = top - 1.5 * height;
+                    TaskCompletionBox.textDisplayed = 'Document shared!';
+                    TaskCompletionBox.taskCompleted = true;
+                    setTimeout(
+                        action(() => (TaskCompletionBox.taskCompleted = false)),
+                        2000
+                    );
+                }
 
                 this.layoutDocAcls = false;
                 this.selectedUsers = null;
@@ -555,7 +557,7 @@ export class SharingManager extends React.Component<{}> {
                         background: SettingsManager.userBackgroundColor,
                         color: StrCast(Doc.UserDoc().userColor),
                     }}>
-                    <p className="share-title" style={{ color: StrCast(Doc.UserDoc().userColor) }}>
+                    <p className="share-title" style={{ color: SettingsManager.userColor }}>
                         <div className="share-info" onClick={() => window.open('https://brown-dash.github.io/Dash-Documentation/features/collaboration/', '_blank')}>
                             <FontAwesomeIcon icon={'question-circle'} size={'sm'} onClick={() => window.open('https://brown-dash.github.io/Dash-Documentation/features/collaboration/', '_blank')} />
                         </div>
@@ -563,10 +565,10 @@ export class SharingManager extends React.Component<{}> {
                         {this.focusOn(docs.length < 2 ? StrCast(targetDoc?.title, 'this document') : '-multiple-')}
                     </p>
                     <div className="share-copy-link">
-                        <Button type={Type.TERT} color={StrCast(Doc.UserDoc().userColor)} icon={<FontAwesomeIcon icon={'copy'} size="sm" />} iconPlacement={'left'} text={'Copy Guest URL'} onClick={this.copyURL} />
+                        <Button type={Type.TERT} color={SettingsManager.userColor} icon={<FontAwesomeIcon icon={'copy'} size="sm" />} iconPlacement={'left'} text={'Copy Guest URL'} onClick={this.copyURL} />
                     </div>
                     <div className="close-button">
-                        <Button icon={<FontAwesomeIcon icon={'times'} size={'lg'} />} onClick={this.close} color={StrCast(Doc.UserDoc().userColor)} />
+                        <Button icon={<FontAwesomeIcon icon={'times'} size={'lg'} />} onClick={this.close} color={SettingsManager.userColor} />
                     </div>
                     {admin ? (
                         <div className="share-container">
@@ -608,7 +610,7 @@ export class SharingManager extends React.Component<{}> {
                                     </select>
                                 </div>
                                 <div className="share-button">
-                                    <Button text={'SHARE'} type={Type.TERT} color={StrCast(Doc.UserDoc().userColor)} onClick={this.share} />
+                                    <Button text={'SHARE'} type={Type.TERT} color={SettingsManager.userColor} onClick={this.share} />
                                 </div>
                             </div>
                             <div className="sort-checkboxes">
diff --git a/src/client/views/UndoStack.tsx b/src/client/views/UndoStack.tsx
index a9dfbe8f0..cdc389efe 100644
--- a/src/client/views/UndoStack.tsx
+++ b/src/client/views/UndoStack.tsx
@@ -24,7 +24,7 @@ export class UndoStack extends React.Component<UndoStackProps> {
         return this.props.inline && UndoStack.HideInline ? null : (
             <div className="undoStack-outerContainer">
                 <Popup
-                    text={'Undo/Redo Stack'}
+                    text="stack"
                     color={color}
                     background={background}
                     placement={`top-start`}
diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.scss b/src/client/views/collections/collectionSchema/CollectionSchemaView.scss
index 52ebb7763..9f8ef763a 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.scss
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.scss
@@ -9,12 +9,32 @@
     .schema-table {
         background-color: $white;
         cursor: grab;
+        width: 100%;
 
         .schema-table-content {
             overflow: overlay;
             scroll-behavior: smooth;
         }
 
+        .schema-add {
+            position: relative;
+            height: 30;
+            display: flex;
+            align-items: center;
+            width: 100%;
+            text-align: right;
+            background: lightgray;
+            .editableView-container-editing {
+                width: 100%;
+            }
+            .editableView-input {
+                width: 100%;
+                float: right;
+                text-align: right;
+                background: yellow;
+            }
+        }
+
         .schema-column-menu,
         .schema-filter-menu {
             background: $light-gray;
diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index babe5c810..513bbc3fe 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -63,7 +63,7 @@ export class CollectionSchemaView extends CollectionSubView() {
     public static _minColWidth: number = 25;
     public static _rowMenuWidth: number = 60;
     public static _previewDividerWidth: number = 4;
-    public static _newNodeInputHeight: number = 30;
+    public static _newNodeInputHeight: number = 20;
     public fieldInfos = new ObservableMap<string, FInfo>();
 
     @observable _menuKeys: string[] = [];
@@ -869,14 +869,16 @@ export class CollectionSchemaView extends CollectionSubView() {
                     {this._columnMenuIndex !== undefined && this.renderColumnMenu}
                     {this._filterColumnIndex !== undefined && this.renderFilterMenu}
                     <CollectionSchemaViewDocs schema={this} childDocs={this.sortedDocsFunc} rowHeight={this.rowHeightFunc} setRef={(ref: HTMLDivElement | null) => (this._tableContentRef = ref)} />
-                    <EditableView
-                        GetValue={returnEmptyString}
-                        SetValue={undoable(value => (value ? this.addRow(Docs.Create.TextDocument(value, { title: value, _layout_autoHeight: true })) : false), 'add text doc')}
-                        placeholder={"Type ':' for commands"}
-                        contents={'+ New Node'}
-                        menuCallback={this.menuCallback}
-                        height={CollectionSchemaView._newNodeInputHeight}
-                    />
+                    <div className="schema-add">
+                        <EditableView
+                            GetValue={returnEmptyString}
+                            SetValue={undoable(value => (value ? this.addRow(Docs.Create.TextDocument(value, { title: value, _layout_autoHeight: true })) : false), 'add text doc')}
+                            placeholder={"Type text to create note or ':' to create specific type"}
+                            contents={'+ New Node'}
+                            menuCallback={this.menuCallback}
+                            height={CollectionSchemaView._newNodeInputHeight}
+                        />
+                    </div>
                 </div>
                 {this.previewWidth > 0 && <div className="schema-preview-divider" style={{ width: CollectionSchemaView._previewDividerWidth }} onPointerDown={this.onDividerDown}></div>}
                 {this.previewWidth > 0 && (
diff --git a/src/client/views/topbar/TopBar.tsx b/src/client/views/topbar/TopBar.tsx
index 68446d4e7..5b097e639 100644
--- a/src/client/views/topbar/TopBar.tsx
+++ b/src/client/views/topbar/TopBar.tsx
@@ -1,5 +1,5 @@
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Button, IconButton, isDark, Size, Type } from 'browndash-components';
+import { Button, IconButton, isDark, Size, Toggle, Type } from 'browndash-components';
 import { action, computed, observable, reaction } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
@@ -37,10 +37,10 @@ export class TopBar extends React.Component {
     };
 
     @computed get color() {
-        return StrCast(Doc.UserDoc().userColor, Colors.LIGHT_GRAY);
+        return SettingsManager.userColor;
     }
     @computed get variantColor() {
-        return StrCast(Doc.UserDoc().userVariantColor, Colors.MEDIUM_BLUE);
+        return SettingsManager.userVariantColor;
     }
     @computed get backgroundColor() {
         return PingManager.Instance.IsBeating ? SettingsManager.userBackgroundColor : Colors.MEDIUM_GRAY;
@@ -76,7 +76,17 @@ export class TopBar extends React.Component {
                         <span style={{ color: isDark(this.backgroundColor) ? Colors.LIGHT_BLUE : Colors.MEDIUM_BLUE, fontWeight: 500 }}>dash</span>
                     </div>
                 )}
-                {Doc.ActiveDashboard && <Button text="Explore" tooltip="Browsing mode for directly navigating to documents" size={Size.SMALL} color={this.color} onClick={action(() => (DocumentView.ExploreMode = !DocumentView.ExploreMode))} />}
+                {Doc.ActiveDashboard && (
+                    <Button
+                        text="Explore"
+                        type={Type.TERT}
+                        tooltip="Browsing mode for directly navigating to documents"
+                        size={Size.SMALL}
+                        color={DocumentView.ExploreMode ? this.variantColor : this.color}
+                        background={DocumentView.ExploreMode ? this.color : 'transparent'}
+                        onClick={action(() => (DocumentView.ExploreMode = !DocumentView.ExploreMode))}
+                    />
+                )}
             </div>
         );
     }
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index f17e10d9e..ad0e548ed 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -1001,7 +1001,7 @@ export namespace Doc {
             references.add(doc);
             return;
         }
-        const excludeLists = doc.title === 'My Recently Closed' || doc.title === 'My Header Bar' || doc.title === 'My Dashboards';
+        const excludeLists = ['My Recently Closed', 'My Header Bar', 'My Dashboards'].includes(StrCast(doc.title));
         if (system !== undefined && ((system && !Doc.IsSystem(doc)) || (!system && Doc.IsSystem(doc)))) return;
         references.add(doc);
         Object.keys(doc).forEach(key => {