Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HTMLFormElement.addClass: Improve removal of duplicates. #115

Merged
merged 1 commit into from
Jul 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Changelog

- Drop deprecated support for ``python setup.py test``.

- HTMLFormElement.addClass: Improve removal of duplicates. It's now possible to
add multiple classes as whitespace separated string and still detect class
duplicates.


4.3 (2022-03-24)
----------------
Expand Down
21 changes: 10 additions & 11 deletions src/z3c/form/browser/widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,21 +142,20 @@ class HTMLFormElement(WidgetLayoutSupport):
# layout support
css = FieldProperty(interfaces.IHTMLFormElement['css'])

def addClass(self, klass):
"""See interfaces.IHTMLFormElement"""
def addClass(self, klass: str):
"""Add a class to the HTML element.

See interfaces.IHTMLFormElement.
"""
if not self.klass:
self.klass = str(klass)
else:
# make sure items are not repeated
parts = self.klass.split() + [str(klass)]
seen = {}
unique = []
for item in parts:
if item in seen:
continue
seen[item] = 1
unique.append(item)
self.klass = ' '.join(unique)
parts = self.klass.split() + klass.split()
# Remove duplicates and keep order.
# Dictionaries are ordered in Python 3.7+
parts = list(dict.fromkeys(parts))
self.klass = " ".join(parts)

def update(self):
"""See z3c.form.interfaces.IWidget"""
Expand Down
52 changes: 52 additions & 0 deletions src/z3c/form/browser/widget.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
Widget base classes
===================

HTMLFormElement
---------------
The widget base class.
::

>>> from z3c.form.browser.widget import HTMLFormElement
>>> form = HTMLFormElement()


addClass
........

Widgets based on :code:`HTMLFormElement` also have the :code:`addClass` method which can be used to add CSS classes to the widget.

The :code:`klass` attribute is used because :code:`class` is a reserved keyword in Python.
It's empty per default::

>>> form = HTMLFormElement()
>>> form.klass


After adding a class it shows up in :code:`klass`::

>>> form.addClass("my-css-class")
>>> form.klass
'my-css-class'


:code:`addClass` prevents adding the same class twice::

>>> form.addClass("my-css-class")
>>> form.klass
'my-css-class'

>>> form.addClass("another-class")
>>> form.klass
'my-css-class another-class'

>>> form.addClass("another-class third-class")
icemac marked this conversation as resolved.
Show resolved Hide resolved
>>> form.klass
'my-css-class another-class third-class'


The duplicate removal also keeps the original order of CSS classes::

>>> form.addClass("third-class another-class")
>>> form.klass
'my-css-class another-class third-class'

5 changes: 5 additions & 0 deletions src/z3c/form/tests/test_doc.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ def test_suite():
'../hint.rst',
setUp=setUp, tearDown=testing.tearDown,
optionflags=flags, checker=testing.outputChecker,
),
doctest.DocFileSuite(
'../browser/widget.rst',
setUp=setUp, tearDown=testing.tearDown,
optionflags=flags, checker=testing.outputChecker,
))
for setUp in setups)

Expand Down
Loading