Merge branch 'bugfix/support-children-when-rendering-svg'

stellarwp · Aug 1, 2024 · 83dd22f · 83dd22f
2 parents 67d6859 + 8e9f5a5
commit 83dd22f
Showing 1 changed file with 38 additions and 17 deletions.
diff --git a/includes/class-kadence-blocks-svg.php b/includes/class-kadence-blocks-svg.php
@@ -161,23 +161,7 @@ public static function render( $name, $fill = 'currentColor', $stroke_width = fa
 				$svg .= '<title>' . $title . '</title>';
 			}
 			if ( ! empty( $icon['cD'] ) ) {
-				foreach ( $icon['cD'] as $cd ) {
-					$nE      = $cd['nE'];
-					$aBs     = $cd['aBs'];
-					$tmpAttr = array();
-
-					foreach ( $aBs as $key => $attribute ) {
-						if ( ! in_array( $key, array( 'fill', 'stroke', 'none' ) ) ) {
-							$tmpAttr[ $key ] = $key . '="' . $attribute . '"';
-						}
-					}
-
-					if ( isset( $aBs['fill'], $aBs['stroke'] ) && $aBs['fill'] === 'none' ) {
-						$tmpAttr['stroke'] = 'stroke="currentColor"';
-					}
-
-					$svg .= '<' . $nE . ' ' . implode( ' ', $tmpAttr ) . '/>';
-				}
+				$svg .= self::generate_svg_elements($icon['cD']);
 			}
 
 			$svg .= '</svg>';
@@ -193,6 +177,43 @@ public static function render( $name, $fill = 'currentColor', $stroke_width = fa
 		return $svg;
 
 	}
+
+	/**
+	 * Recursively generate SVG elements
+	 * Out native SVGs do not have children, but user uploaded SVGs in pro can contain children elements.
+	 *
+	 * @param $elements
+	 *
+	 * @return string
+	 */
+	private static function generate_svg_elements( $elements ) {
+		$output = '';
+		foreach ( $elements as $element ) {
+			$nE       = $element['nE'];
+			$aBs      = $element['aBs'];
+			$children = ! empty( $element['children'] ) ? $element['children'] : [];
+			$tmpAttr  = array();
+
+			foreach ( $aBs as $key => $attribute ) {
+				if ( ! in_array( $key, array( 'fill', 'stroke', 'none' ) ) ) {
+					$tmpAttr[ $key ] = $key . '="' . esc_attr( $attribute ) . '"';
+				}
+			}
+
+			if ( isset( $aBs['fill'], $aBs['stroke'] ) && $aBs['fill'] === 'none' ) {
+				$tmpAttr['stroke'] = 'stroke="currentColor"';
+			}
+
+			$output .= '<' . $nE . ' ' . implode( ' ', $tmpAttr );
+			if ( ! empty( $children ) ) {
+				$output .= '>' . self::generate_svg_elements( $children ) . '</' . $nE . '>';
+			} else {
+				$output .= '/>';
+			}
+		}
+
+		return $output;
+	}
 	/**
 	 * Return an array of icons.
 	 *