From 2d6895931df31eeea68a95144b122ef407214d54 Mon Sep 17 00:00:00 2001
From: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Fri, 3 May 2024 14:23:33 +0200
Subject: [PATCH] Fixed responsiveness

---
 .../src/components/modules/ModuleTeaser.vue   |   5 +-
 client/src/components/ui/WagtailImage.vue     | 107 +++++++++++-------
 2 files changed, 66 insertions(+), 46 deletions(-)

diff --git a/client/src/components/modules/ModuleTeaser.vue b/client/src/components/modules/ModuleTeaser.vue
index 03b2bc40..4c936d7d 100644
--- a/client/src/components/modules/ModuleTeaser.vue
+++ b/client/src/components/modules/ModuleTeaser.vue
@@ -106,10 +106,7 @@ const moduleLink = computed(() => {
     width: 100%;
     max-height: 150px;
     height: 150px;
-    background-position: center;
-    background-size: 100% auto;
-    background-repeat: no-repeat;
-    // prevent image from shrinking
+    //prevent image from shrinking
     flex-shrink: 0;
   }
 
diff --git a/client/src/components/ui/WagtailImage.vue b/client/src/components/ui/WagtailImage.vue
index ccef9a60..75686ca2 100644
--- a/client/src/components/ui/WagtailImage.vue
+++ b/client/src/components/ui/WagtailImage.vue
@@ -1,20 +1,26 @@
 <template>
-  <div
-    :class="['wagtail-image', { loaded: loaded }]"
-    :style="backgroundStyle"
-  >
-    <img
-      :src="props.src"
-      :srcset="props.srcset"
-      :alt="props.alt"
-      class="wagtail-image__image"
-      :sizes="computedSizes"
-      loading="eager"
-      v-show="loaded"
+
+<div class="wagtail-image">
+
+    <div
+      :class="['wagtail-image__background', { loaded: loaded }]"
+      :style="{height: backgroundHeight}"
       ref="imgElement"
-      @load="handleLoad"
-    />
-  </div>
+    >
+      <img
+        :src="props.src"
+        :srcset="props.srcset"
+        :alt="props.alt"
+        class="wagtail-image__image"
+        :sizes="computedSizes"
+        loading="eager"
+        v-show="loaded"
+        @load="handleLoad"
+      />
+    </div>
+
+</div>
+
 </template>
 <script setup lang="ts">
 import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
@@ -35,13 +41,46 @@ const imgElement = ref(null);
 const width = ref(0);
 const height = ref(0);
 const loaded = ref(false);
+const backgroundHeight = ref();
+const scaledHeight = ref()
 
+//
 const updateDimensions = () => {
   if (imgElement.value && imgElement.value.parentElement) {
     const { clientWidth, clientHeight } = imgElement.value.parentElement;
     width.value = clientWidth;
     height.value = clientHeight;
   }
+  calculateBackgroundHeight();
+  console.log('sizes ', width.value, height.value);
+};
+
+const calculateBackgroundHeight = () => {
+  // calculate the hight of the background so, that you see a gray box of correct height before image is loaded
+  console.log('calculateBackgrondHeight');
+  if (width.value) {
+    const scalingFactor = width.value / props.originalWidth;
+    scaledHeight.value = Math.round(props.originalHeight * scalingFactor);
+    console.log(width.value / scaledHeight.value);
+
+    if (height.value > 3 && height.value < scaledHeight.value && imgElement.value) {
+      // if parents height is limited and smaller than the scaled height
+      const { clientWidth, clientHeight } = imgElement.value.parentElement;
+      backgroundHeight.value = `${clientHeight}px`;
+      console.log('calculateBackgrondHeight a', backgroundHeight.value);
+      return
+    }
+
+    if (width.value) {
+      backgroundHeight.value = `${scaledHeight.value}px`;
+            console.log('calculateBackgrondHeight b ', backgroundHeight.value);
+            return;
+
+    }
+  }
+  backgroundHeight.value = '100%';
+        console.log('calculateBackgrondHeight c', backgroundHeight.value);
+
 };
 
 const handleLoad = () => {
@@ -64,26 +103,6 @@ const computedSizes = computed(() => {
   return size;
 });
 
-const backgroundStyle = computed(() => {
-  const styles = {
-    width: '100%',
-    height: '100%',
-  };
-  if (width.value) {
-    const scalingFactor = width.value / props.originalWidth;
-    const scaledHeight = Math.round(props.originalHeight * scalingFactor);
-    const scaledWidth = Math.round(props.originalWidth * scalingFactor);
-
-    if (props.originalWidth) {
-      styles.width = `${scaledWidth}px`;
-    }
-    if (props.originalHeight) {
-      styles.height = `${scaledHeight}px`;
-    }
-  }
-  return styles;
-});
-
 onMounted(() => {
   updateDimensions();
   window.addEventListener('resize', updateDimensions);
@@ -100,18 +119,22 @@ onBeforeUnmount(() => {
 .wagtail-image {
   overflow: hidden;
   width: 100%;
-  height: 100%;
-  background-color: $color-silver-light;
+
+
+
+  &__background {
+    background-color: $color-silver-light;
+    border: 1px red solid;
+
+  }
 
   &__image {
     width: 100%;
-    height: 100%;
-    object-fit: cover;
-    object-position: center;
+    border: 1px green solid;
   }
 }
 
-.wagtail-image.loaded {
-  background-color: white;
+.wagtail-image__background.loaded {
+  background-color: transparent;
 }
 </style>