Move ProductImageThumbnail to WooFoundation

staskus · staskus · commit 68b32d6759e3 · 2025-09-17T10:14:15.000+03:00
diff --git a/Modules/Package.swift b/Modules/Package.swift
@@ -179,7 +179,10 @@ let package = Package(
         ),
         .target(
             name: "WooFoundation",
-            dependencies: ["WooFoundationCore"]
+            dependencies: [
+                "WooFoundationCore",
+                .product(name: "Kingfisher", package: "Kingfisher")
+            ]
         ),
         .target(
             name: "WooFoundationCore",
diff --git a/Modules/Sources/WooFoundation/UI Components/ProductImageThumbnail.swift b/Modules/Sources/WooFoundation/UI Components/ProductImageThumbnail.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 import Kingfisher
 
-struct ProductImageThumbnail<Placeholder: View>: View {
+public struct ProductImageThumbnail<Placeholder: View>: View {
     private let productImageURL: URL?
     private let productImageSize: CGFloat
     private let scale: CGFloat
@@ -25,13 +25,13 @@ struct ProductImageThumbnail<Placeholder: View>: View {
         )
     }
 
-    init(productImageURL: URL?,
-         productImageSize: CGFloat,
-         scale: CGFloat,
-         productImageCornerRadius: CGFloat = 0,
-         foregroundColor: Color,
-         cachesOriginalImage: Bool = false,
-         @ViewBuilder placeholder: () -> Placeholder) {
+    public init(productImageURL: URL?,
+                productImageSize: CGFloat,
+                scale: CGFloat,
+                productImageCornerRadius: CGFloat = 0,
+                foregroundColor: Color,
+                cachesOriginalImage: Bool = false,
+                @ViewBuilder placeholder: () -> Placeholder) {
         self.productImageURL = productImageURL
         self.productImageSize = productImageSize
         self.scale = scale
@@ -41,7 +41,7 @@ struct ProductImageThumbnail<Placeholder: View>: View {
         self.placeholder = placeholder()
     }
 
-    var body: some View {
+    public var body: some View {
         KFImage
             .url(productImageURL)
             .cacheOriginalImage(cachesOriginalImage)
@@ -57,22 +57,3 @@ struct ProductImageThumbnail<Placeholder: View>: View {
             .accessibilityHidden(true)
     }
 }
-
-// Convenience initializer that maintains the default behavior.
-extension ProductImageThumbnail where Placeholder == Image {
-    init(productImageURL: URL?,
-         productImageSize: CGFloat,
-         scale: CGFloat,
-         productImageCornerRadius: CGFloat = 0,
-         foregroundColor: Color,
-         cachesOriginalImage: Bool = false) {
-        self.init(productImageURL: productImageURL,
-                 productImageSize: productImageSize,
-                 scale: scale,
-                 productImageCornerRadius: productImageCornerRadius,
-                 foregroundColor: foregroundColor,
-                 cachesOriginalImage: cachesOriginalImage) {
-            Image(uiImage: .productPlaceholderImage)
-        }
-    }
-}
diff --git a/WooCommerce/Classes/Extensions/ProductImageThumbnail+Extensions.swift b/WooCommerce/Classes/Extensions/ProductImageThumbnail+Extensions.swift
@@ -0,0 +1,21 @@
+import SwiftUI
+import struct WooFoundation.ProductImageThumbnail
+
+// Convenience initializer that maintains the default behavior.
+extension ProductImageThumbnail where Placeholder == Image {
+    init(productImageURL: URL?,
+         productImageSize: CGFloat,
+         scale: CGFloat,
+         productImageCornerRadius: CGFloat = 0,
+         foregroundColor: Color,
+         cachesOriginalImage: Bool = false) {
+        self.init(productImageURL: productImageURL,
+                 productImageSize: productImageSize,
+                 scale: scale,
+                 productImageCornerRadius: productImageCornerRadius,
+                 foregroundColor: foregroundColor,
+                 cachesOriginalImage: cachesOriginalImage) {
+            Image(uiImage: .productPlaceholderImage)
+        }
+    }
+}
diff --git a/WooCommerce/Classes/POS/Presentation/Reusable Views/POSItemImageView.swift b/WooCommerce/Classes/POS/Presentation/Reusable Views/POSItemImageView.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import struct WooFoundation.ProductImageThumbnail
 
 enum POSItemImageState {
     case normal
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/CollapsibleProductCard.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/CollapsibleProductCard.swift
@@ -1,5 +1,6 @@
 import Yosemite
 import SwiftUI
+import struct WooFoundation.ProductImageThumbnail
 
 /// Displays a single collapsible product row or grouped parent and child product rows
 struct CollapsibleProductCard: View {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/ProductsSection/ProductDiscountView.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/ProductsSection/ProductDiscountView.swift
@@ -1,5 +1,6 @@
 import SwiftUI
 import Yosemite
+import struct WooFoundation.ProductImageThumbnail
 
 struct ProductDiscountView: View {
     private let viewModel: ProductDiscountViewModel
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Items Section/WooShippingItemRow.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Items Section/WooShippingItemRow.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import struct WooFoundation.ProductImageThumbnail
 
 /// Row for an item to ship with the Woo Shipping extension.
 struct WooShippingItemRow: View {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/SelectableShipmentItemRow.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Split Shipments/SelectableShipmentItemRow.swift
@@ -1,5 +1,6 @@
 import Yosemite
 import SwiftUI
+import struct WooFoundation.ProductImageThumbnail
 
 /// Row for a selectable shipment item to ship with the Woo Shipping extension.
 struct SelectableShipmentItemRow: View {
diff --git a/WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductRow.swift b/WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductRow.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import struct WooFoundation.ProductImageThumbnail
 
 /// Represent a single product or variation row in the Product section of a New Order or in the ProductSelectorView
 ///
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -27,6 +27,7 @@
 		01058DD22E4273F2002FADD1 /* UIKitBarcodeObserverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01058DD12E4273F2002FADD1 /* UIKitBarcodeObserverTests.swift */; };
 		010F7D872E79B39E002B02EA /* POSFormattableAmountTextFieldAdaptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010F7D862E79B39E002B02EA /* POSFormattableAmountTextFieldAdaptor.swift */; };
 		010F7D8B2E79B763002B02EA /* POSCouponCreationSheetAdaptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010F7D8A2E79B763002B02EA /* POSCouponCreationSheetAdaptor.swift */; };
+		010F7D8D2E7A8447002B02EA /* ProductImageThumbnail+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010F7D8C2E7A8447002B02EA /* ProductImageThumbnail+Extensions.swift */; };
 		011D396F2D09FCD200DB1445 /* CardPresentModalLocationRequired.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011D396E2D09FCCB00DB1445 /* CardPresentModalLocationRequired.swift */; };
 		011D39712D0A324200DB1445 /* LocationServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011D39702D0A324100DB1445 /* LocationServiceTests.swift */; };
 		011D7A332CEC877A0007C187 /* CardPresentModalNonRetryableErrorEmailSent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 011D7A322CEC87770007C187 /* CardPresentModalNonRetryableErrorEmailSent.swift */; };
@@ -3238,6 +3239,7 @@
 		01058DD12E4273F2002FADD1 /* UIKitBarcodeObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitBarcodeObserverTests.swift; sourceTree = "<group>"; };
 		010F7D862E79B39E002B02EA /* POSFormattableAmountTextFieldAdaptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSFormattableAmountTextFieldAdaptor.swift; sourceTree = "<group>"; };
 		010F7D8A2E79B763002B02EA /* POSCouponCreationSheetAdaptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSCouponCreationSheetAdaptor.swift; sourceTree = "<group>"; };
+		010F7D8C2E7A8447002B02EA /* ProductImageThumbnail+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProductImageThumbnail+Extensions.swift"; sourceTree = "<group>"; };
 		011D396E2D09FCCB00DB1445 /* CardPresentModalLocationRequired.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentModalLocationRequired.swift; sourceTree = "<group>"; };
 		011D39702D0A324100DB1445 /* LocationServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationServiceTests.swift; sourceTree = "<group>"; };
 		011D7A322CEC87770007C187 /* CardPresentModalNonRetryableErrorEmailSent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentModalNonRetryableErrorEmailSent.swift; sourceTree = "<group>"; };
@@ -12144,6 +12146,7 @@
 		CE1CCB4C20572444000EE3AC /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
+				010F7D8C2E7A8447002B02EA /* ProductImageThumbnail+Extensions.swift */,
 				016582EC2E7897B3001DBB6F /* String+Helpers.swift */,
 				2D88C1102DF883BD00A6FB2C /* AttributedString+Helpers.swift */,
 				2004E2DB2C08E95B00D62521 /* ViewControllerPresenting.swift */,
@@ -13400,7 +13403,6 @@
 				CC53FB3427551A6E00C4CA4F /* ProductRow.swift */,
 				CC53FB39275697B000C4CA4F /* ProductRowViewModel.swift */,
 				B9B7E2E529FBF96100F9CED1 /* ProductSelectorViewModelTracker.swift */,
-				68AC9D282ACE598B0042F784 /* ProductImageThumbnail.swift */,
 				02DFD5032B20486C0048CD70 /* ProductStepper.swift */,
 				02DFD5052B2048C50048CD70 /* ProductStepperViewModel.swift */,
 				02FE734A2B21613D00CD486B /* ProductWithQuantityStepperView.swift */,
@@ -16009,7 +16011,6 @@
 				262A098B2628C51D0033AD20 /* OrderAddOnListViewModel.swift in Sources */,
 				0262DA5323A238460029AF30 /* UnitInputTableViewCell.swift in Sources */,
 				D8EE9692264D328A0033B2F9 /* LegacyReceiptViewController.swift in Sources */,
-				68AC9D292ACE598B0042F784 /* ProductImageThumbnail.swift in Sources */,
 				CE4FE7D82B7D306200F66DD5 /* MultiSelectionReorderableList.swift in Sources */,
 				CE6E110D2C91E5FF00563DD4 /* WooShippingItems.swift in Sources */,
 				029106BE2BE2868F00C2248B /* CollapsibleOrderFormCardBorder.swift in Sources */,
@@ -16367,6 +16368,7 @@
 				95B6C6102D9DADAA00E1A661 /* WPComLoginGravatarView.swift in Sources */,
 				028FF8E32AA1E1C60038964F /* ProductDetailsCellViewModel+AddOns.swift in Sources */,
 				DEC2962726C17AD8005A056B /* ShippingLabelCustomsForm+Localization.swift in Sources */,
+				010F7D8D2E7A8447002B02EA /* ProductImageThumbnail+Extensions.swift in Sources */,
 				26A630FE253F63C300CBC3B1 /* RefundableOrderItem.swift in Sources */,
 				CEE006052077D1280079161F /* SummaryTableViewCell.swift in Sources */,
 				DEE215342D1297CD004A11F3 /* UserDefaults+EditStoreList.swift in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import SwiftUI`
	`2`	`+import struct WooFoundation.ProductImageThumbnail`
`2`	`3`
`3`	`4`	`enum POSItemImageState {`
`4`	`5`	`case normal`