Merge extra CSS classes

src/django_icons/utils.py

@@ -48,24 +48,14 @@ def get_icon_kwargs_from_settings(name):
 def get_icon_kwargs(name, *args, **kwargs):
     """Build the kwargs for the icon function based on args and kwargs of the template tag."""
 
-    # Get kwargs from settings, name will always be set
     icon_kwargs = get_icon_kwargs_from_settings(name)
+    extra_classes = icon_kwargs.get("extra_classes", "")
 
-    # Remember the name, we do not allow this to be overwritten
-    remember_name = icon_kwargs["name"]
-
-    # Update with kwargs
     icon_kwargs.update(kwargs)
-
-    # Merge args with extra_classes
-    extra_classes = merge_css_list(args, kwargs.get("extra_classes", ""))
+    extra_classes = merge_css_list(extra_classes, args, kwargs.get("extra_classes", ""))
     if extra_classes:
         icon_kwargs["extra_classes"] = extra_classes
 
-    # Check the name
-    assert icon_kwargs["name"] == remember_name, "Overwriting the icon name is not allowed"
-
-    # Return the dict
     return icon_kwargs
 
 

tests/app/settings.py

@@ -59,5 +59,10 @@
         "edit": {"name": "pencil", "title": "Edit"},
         "feather": {"renderer": "tests.app.renderers.CustomSvgRenderer"},
         "paperplane": {"renderer": "tests.app.renderers.CustomSvgRenderer"},
+        "extra-triangle": {
+            "name": "fas fa-triangle fa-fw",
+            "extra_classes": "extra",
+            "renderer": "django_icons.renderers.BaseRenderer",
+        },
     },
 }

tests/test_base.py

@@ -21,3 +21,13 @@ def test_icons(self):
             render_template('{% icon "fas fa-user fa-2x" size="lg" renderer="BaseRenderer" %}'),
             '<i class="fas fa-user fa-2x"></i>',
         )
+
+    def test_extra_classes(self):
+        self.assertEqual(
+            render_template('{% icon "extra-triangle" %}'),
+            '<i class="fas fa-triangle fa-fw extra"></i>',
+        )
+        self.assertEqual(
+            render_template('{% icon "extra-triangle" extra_classes="and more" %}'),
+            '<i class="fas fa-triangle fa-fw extra and more"></i>',
+        )