aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/MainView.tsx
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/views/MainView.tsx')
-rw-r--r--src/client/views/MainView.tsx25
1 files changed, 4 insertions, 21 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index f9a5b2bb7..8e5bb3615 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -1,7 +1,7 @@
import { IconName, library } from '@fortawesome/fontawesome-svg-core';
import { faArrowDown, faArrowUp, faBell, faCheck, faCommentAlt, faCut, faExclamation, faFilePdf, faFilm, faFont, faGlobeAsia, faImage, faMusic, faObjectGroup, faPenNib, faRedoAlt, faTable, faThumbtack, faTree, faUndoAlt } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { action, computed, configure, observable, runInAction, reaction } from 'mobx';
+import { action, computed, configure, observable, runInAction, reaction, trace } from 'mobx';
import { observer } from 'mobx-react';
import "normalize.css";
import * as React from 'react';
@@ -76,26 +76,16 @@ export class MainView extends React.Component {
reaction(() => {
let workspaces = CurrentUserUtils.UserDocument.workspaces;
let recent = CurrentUserUtils.UserDocument.recentlyClosed;
- let fakeLibrary = CurrentUserUtils.UserDocument.fakeLibrary;
if (!(recent instanceof Doc)) return 0;
if (!(workspaces instanceof Doc)) return 0;
- if (!(fakeLibrary instanceof Doc)) return 0;
let workspacesDoc = workspaces;
let recentDoc = recent;
- let fakeLibraryDoc = fakeLibrary;
- // console.log("pheight = " + this.getPHeight() + " " + workspacesDoc[HeightSym]() + " " + recentDoc[HeightSym]());
- let libraryHeight = this.getPHeight() - workspacesDoc[HeightSym]() - recentDoc[HeightSym]();
+ let libraryHeight = this.getPHeight() - workspacesDoc[HeightSym]() - recentDoc[HeightSym]() + CurrentUserUtils.UserDocument[HeightSym]() * 0.00001;
return libraryHeight;
}, (libraryHeight: number) => {
- let fakeLibrary = CurrentUserUtils.UserDocument.fakeLibrary;
- let cuser: Doc = fakeLibrary as Doc;//CurrentUserUtils.UserDocument;
- console.log("BEFORE:" + cuser.title + ".height =" + cuser[HeightSym]() + "& .plight = " + cuser.plight);
- if (libraryHeight && Math.abs(cuser[HeightSym]() - libraryHeight) > 5) {
- console.log("ASSIGN to height & plight:" + libraryHeight);
- cuser.height = libraryHeight;
- cuser.plight = libraryHeight;
+ if (libraryHeight && Math.abs(CurrentUserUtils.UserDocument[HeightSym]() - libraryHeight) > 5) {
+ CurrentUserUtils.UserDocument.height = libraryHeight;
}
- console.log("AFTER:" + cuser.title + ".height =" + cuser[HeightSym]() + "& .plight= " + cuser.plight);
}, { fireImmediately: true });
}
@@ -310,17 +300,10 @@ export class MainView extends React.Component {
CollectionDockingView.Instance.AddRightSplit(doc, undefined);
}
};
- computing = false;
@computed
get flyout() {
let sidebar = CurrentUserUtils.UserDocument.sidebar;
- let workspaces = CurrentUserUtils.UserDocument.workspaces;
- let recent = CurrentUserUtils.UserDocument.recentlyClosed;
- let fakeLibrary = CurrentUserUtils.UserDocument.fakeLibrary;
if (!(sidebar instanceof Doc)) return (null);
- if (!(recent instanceof Doc)) return (null);
- if (!(workspaces instanceof Doc)) return (null);
- if (!(fakeLibrary instanceof Doc)) return (null);
let sidebarDoc = sidebar;
return <DocumentView
Document={sidebarDoc}