fixes: simple annotation no longer clickable, title text no longer se…

…lectable
Smithsonian · Jun 23, 2019 · 69fc05b · 69fc05b
1 parent c158ba1
commit 69fc05b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/libs/ff-ui b/libs/ff-ui
diff --git a/source/client/annotations/StandardSprite.ts b/source/client/annotations/StandardSprite.ts
@@ -19,7 +19,7 @@ import * as THREE from "three";
 
 import math from "@ff/core/math";
 
-import { customElement, PropertyValues, html, render } from "@ff/ui/CustomElement";
+import { customElement, PropertyValues } from "@ff/ui/CustomElement";
 import Button from "@ff/ui/Button";
 
 import AnnotationSprite, { Annotation, AnnotationElement } from "./AnnotationSprite";
@@ -121,7 +121,7 @@ class StandardAnnotation extends AnnotationElement
     protected firstConnected()
     {
         super.firstConnected();
-        this.classList.add("sv-beam-annotation");
+        this.classList.add("sv-standard-annotation");
     }
 
     protected update(changedProperties: PropertyValues): void

diff --git a/source/client/ui/explorer/styles.scss b/source/client/ui/explorer/styles.scss
@@ -187,6 +187,7 @@ $pad: $canvas-border-width + $main-menu-button-size + 8px;
     padding: 2px 0;
     font-size: 0.9rem;
     font-weight: bold;
+    @include noselect;
   }
 
   .sv-description {
@@ -198,6 +199,10 @@ $pad: $canvas-border-width + $main-menu-button-size + 8px;
   }
 }
 
+.sv-standard-annotation {
+  pointer-events: none;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // CHROME VIEW
 
@@ -262,6 +267,7 @@ $pad: $canvas-border-width + $main-menu-button-size + 8px;
     font-size: 1.2rem;
     white-space: pre;
     color: $color-text-light;
+    @include noselect;
 
     span {
       color: transparent;
@@ -431,7 +437,9 @@ $tour-entry-indent: 12px;
   border-left: $section-border;
   border-right: $section-border;
   margin: 0 -1px 0 -1px; // side borders disappear on smaller screens
+
   pointer-events: auto;
+  @include noselect;
 
   .sv-group {
     display: flex;

diff --git a/source/client/ui/story/styles.scss b/source/client/ui/story/styles.scss
@@ -30,6 +30,14 @@
   }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// EXPLORER OVERRIDES
+
+.sv-annotation {
+  // ensure annotations are always clickable in story tool
+  pointer-events: auto !important;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // MAIN VIEW