Merge branch 'master' into ink_v1

2 files changed, 12 insertions, 0 deletions

diff --git a/src/client/views/collections/collectionLinear/CollectionLinearView.scss b/src/client/views/collections/collectionLinear/CollectionLinearView.scss
index 8fe804466..968048e39 100644
--- a/src/client/views/collections/collectionLinear/CollectionLinearView.scss
+++ b/src/client/views/collections/collectionLinear/CollectionLinearView.scss
@@ -6,6 +6,10 @@
     height: 100%;
     pointer-events: none;
 
+    .collectionLinearView-menuOpener {
+        user-select: none;
+    }
+
     &.true {
         padding-left: 5px;
         padding-right: 5px;
diff --git a/src/client/views/collections/collectionLinear/CollectionLinearView.tsx b/src/client/views/collections/collectionLinear/CollectionLinearView.tsx
index 18a715edf..d67122eff 100644
--- a/src/client/views/collections/collectionLinear/CollectionLinearView.tsx
+++ b/src/client/views/collections/collectionLinear/CollectionLinearView.tsx
@@ -24,6 +24,14 @@ import "./CollectionLinearView.scss";
 type LinearDocument = makeInterface<[typeof documentSchema,]>;
 const LinearDocument = makeInterface(documentSchema);
 
+/**
+ * CollectionLinearView is the class for rendering the horizontal collection 
+ * of documents, it useful for horizontal menus. It can either be expandable
+ * or not using the linearViewExpandable field. 
+ * It is used in the following locations:
+ * - It is used in the popup menu on the bottom left (see docButtons() in MainView.tsx)
+ * - It is used for the context sensitive toolbar at the top (see contMenuButtons() in CollectionMenu.tsx)
+ */
 @observer
 export class CollectionLinearView extends CollectionSubView(LinearDocument) {
     @observable public addMenuToggle = React.createRef<HTMLInputElement>();