Change the order of the overlays

Author: aatanasovdev

js/asset-edit.js

@@ -142,7 +142,7 @@ public static function get_transformations( $attachment_id, $as_string = false,
 			$image_overlay = self::get_overlay( $attachment_id, 'image_overlay' );
 
 			// Merge transformations with overlays.
-			$parts           = array_filter( array( $transformations, $image_overlay, $text_overlay ) );
+			$parts           = array_filter( array( $transformations, $text_overlay, $image_overlay ) );
 			$transformations = ! empty( $parts ) ? implode( '/', $parts ) : '';
 		}
 

php/class-relate.php

@@ -506,9 +506,10 @@ const AssetEdit = {
 		return `${textLayerDefinition}/fl_layer_apply${placementString}`;
 	},
 	buildSrc() {
-		const imageOverlay = this.buildImageOverlay();
-		const textOverlay = this.buildTextOverlay();
 		const transformations = this.transformationsInput.value;
+		const textOverlay = this.buildTextOverlay();
+		const imageOverlay = this.buildImageOverlay();
+
 
 		// For images, build the full URL
 		const urlParts = [this.base];
@@ -531,8 +532,8 @@ const AssetEdit = {
 		}
 
 		// Add overlays
-		addPart(imageOverlay, 'string-preview-image-overlay');
 		addPart(textOverlay, 'string-preview-text-overlay');
+		addPart(imageOverlay, 'string-preview-image-overlay');
 
 		addPart(this.publicId, 'string-preview-public-id', this.publicId, false);
 
@@ -554,14 +555,14 @@ const AssetEdit = {
 			transformationParts.push(transformations);
 		}
 
-		if (imageOverlay) {
-			transformationParts.push(imageOverlay);
-		}
-
 		if (textOverlay) {
 			transformationParts.push(textOverlay);
 		}
 
+		if (imageOverlay) {
+			transformationParts.push(imageOverlay);
+		}
+
 		return transformationParts.join('/');
 	},
 	getOverlayData(map) {