@dative-gpi/foundation-shared-components 1.0.12 → 1.0.14

package/components/FSImage.vue

@@ -1,228 +1,49 @@
 <template>
-  <v-img
-    class="fs-image"
-    ref="imageRef"
-    :height="computedHeight"
-    :width="computedWidth"
-    :cover="$props.cover"
-    :src="realSource"
-    :style="style"
+  <FSImageUI
+    :blurhash="image"
+    :source="source"
     @error="onError"
     v-bind="$attrs"
-  >
-    <template
-      #placeholder
-    >
-      <FSLoader
-        v-if="$props.imageId"
-        class="fs-image-load"
-        height="100%"
-        width="100%"
-        :borderRadius="$props.borderRadius"
-      />
-    </template>
-    <template
-      #error
-    >
-      <FSLoader
-        v-if="!blurHash"
-        class="fs-image-load"
-        height="100%"
-        width="100%"
-        :borderRadius="$props.borderRadius"
-      />
-      <canvas
-        ref="canvasRef"
-      />
-    </template>
-  </v-img>
+  />
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, type PropType, ref, type StyleValue, watch } from "vue";
-import { decode, isBlurhashValid } from "blurhash";
+import { computed, defineComponent, type PropType } from "vue";
 
-import { IMAGE_RAW_EXTENSION_URL, IMAGE_RAW_URL } from "@dative-gpi/foundation-shared-services/config/urls";
-import { useExtensionJwt, useImageBlurHash } from "@dative-gpi/foundation-shared-services/composables";
-import { sizeToVar, varToSize } from "@dative-gpi/foundation-shared-components/utils";
+import { IMAGE_RAW_URL } from "@dative-gpi/foundation-shared-services/config/urls";
 
-import FSLoader from "./FSLoader.vue";
+import { useImage } from "@dative-gpi/foundation-shared-services/composables";
+
+import FSImageUI from "./FSImageUI.vue";
 
 export default defineComponent({
   name: "FSImage",
   components: {
-    FSLoader
+    FSImageUI
   },
   props: {
-    height: {
-      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
-      required: false,
-      default: null
-    },
-    width: {
-      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
-      required: false,
-      default: null
-    },
     imageId: {
       type: String as PropType<string | null>,
       required: false,
       default: null
-    },
-    imageB64: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
-    source: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
-    aspectRatio: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
-    borderRadius: {
-      type: [String, Number],
-      required: false,
-      default: "4px"
-    },
-    cover: {
-      type: Boolean,
-      required: false,
-      default: true
     }
   },
   setup(props) {
-    const { fetch: fetchBlurHash, entity: blurHash } = useImageBlurHash();
-    const { jwt } = useExtensionJwt();
+    const { get: getImage, entity: image } = useImage();
 
-    const imageRef = ref<HTMLFormElement | null>(null);
-    const canvasRef = ref<HTMLCanvasElement | null>(null);
-
-    const signatures = ref<{ [key: string]: string }>({
-      JVBERi0    : "application/pdf",
-      R0lGODdh   : "image/gif",
-      R0lGODlh   : "image/gif",
-      iVBORw0KGgo: "image/png",
-      "/9j/"     : "image/jpg",
-    });
-
-    const style = computed((): StyleValue => ({
-      "--fs-image-border-radius"   : sizeToVar(props.borderRadius),
-      "--fs-image-blurhash-opacity": blurHash.value ? "1" : "0"
-    }));
-
-    const computedHeight = computed((): string | undefined => {
-      if (props.height) {
-        return sizeToVar(props.height);
-      }
-      if (props.width) {
-        if (typeof (props.width) === "string") {
-          return undefined;
-        }
-        if (props.aspectRatio) {
-          const split = props.aspectRatio.split('/');
-          if (split.length === 2 && !isNaN(parseFloat(split[0])) && !isNaN(parseFloat(split[1]))) {
-            return sizeToVar(varToSize(props.width) * (parseFloat(split[1]) / parseFloat(split[0])));
-          }
-        }
-        return sizeToVar(props.width);
-      }
-      return undefined;
-    });
-
-    const computedWidth = computed((): string | undefined => {
-      if (props.width) {
-        return sizeToVar(props.width);
-      }
-      if (props.height) {
-        if (typeof (props.height) === "string") {
-          return undefined;
-        }
-        if (props.aspectRatio) {
-          const split = props.aspectRatio.split('/');
-          if (split.length === 2 && !isNaN(parseFloat(split[0])) && !isNaN(parseFloat(split[1]))) {
-            return sizeToVar(varToSize(props.height) * (parseFloat(split[0]) / parseFloat(split[1])));
-          }
-        }
-        return sizeToVar(props.height);
-      }
-      return undefined;
-    });
-
-    const realSource = computed((): string | undefined => {
-      if (props.imageB64) {
-        if (imageType.value && imageData.value) {
-          return `${imageType.value},${imageData.value}`;
-        }
-      }
-      else if (props.imageId) {
-        if (jwt.value) {
-          return IMAGE_RAW_EXTENSION_URL(props.imageId, jwt.value);
-        }
-        return IMAGE_RAW_URL(props.imageId);
-      }
-      else if (props.source) {
-        return props.source;
-      }
-    });
-
-    const imageData = computed((): string | null => {
-      if (props.imageB64 && props.imageB64.includes(",")) {
-        return props.imageB64.split(",")[1];
-      }
-      return props.imageB64;
-    });
-
-    const imageType = computed((): string | null => {
-      if (props.imageB64 && props.imageB64.includes(",")) {
-        return props.imageB64.split(",")[0];
-      }
-      if (props.imageB64) {
-        for (const s in signatures.value) {
-          if (props.imageB64.startsWith(s)) {
-            return `data:${signatures.value[s]};base64`;
-          }
-        }
-      }
-      return null;
+    const source = computed(() => {
+      return props.imageId ? IMAGE_RAW_URL(props.imageId) : null;
     });
 
     const onError = (): void => {
       if (props.imageId) {
-        fetchBlurHash(props.imageId);
+        getImage(props.imageId);
       }
     };
 
-    watch(() => blurHash.value, () => {
-      if (canvasRef.value && imageRef.value) {
-        if (blurHash.value && isBlurhashValid(blurHash.value.blurHash).result) {
-          const ctx = canvasRef.value.getContext("2d");
-          if (ctx) {
-            const width = (imageRef.value as any).$el.clientWidth;
-            const height = (imageRef.value as any).$el.clientHeight;
-            const pixels = decode(blurHash.value.blurHash, width, height);
-            const imageData = ctx.createImageData(width, height);
-            canvasRef.value.width = width;
-            canvasRef.value.height = height;
-            imageData.data.set(pixels);
-            ctx.putImageData(imageData, 0, 0);
-          }
-        }
-      }
-    });
-
     return {
-      computedHeight,
-      computedWidth,
-      realSource,
-      canvasRef,
-      imageRef,
-      blurHash,
-      style,
+      source,
+      image,
       onError
     };
   }

package/components/FSImageUI.vue

@@ -0,0 +1,219 @@
+<template>
+  <v-img
+    class="fs-image"
+    ref="imageRef"
+    :height="computedHeight"
+    :width="computedWidth"
+    :cover="$props.cover"
+    :src="realSource"
+    :style="style"
+    @error="$emit('error')"
+    v-bind="$attrs"
+  >
+    <template
+      #placeholder
+    >
+      <FSLoader
+        v-if="$props.loading"
+        class="fs-image-load"
+        height="100%"
+        width="100%"
+        :borderRadius="$props.borderRadius"
+      />
+    </template>
+    <template
+      #error
+    >
+      <FSLoader
+        v-if="!$props.blurHash"
+        class="fs-image-load"
+        height="100%"
+        width="100%"
+        :borderRadius="$props.borderRadius"
+      />
+      <canvas
+        ref="canvasRef"
+      />
+    </template>
+  </v-img>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, type PropType, ref, type StyleValue, watch } from "vue";
+import { decode, isBlurhashValid } from "blurhash";
+
+import type { ImageDetails } from "@dative-gpi/foundation-shared-domain/models";
+
+import { sizeToVar, varToSize } from "@dative-gpi/foundation-shared-components/utils";
+
+import FSLoader from "./FSLoader.vue";
+
+export default defineComponent({
+  name: "FSImageUI",
+  components: {
+    FSLoader
+  },
+  props: {
+    height: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: null
+    },
+    width: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: null
+    },
+    imageB64: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    source: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    blurHash: {
+      type: Object as PropType<ImageDetails | null>,
+      required: false,
+      default: null
+    },
+    aspectRatio: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    borderRadius: {
+      type: [String, Number],
+      required: false,
+      default: "4px"
+    },
+    cover: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    loading: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  },
+  setup(props) {
+
+    const imageRef = ref<HTMLFormElement | null>(null);
+    const canvasRef = ref<HTMLCanvasElement | null>(null);
+
+    const signatures = ref<{ [key: string]: string }>({
+      JVBERi0    : "application/pdf",
+      R0lGODdh   : "image/gif",
+      R0lGODlh   : "image/gif",
+      iVBORw0KGgo: "image/png",
+      "/9j/"     : "image/jpg",
+    });
+
+    const style = computed((): StyleValue => ({
+      "--fs-image-border-radius"   : sizeToVar(props.borderRadius),
+      "--fs-image-blurhash-opacity": props.blurHash ? "1" : "0"
+    }));
+
+    const computedHeight = computed((): string | undefined => {
+      if (props.height) {
+        return sizeToVar(props.height);
+      }
+      if (props.width) {
+        if (typeof (props.width) === "string") {
+          return undefined;
+        }
+        if (props.aspectRatio) {
+          const split = props.aspectRatio.split('/');
+          if (split.length === 2 && !isNaN(parseFloat(split[0])) && !isNaN(parseFloat(split[1]))) {
+            return sizeToVar(varToSize(props.width) * (parseFloat(split[1]) / parseFloat(split[0])));
+          }
+        }
+        return sizeToVar(props.width);
+      }
+      return undefined;
+    });
+
+    const computedWidth = computed((): string | undefined => {
+      if (props.width) {
+        return sizeToVar(props.width);
+      }
+      if (props.height) {
+        if (typeof (props.height) === "string") {
+          return undefined;
+        }
+        if (props.aspectRatio) {
+          const split = props.aspectRatio.split('/');
+          if (split.length === 2 && !isNaN(parseFloat(split[0])) && !isNaN(parseFloat(split[1]))) {
+            return sizeToVar(varToSize(props.height) * (parseFloat(split[0]) / parseFloat(split[1])));
+          }
+        }
+        return sizeToVar(props.height);
+      }
+      return undefined;
+    });
+
+    const realSource = computed((): string | undefined => {
+      if (props.imageB64) {
+        if (imageType.value && imageData.value) {
+          return `${imageType.value},${imageData.value}`;
+        }
+      }
+      else if (props.source) {
+        return props.source;
+      }
+    });
+
+    const imageData = computed((): string | null => {
+      if (props.imageB64 && props.imageB64.includes(",")) {
+        return props.imageB64.split(",")[1];
+      }
+      return props.imageB64;
+    });
+
+    const imageType = computed((): string | null => {
+      if (props.imageB64 && props.imageB64.includes(",")) {
+        return props.imageB64.split(",")[0];
+      }
+      if (props.imageB64) {
+        for (const s in signatures.value) {
+          if (props.imageB64.startsWith(s)) {
+            return `data:${signatures.value[s]};base64`;
+          }
+        }
+      }
+      return null;
+    });
+
+    watch(() => props.blurHash, () => {
+      if (canvasRef.value && imageRef.value) {
+        if (props.blurHash && isBlurhashValid(props.blurHash.blurHash).result) {
+          const ctx = canvasRef.value.getContext("2d");
+          if (ctx) {
+            const width = (imageRef.value as any).$el.clientWidth;
+            const height = (imageRef.value as any).$el.clientHeight;
+            const pixels = decode(props.blurHash.blurHash, width, height);
+            const imageData = ctx.createImageData(width, height);
+            canvasRef.value.width = width;
+            canvasRef.value.height = height;
+            imageData.data.set(pixels);
+            ctx.putImageData(imageData, 0, 0);
+          }
+        }
+      }
+    });
+
+    return {
+      computedHeight,
+      computedWidth,
+      realSource,
+      canvasRef,
+      imageRef,
+      style
+    };
+  }
+});
+</script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.12",
-    "@dative-gpi/foundation-shared-services": "1.0.12"
+    "@dative-gpi/foundation-shared-domain": "1.0.14",
+    "@dative-gpi/foundation-shared-services": "1.0.14"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "453b59a41537525583f7c9a3b6d2f2023dbd67f3"
+  "gitHead": "e073c5a79111956c451fe05f19c7829246d4784e"
 }