From 77464801e7f38a62ca4542033c8099d38b90d5f0 Mon Sep 17 00:00:00 2001
From: alexpavlovich <alex.pavlovich42@gmail.com>
Date: Sat, 9 Nov 2019 21:41:17 +0300
Subject: [PATCH] Fix cleanupIDs if defs is last elem of svg

---
 plugins/cleanupIDs.js          |  8 ++++---
 test/plugins/cleanupIDs.20.svg | 41 ++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 test/plugins/cleanupIDs.20.svg

diff --git a/plugins/cleanupIDs.js b/plugins/cleanupIDs.js
index aebec051..71ffb5f9 100644
--- a/plugins/cleanupIDs.js
+++ b/plugins/cleanupIDs.js
@@ -63,11 +63,13 @@ exports.fn = function(data, params) {
                     hasStyleOrScript = true;
                     continue;
                 }
+
                 // Don't remove IDs if the whole SVG consists only of defs.
-                if (item.isElem('defs') && item.parentNode.isElem('svg')) {
+                if (item.isElem('svg')) {
                     var hasDefsOnly = true;
-                    for (var j = i + 1; j < items.content.length; j++) {
-                        if (items.content[j].isElem()) {
+
+                    for (var j = 0; j < item.content.length; j++) {
+                        if (!item.content[j].isElem('defs')) {
                             hasDefsOnly = false;
                             break;
                         }
diff --git a/test/plugins/cleanupIDs.20.svg b/test/plugins/cleanupIDs.20.svg
new file mode 100644
index 00000000..2fa08694
--- /dev/null
+++ b/test/plugins/cleanupIDs.20.svg
@@ -0,0 +1,41 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g filter="url(#filter0_dust)">
+        <path d="M2 8a7 7 0 1 1 14 0A7 7 0 0 1 2 8z" fill="#fff"/>
+    </g>
+    <path d="M4 8a5 5 0 1 1 10 0A5 5 0 0 1 4 8z" fill="currentColor"/>
+    <defs>
+        <filter id="filter0_dust" x="0" y="0" width="18" height="18" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+            <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+            <feOffset dy="1"/>
+            <feGaussianBlur stdDeviation="1"/>
+            <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+            <feBlend in2="BackgroundImageFix" result="effect1_dropShadow"/>
+            <feBlend in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+        </filter>
+    </defs>
+</svg>
+
+@@@
+
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g filter="url(#test__a)">
+        <path d="M2 8a7 7 0 1 1 14 0A7 7 0 0 1 2 8z" fill="#fff"/>
+    </g>
+    <path d="M4 8a5 5 0 1 1 10 0A5 5 0 0 1 4 8z" fill="currentColor"/>
+    <defs>
+        <filter id="test__a" x="0" y="0" width="18" height="18" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+            <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+            <feColorMatrix in="SourceAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+            <feOffset dy="1"/>
+            <feGaussianBlur stdDeviation="1"/>
+            <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+            <feBlend in2="BackgroundImageFix" result="effect1_dropShadow"/>
+            <feBlend in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+        </filter>
+    </defs>
+</svg>
+
+@@@
+
+{"prefix": "test__", "remove": "false"}