Merge pull request #150 from NDLANO/fix/label-position-when-zoomed-in…

…to-static-scene fix: label position when zoomed into static scene
NDLANO · Apr 17, 2024 · 9f7b8dc · 9f7b8dc
2 parents 61edc4d + cdb49fa
commit 9f7b8dc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/scripts/components/Interactions/NavigationButton.js b/scripts/components/Interactions/NavigationButton.js
@@ -540,6 +540,7 @@ export default class NavigationButton extends React.Component {
             navButtonFocused={this.state.innerButtonFocused}
             rendered={this.props.rendered}
             onDoubleClick={this.onDoubleClick.bind(this)}
+            zoomScale={this.props.zoomScale}
           />}
 
       </div>

diff --git a/scripts/components/Interactions/NavigationButtonLabel.js b/scripts/components/Interactions/NavigationButtonLabel.js
@@ -214,6 +214,14 @@ export default class NavigationButtonLabel extends React.Component {
    * Set expand properties.
    */
   setExpandProperties() {
+    /*
+     * Only set expand properties when not zoomed in to avoid 
+     * labels toggling when moving image within the wrapper.
+     */
+    if (this.props.zoomScale !== 1) {
+      return;
+    }
+
     const labelProperties = this.getOverflowProperties();
 
     if (labelProperties.expandDirection !== this.state.expandDirection) {