@alpaca-editor/sharedien-dam 1.0.4146 → 1.0.4147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alpaca-editor/sharedien-dam",
-  "version": "1.0.4146",
+  "version": "1.0.4147",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/src/DamSelectorButton.tsx

@@ -1,11 +1,12 @@
-import { ClientFieldButton, PictureRawValue } from "@alpaca-editor/core";
+import { ClientFieldButton, PictureRawValue, VariantFieldActionProps } from "@alpaca-editor/core";
 import { DamSelector } from "./DamSelector";
 import { DamImageValue, DamSelectorProps } from "./types";
 
 export const DamSelectorButton: ClientFieldButton = {
-  label: "Open sharedien DAM",
+  label: "Select from DAM",
   icon: "pi pi-external-link",
-  clientAction: async ({ editContext, field }) => {
+  showInMenu: false, // Primary action - appears outside menu
+  clientAction: async ({ editContext, field, variantName: contextVariantName }: VariantFieldActionProps) => {
     const data = await editContext.openDialog<DamImageValue, DamSelectorProps>(DamSelector, { 
       language: field.descriptor.item.language 
     });
@@ -22,24 +23,43 @@ export const DamSelectorButton: ClientFieldButton = {
         }
       })();
 
-      if (raw.Variants && raw.Variants.length > 0 && raw.Variants[0]?.Name) {
-        const variantName = raw.Variants[0].Name;
-        const selected = raw.Variants.find((x: any) => x.Name == variantName);
-        if (selected) {
-          selected.MediaId = data.mediaId;
-          selected.VideoId = data.videoId;
-        } else {
-          raw.Variants.push({
-            Name: variantName,
-            MediaId: data.mediaId,
-            VideoId: data.videoId,
-          });
+      // Get variant name from context (when called from PictureEditor variant button)
+      // or fallback to trying to determine it from field data
+      let variantName: string | undefined = contextVariantName;
+      
+      if (!variantName && raw.Variants && raw.Variants.length > 0) {
+        // Use the first variant's name if available
+        variantName = raw.Variants[0]?.Name;
+      }
+      
+      // If we still don't have a variant name, try to get it from the field's value
+      if (!variantName && field.value && typeof field.value === 'object' && 'variants' in field.value) {
+        const variants = (field.value as any).variants;
+        if (Array.isArray(variants) && variants.length > 0 && variants[0]?.name) {
+          variantName = variants[0].name;
         }
-      } else {
-        console.warn("No existing variants with valid names found in picture field. Cannot determine variant name for DAM selection.");
+      }
+
+      if (!variantName) {
+        console.warn("Cannot determine variant name for DAM selection. No variants found in picture field.");
         return;
       }
 
+      // Update or create the variant
+      if (!raw.Variants) raw.Variants = [];
+      const selected = raw.Variants.find((x: any) => x.Name == variantName);
+      
+      if (selected) {
+        selected.MediaId = data.mediaId;
+        selected.VideoId = data.videoId;
+      } else {
+        raw.Variants.push({
+          Name: variantName,
+          MediaId: data.mediaId,
+          VideoId: data.videoId,
+        });
+      }
+
       editContext!.operations.editField({
         field: field.descriptor,
         rawValue: JSON.stringify(raw),
@@ -48,6 +68,6 @@ export const DamSelectorButton: ClientFieldButton = {
     }
   },
   isGenerator: false,
-  id: "open-sharedien-dam",
-  description: "Opens the sharedien DAM to select an image",
+  id: "select-from-dam",
+  description: "Opens the sharedien DAM to select an image or video",
 }

package/src/index.ts

@@ -19,15 +19,16 @@ export function configureSharedienDam(
   if (!configuration.fieldTypes.picture) {
     configuration.fieldTypes.picture = {
       editor: () => null,
-      buttons: []
+      variantButtons: []
     }
   }
 
-  if (!configuration.fieldTypes.picture.buttons) {
-    configuration.fieldTypes.picture.buttons = [];
+  if (!configuration.fieldTypes.picture.variantButtons) {
+    configuration.fieldTypes.picture.variantButtons = [];
   }
 
-  //configuration.fieldTypes.picture.buttons.push(DamSelectorButton);
+  // Add DAM selector button as a variant button (appears for each picture variant)
+  configuration.fieldTypes.picture.variantButtons.push(DamSelectorButton);
 
   return configuration;
 }