Add MediaWithCrops<T> to get generic type access to the media item

Author: ronaldbarendse

src/Umbraco.Core/Models/MediaWithCrops.cs

@@ -4,18 +4,73 @@
 namespace Umbraco.Core.Models
 {
     /// <summary>
-    /// Model used in Razor Views for rendering
+    /// Represents a media item with local crops.
     /// </summary>
+    /// <seealso cref="Umbraco.Core.Models.PublishedContent.PublishedContentWrapped" />
     public class MediaWithCrops : PublishedContentWrapped
     {
+        /// <summary>
+        /// Gets the media item.
+        /// </summary>
+        /// <value>
+        /// The media item.
+        /// </value>
         public IPublishedContent MediaItem => Unwrap();
 
+        /// <summary>
+        /// Gets the local crops.
+        /// </summary>
+        /// <value>
+        /// The local crops.
+        /// </value>
         public ImageCropperValue LocalCrops { get; }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaWithCrops" /> class.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="localCrops">The local crops.</param>
         public MediaWithCrops(IPublishedContent content, ImageCropperValue localCrops)
             : base(content)
         {
             LocalCrops = localCrops;
         }
     }
+
+    /// <summary>
+    /// Represents a media item with local crops.
+    /// </summary>
+    /// <typeparam name="T">The type of the media item.</typeparam>
+    /// <seealso cref="Umbraco.Core.Models.PublishedContent.PublishedContentWrapped" />
+    public class MediaWithCrops<T> : MediaWithCrops
+        where T : IPublishedContent
+    {
+        /// <summary>
+        /// Gets the media item.
+        /// </summary>
+        /// <value>
+        /// The media item.
+        /// </value>
+        public new T MediaItem { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MediaWithCrops{T}" /> class.
+        /// </summary>
+        /// <param name="content">The content.</param>
+        /// <param name="localCrops">The local crops.</param>
+        public MediaWithCrops(T content, ImageCropperValue localCrops)
+            : base(content, localCrops)
+        {
+            MediaItem = content;
+        }
+
+        /// <summary>
+        /// Performs an implicit conversion from <see cref="MediaWithCrops{T}" /> to <see cref="T" />.
+        /// </summary>
+        /// <param name="mediaWithCrops">The media with crops.</param>
+        /// <returns>
+        /// The result of the conversion.
+        /// </returns>
+        public static implicit operator T(MediaWithCrops<T> mediaWithCrops) => mediaWithCrops.MediaItem;
+    }
 }

src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs

@@ -120,6 +120,7 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
                             settingsData = null;
                     }
 
+                    // TODO: This should be optimized/cached, as calling Activator.CreateInstance is slow
                     var layoutType = typeof(BlockListItem<,>).MakeGenericType(contentData.GetType(), settingsData?.GetType() ?? typeof(IPublishedElement));
                     var layoutRef = (BlockListItem)Activator.CreateInstance(layoutType, contentGuidUdi, contentData, settingGuidUdi, settingsData);
 

src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs

@@ -67,7 +67,11 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
 
                     localCrops.ApplyConfiguration(configuration);
 
-                    mediaItems.Add(new MediaWithCrops(mediaItem, localCrops));
+                    // TODO: This should be optimized/cached, as calling Activator.CreateInstance is slow
+                    var mediaWithCropsType = typeof(MediaWithCrops<>).MakeGenericType(mediaItem.GetType());
+                    var mediaWithCrops = (MediaWithCrops)Activator.CreateInstance(mediaWithCropsType, mediaItem, localCrops);
+
+                    mediaItems.Add(mediaWithCrops);
 
                     if (!isMultiple)
                     {