Merge pull request #73 from wpgaurav/claude/add-image-srcset-OP5W8

Claude/add image srcset op5 w8

Author: wpgaurav

acf-blocks.php

@@ -3,7 +3,7 @@
  * Plugin Name: ACF Blocks
  * Plugin URI: https://github.com/wpgaurav/acf-blocks-plugin
  * Description: A collection of ACF Pro blocks for the WordPress block editor with automatic field group registration.
- * Version: 2.5.0
+ * Version: 2.5.1
  * Requires at least: 6.0
  * Requires PHP: 7.4
  * Author: Gaurav Tiwari
@@ -19,7 +19,7 @@
 }
 
 // Plugin constants
-define( 'ACF_BLOCKS_VERSION', '2.5.0' );
+define( 'ACF_BLOCKS_VERSION', '2.5.1' );
 define( 'ACF_BLOCKS_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'ACF_BLOCKS_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'ACF_BLOCKS_PLUGIN_FILE', __FILE__ );

includes/compat.php

@@ -252,6 +252,19 @@ function acf_blocks_resolve_image( $image, $fallback_alt = '', $size = 'medium'
     // Case 3: Direct URL string
     if ( is_string( $image ) && filter_var( $image, FILTER_VALIDATE_URL ) ) {
         $result['src'] = $image;
+        // Try to find an attachment ID for same-domain URLs (e.g. localized images).
+        $attachment_id = acf_blocks_url_to_attachment_id( $image );
+        if ( $attachment_id ) {
+            $sized = wp_get_attachment_image_src( $attachment_id, $size );
+            if ( $sized ) {
+                $result['src'] = $sized[0];
+            }
+            $img_alt = get_post_meta( $attachment_id, '_wp_attachment_image_alt', true );
+            if ( $img_alt && empty( $fallback_alt ) ) {
+                $result['alt'] = $img_alt;
+            }
+            $result = acf_blocks_attach_srcset( $result, $attachment_id, $size );
+        }
         return $result;
     }
 
@@ -286,6 +299,35 @@ function acf_blocks_attach_srcset( $result, $attachment_id, $size ) {
     return $result;
 }
 
+/**
+ * Try to find a WordPress attachment ID from a same-domain image URL.
+ *
+ * Uses attachment_url_to_postid() which looks up the _wp_attached_file meta.
+ * Only runs the lookup for URLs that belong to the current site to avoid
+ * unnecessary database queries for external images.
+ *
+ * @param string $url The image URL to look up.
+ * @return int Attachment ID, or 0 if not found or external URL.
+ */
+function acf_blocks_url_to_attachment_id( $url ) {
+    $site_host = wp_parse_url( home_url(), PHP_URL_HOST );
+    $url_host  = wp_parse_url( $url, PHP_URL_HOST );
+
+    if ( ! $url_host || ! $site_host ) {
+        return 0;
+    }
+
+    // Only look up same-domain or subdomain URLs.
+    $site_bare = preg_replace( '/^www\./i', '', $site_host );
+    $url_bare  = preg_replace( '/^www\./i', '', $url_host );
+
+    if ( $url_bare !== $site_bare && ! str_ends_with( $url_bare, '.' . $site_bare ) ) {
+        return 0;
+    }
+
+    return (int) attachment_url_to_postid( $url );
+}
+
 /**
  * Get a nested repeater from flat block data.
  *

includes/image-localizer.php

@@ -207,6 +207,8 @@ function acf_blocks_download_external_image( $url ) {
 
     // Already downloaded — return cached path.
     if ( file_exists( $target_path ) ) {
+        // Ensure a WP attachment exists for srcset support.
+        acf_blocks_ensure_localised_attachment( $target_path, $target_url, $filename );
         return $target_url;
     }
 
@@ -246,9 +248,90 @@ function acf_blocks_download_external_image( $url ) {
         return false;
     }
 
+    // Register as a WP attachment so WordPress generates image sizes for srcset.
+    acf_blocks_ensure_localised_attachment( $target_path, $target_url, $filename );
+
     return $target_url;
 }
 
+/**
+ * Ensure a localized image file has a corresponding WordPress attachment.
+ *
+ * Creates an attachment post and generates image metadata (thumbnails)
+ * if one does not already exist. This enables srcset/sizes support for
+ * images downloaded by the localizer.
+ *
+ * @param string $file_path Absolute path to the image file.
+ * @param string $file_url  Public URL of the image file.
+ * @param string $filename  The filename (e.g. "md5hash.jpg").
+ * @return int Attachment ID, or 0 on failure.
+ */
+function acf_blocks_ensure_localised_attachment( $file_path, $file_url, $filename ) {
+    // Check if an attachment already exists for this file.
+    $existing_id = acf_blocks_get_attachment_id_by_file( $file_path );
+    if ( $existing_id ) {
+        return $existing_id;
+    }
+
+    // Determine MIME type.
+    $mime_type = wp_check_filetype( $filename )['type'];
+    if ( ! $mime_type ) {
+        return 0;
+    }
+
+    // Build the relative path WordPress expects for _wp_attached_file meta.
+    $upload_dir = wp_upload_dir();
+    $relative_path = str_replace( trailingslashit( $upload_dir['basedir'] ), '', $file_path );
+
+    $attachment_data = array(
+        'post_title'     => sanitize_file_name( pathinfo( $filename, PATHINFO_FILENAME ) ),
+        'post_mime_type' => $mime_type,
+        'post_status'    => 'inherit',
+    );
+
+    $attachment_id = wp_insert_attachment( $attachment_data, $file_path );
+
+    if ( ! $attachment_id || is_wp_error( $attachment_id ) ) {
+        return 0;
+    }
+
+    // Set the correct relative path so attachment_url_to_postid() can find it.
+    update_post_meta( $attachment_id, '_wp_attached_file', $relative_path );
+
+    // Generate image sizes and metadata.
+    if ( ! function_exists( 'wp_generate_attachment_metadata' ) ) {
+        require_once ABSPATH . 'wp-admin/includes/image.php';
+    }
+
+    $metadata = wp_generate_attachment_metadata( $attachment_id, $file_path );
+    if ( ! empty( $metadata ) ) {
+        wp_update_attachment_metadata( $attachment_id, $metadata );
+    }
+
+    return $attachment_id;
+}
+
+/**
+ * Find an existing attachment ID by its file path.
+ *
+ * @param string $file_path Absolute path to the image file.
+ * @return int Attachment ID, or 0 if not found.
+ */
+function acf_blocks_get_attachment_id_by_file( $file_path ) {
+    $upload_dir = wp_upload_dir();
+    $relative_path = str_replace( trailingslashit( $upload_dir['basedir'] ), '', $file_path );
+
+    global $wpdb;
+    $attachment_id = $wpdb->get_var(
+        $wpdb->prepare(
+            "SELECT post_id FROM {$wpdb->postmeta} WHERE meta_key = '_wp_attached_file' AND meta_value = %s LIMIT 1",
+            $relative_path
+        )
+    );
+
+    return $attachment_id ? (int) $attachment_id : 0;
+}
+
 /**
  * Get (and create if needed) the local image storage directory.
  *