@dative-gpi/foundation-shared-components 1.0.105 → 1.0.107

package/components/FSDialog.vue

@@ -4,7 +4,7 @@
     :class="classes"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"
-    @click="$emit('update:modelValue', false)"
+    :width="$props.width"
     v-bind="$attrs"
   >
     <slot>
@@ -14,7 +14,6 @@
         :width="$props.width"
         :modelValue="$props.modelValue"
         @update:modelValue="$emit('update:modelValue', $event)"
-        @click.stop="$emit('click', $event)"
       >
         <template
           v-for="(_, name) in $slots"

package/components/map/FSMap.vue

@@ -327,7 +327,24 @@ export default defineComponent({
       if(!map.value) {
         return;
       }
-      map.value.flyTo(calculateTargetPosition(latLng(lat, lng), zoom), zoom, options);
+
+      if(isExtraSmall.value) {
+        // We wait for bottom offset to be calculated and stable to focus on the right position
+        let tries = 0;
+        let oldBottomOffset = bottomOffset.value;
+        const interval = setInterval(() => {
+          if(oldBottomOffset === bottomOffset.value || tries >= 30) {
+            clearInterval(interval);
+            map.value!.flyTo(calculateTargetPosition(latLng(lat, lng), zoom), zoom, options);
+          }
+          oldBottomOffset = bottomOffset.value;
+          tries++;
+        }, 20);
+        
+      } else {
+        map.value.flyTo(calculateTargetPosition(latLng(lat, lng), zoom), zoom, options);
+      }
+      
     }
 
     const setView = (lat: number, lng: number, zoom: number) => {
@@ -338,23 +355,23 @@ export default defineComponent({
     }
 
     const fitBounds = (bounds: LatLngBounds, options?: FitBoundsOptions) => {
-      if (!map.value) {
-        return;
-      }
-
-      let paddingRatio = 1
-      if(leftOffset.value) {
-        paddingRatio = leftOffset.value / map.value.getSize().x
-      }
-      else if(bottomOffset.value) {
-        paddingRatio = bottomOffset.value / map.value.getSize().y
-      }
-      if(paddingRatio > 0.5) {
-        paddingRatio = 0.5;
-      }
-      const paddedBounds = bounds.pad(paddingRatio);
+      if (!map.value) {return;}
+      const paddingTopLeft: [number, number] = [
+        leftOffset.value,
+        0
+      ];
+
+      const paddingBottomRight: [number, number] = [
+        0,
+        bottomOffset.value
+      ];
+      const paddingOptions = {
+        paddingTopLeft,
+        paddingBottomRight,
+        ...options,
+      };
 
-      map.value.fitBounds(paddedBounds, options);
+      map.value.fitBounds(bounds, paddingOptions);
     };
 
     onMounted(() => {

package/components/map/FSMapLayerButton.vue

@@ -7,7 +7,6 @@
   />
   <FSDialog
     v-model="dialog"
-    width="500px"
     :title="$tr('ui.map.select-layer', 'Select layer')"
     :contained="true"
   >
@@ -16,6 +15,7 @@
     >
       <FSRow
         align="center-center"
+        :wrap="false"
       >
         <FSImageCard
           v-for="layer in layers"

package/components/map/FSMapOverlay.vue

@@ -10,7 +10,7 @@
     v-show="isExtraSmall"
     ref="mobileOverlayWrapper"
     class="fs-map-overlay-mobile"
-    :style="{ height: $props.mode === 'expand' ? '90%' : ($props.mode === 'half' ? '50%' : '20px') }"
+    :style="{ height: $props.mode === 'expand' ? '90%' : ($props.mode === 'half' ? '60%' : '20px') }"
   >
     <FSCard
       width="100%"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.105",
+  "version": "1.0.107",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.105",
-    "@dative-gpi/foundation-shared-services": "1.0.105"
+    "@dative-gpi/foundation-shared-domain": "1.0.107",
+    "@dative-gpi/foundation-shared-services": "1.0.107"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "10e4ece3df98871b0af99934e5aa86a0e7ae801b"
+  "gitHead": "eb566a0c7b51ca46c2d469196aa8e6e83b70bae3"
 }

package/styles/components/fs_dialog.scss

@@ -1,16 +1,9 @@
 .fs-dialog-mobile > .v-overlay__content {
   flex-direction: column-reverse !important;
-}
-
-.fs-dialog > .v-overlay__content {
-  justify-content: center !important;
-  align-items: center !important;
-}
 
-.v-dialog > .v-overlay__content {
   max-height: 100vh !important;
   max-width: 100vw !important;
   height: 100% !important;
   width: 100% !important;
   margin: 0 !important;
-}
+}

package/styles/components/fs_image_card.scss

@@ -1,7 +1,7 @@
 .fs-image-card {
   > .fs-card {
     background-image: var(--fs-image-card-background);
-    background-size: 100%;
+    background-size: cover;
     background-position: center;
   }
 

package/tools/alertsTools.ts

@@ -47,9 +47,10 @@ export const AlertTools = {
   },
   criticityLabel(value: Criticity): string {
     switch (value) {
-      case Criticity.Warning: return $tr("ui.alert.warning", "Warning");
-      case Criticity.Error: return $tr("ui.alert.error", "Error");
-      default: return $tr("ui.alert.information", "Information");
+      case Criticity.Warning: return $tr("ui.criticity.warning", "Warning");
+      case Criticity.Error: return $tr("ui.criticity.error", "Error");
+      case Criticity.Information: return $tr("ui.criticity.information", "Information")
+      default: return $tr("ui.criticity.none", "None");
     }
   }
 }