numerous changes to fix bugs and to fix/remove old or hacky code. fixed doc dec resizing. moving this.rootDoc => this.Document . fixing template artifacts.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/client/views/DocumentButtonBar.tsx b/src/client/views/DocumentButtonBar.tsx
index c1ec5b4a4..bd82f7782 100644
--- a/src/client/views/DocumentButtonBar.tsx
+++ b/src/client/views/DocumentButtonBar.tsx
@@ -574,12 +574,12 @@ export class DocumentButtonBar extends React.Component<{ views: () => (DocumentV
         e.stopPropagation();
     };
     render() {
-        if (!this.view0) return null;
-
-        const isText = this.view0.props.Document[this.view0.LayoutFieldKey] instanceof RichTextField;
         const doc = this.view0?.props.Document;
-        const considerPull = isText && this.considerGoogleDocsPull;
-        const considerPush = isText && this.considerGoogleDocsPush;
+        if (!doc || !this.view0) return null;
+
+        const isText = () => doc[this.view0!.LayoutFieldKey] instanceof RichTextField;
+        const considerPull = () => isText() && this.considerGoogleDocsPull;
+        const considerPush = () => isText() && this.considerGoogleDocsPush;
         return (
             <div className="documentButtonBar">
                 <div className="documentButtonBar-button">
@@ -608,11 +608,11 @@ export class DocumentButtonBar extends React.Component<{ views: () => (DocumentV
                 <div className="documentButtonBar-button">{this.recordButton}</div>
                 {!Doc.UserDoc()['documentLinksButton-fullMenu'] ? null : <div className="documentButtonBar-button">{this.shareButton}</div>}
                 {!Doc.UserDoc()['documentLinksButton-fullMenu'] ? null : (
-                    <div className="documentButtonBar-button" style={{ display: !considerPush ? 'none' : '' }}>
+                    <div className="documentButtonBar-button" style={{ display: !considerPush() ? 'none' : '' }}>
                         {this.considerGoogleDocsPush}
                     </div>
                 )}
-                <div className="documentButtonBar-button" style={{ display: !considerPull ? 'none' : '' }}>
+                <div className="documentButtonBar-button" style={{ display: !considerPull() ? 'none' : '' }}>
                     {this.considerGoogleDocsPull}
                 </div>
                 <div className="documentButtonBar-button">{this.menuButton}</div>