Merge pull request #978 from geoadmin/bug-PB-723-full-screen

PB-723: Keep toolbox buttons in full screen mode - #patch
geoadmin · Jul 4, 2024 · 336094d · 336094d
2 parents 50288e3 + ca661e6
commit 336094d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/modules/map/components/cesium/CesiumMap.vue b/src/modules/map/components/cesium/CesiumMap.vue
@@ -69,7 +69,7 @@
         <CesiumGeolocationFeedback v-if="viewerCreated" />
 
         <cesium-compass
-            v-show="isDesktopMode && !isFullScreenMode"
+            v-show="isDesktopMode"
             ref="compass"
             class="position-absolute start-50 translate-middle-x cesium-compass"
         />

diff --git a/src/modules/map/components/toolbox/MapToolbox.vue b/src/modules/map/components/toolbox/MapToolbox.vue
@@ -50,10 +50,10 @@ const is3dActive = computed(() => store.state.cesium.active)
         data-cy="toolbox-right"
     >
         <FullScreenButton v-if="fullScreenButton" />
-        <GeolocButton v-if="geolocButton && !isFullscreenMode" />
-        <ZoomButtons v-if="!isFullscreenMode" />
-        <Toggle3dButton v-if="toggle3dButton && !isFullscreenMode" />
-        <OpenLayersCompassButton v-if="compassButton && !is3dActive && !isFullscreenMode" />
+        <GeolocButton v-if="geolocButton" />
+        <ZoomButtons />
+        <Toggle3dButton v-if="toggle3dButton" />
+        <OpenLayersCompassButton v-if="compassButton && !is3dActive" />
         <slot />
     </div>
 </template>

diff --git a/tests/cypress/tests-e2e/toolboxRight.cy.js b/tests/cypress/tests-e2e/toolboxRight.cy.js
@@ -29,7 +29,7 @@ describe('Testing the buttons of the right toolbox', () => {
 
         // only the map and the fullscreen button should be visible
         cy.get('[data-cy="toolbox-right"]').within(($toolboxRight) => {
-            expect($toolboxRight.children().length).to.eq(1)
+            expect($toolboxRight.children().length).to.eq(4)
         })
         cy.get('[data-cy="app-header"]').should('not.be.visible')
         cy.get('[data-cy="menu-tray"]').should('be.hidden')