widgetastic.patternfly5 25.2.11.0__py3-none-any.whl → 25.2.17.1__py3-none-any.whl

{widgetastic.patternfly5-25.2.11.0.dist-info → widgetastic.patternfly5-25.2.17.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: widgetastic.patternfly5
-Version: 25.2.11.0
+Version: 25.2.17.1
 Summary: Patternfly5 widget library for Widgetastic.
 Project-URL: repository, https://github.com/RedHatQE/widgetastic.patternfly5
 Maintainer-email: Nikhil Dhandre <ndhandre@redhat.com>, Egor Shamardin <eshamard@redhat.com>, Mike Shriver <mshriver@redhat.com>
@@ -21,16 +21,13 @@ License-File: LICENSE
 Keywords: patternfly,patternfly5,widgetastic
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Requires-Dist: widgetastic-core>=1.0.6
 Provides-Extra: dev
 Requires-Dist: codecov; extra == 'dev'
@@ -58,15 +55,12 @@ Description-Content-Type: text/markdown
     <a href="https://github.com/RedHatQE/widgetastic.patternfly5/actions/workflows/tests.yaml">
     <img alt="github actions" src="https://github.com/RedHatQE/widgetastic.patternfly5/actions/workflows/tests.yaml/badge.svg">
     </a>
-    <a href="https://pypi.org/project/black">
-    <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
-    </a>
     <a href="https://results.pre-commit.ci/latest/github/RedHatQE/widgetastic.patternfly5/main">
     <img alt="pre: black" src="https://results.pre-commit.ci/badge/github/RedHatQE/widgetastic.patternfly5/main.svg">
     </a>
 </p>
 
-This library offers Widgetastic Widgets for [PatternFly v5](https://www.patternfly.org/), serving as an extended
+This library offers Widgetastic Widgets for [PatternFly v5/v6](https://www.patternfly.org/), serving as an extended
 itteration of [widgetastic.patternfly4](https://github.com/RedHatQE/widgetastic.patternfly4).
 
 
@@ -114,7 +108,7 @@ itteration of [widgetastic.patternfly4](https://github.com/RedHatQE/widgetastic.
 - [pie-chart](https://www.patternfly.org/charts/pie-chart)
 
 ### Patterns:
-- [card-view](https://patternfly-react-main.surge.sh/patterns/card-view)
+- [card-view](https://www.patternfly.org/patterns/card-view)
 
 
 ### Contribution guide
@@ -138,7 +132,7 @@ pre-commit install
 
 ### Testing
 
-The library has selenium tests that are performed against [Patternfly React docs](https://patternfly-react-main.surge.sh).
+The library has selenium tests that are performed against [Patternfly v6 docs](https://www.patternfly.org) and [Patternfly v5 docs](https://v5-archive.patternfly.org).
 It's also configured to run the tests every time when a new version of that page is released.
 
 Tests spawn a container from official selenium image - [selenium/standalone-{chrome/firefox}](https://hub.docker.com/u/selenium).
@@ -152,5 +146,5 @@ Use `-n` key to specify a number
 of workers:
 
 ```bash
-BROWSER=firefox pytest -v testing -n 4
+pytest --browser-name firefox --pf-version v5 -n 2 -vv
 ```

widgetastic.patternfly5-25.2.17.1.dist-info/RECORD

@@ -0,0 +1,46 @@
+widgetastic_patternfly5/__init__.py,sha256=Yv3sZRQsi__Wjp5K5odVRZFr6-UQsPLL6lk6g6GWZIg,3822
+widgetastic_patternfly5/ouia.py,sha256=ZAUgIka9odt4yCKQxD2R0fZ30hZKPtOAL-Fjw2xIGS0,4046
+widgetastic_patternfly5/charts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+widgetastic_patternfly5/charts/alerts_timeline_chart.py,sha256=U7hJvxAG1Wgj9WFt5QxAmLh9cJm2qzs2YHs2wfEW0Pk,2377
+widgetastic_patternfly5/charts/boxplot_chart.py,sha256=6Ek6gwbmwNeazy-5o2fVfvkjpd6bhbTyitiPomvLBts,405
+widgetastic_patternfly5/charts/bullet_chart.py,sha256=zfAdvxzPFqeGFzDoqJIUxwkERUlHfPohHOjzPJEjVdw,3680
+widgetastic_patternfly5/charts/donut_chart.py,sha256=RmDKyWjhKnGWQwZ1twPN837LYuvlF1inQlYhIgJgFxU,2570
+widgetastic_patternfly5/charts/legend.py,sha256=fhAg-FhsWpvi91BZ29EztKO3QfANRW-hnfzIkq45q3Y,2983
+widgetastic_patternfly5/charts/line_chart.py,sha256=9gjoUqWopSYTng0iRpvppm-CL-QA8H_HpTvFddg0sB4,3995
+widgetastic_patternfly5/charts/pie_chart.py,sha256=rIxMv6vPERj9FnTp8daejL7MxUTKFCTj9057C1KuuKw,218
+widgetastic_patternfly5/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+widgetastic_patternfly5/components/alert.py,sha256=8wF4348n7Yp6BnOlbDNGw4_fFKyyjzgpQDOe9a96EsI,2579
+widgetastic_patternfly5/components/breadcrumb.py,sha256=_lQ7pqmh2P9FSwMae_quUTteHsfXFlQvYaXE4Z1gK1g,2035
+widgetastic_patternfly5/components/button.py,sha256=dduqxjnTHsHLkPO9TjbWO4HUfpiObMM4yuq3_q8XlA0,3539
+widgetastic_patternfly5/components/card.py,sha256=YScmzLsxO72ITZFz9u3vyxpD2r0QAzP4yaBmJD9FcZE,2677
+widgetastic_patternfly5/components/chip.py,sha256=t5_9oTJ__9ccwrCMzVYllDFY7oyJcMwwWKbr3jiIK0w,11218
+widgetastic_patternfly5/components/clipboard_copy.py,sha256=r9RESokgZ7s5C2_ByOGLqfIjUx15-ZzFi5usSTdb-ac,1292
+widgetastic_patternfly5/components/description_list.py,sha256=sVhKwKnvJguZh9FqyPC1NU2UA_w7uA3ugkY5eoVRlPk,989
+widgetastic_patternfly5/components/drawer.py,sha256=kr2q042x4ghxu6T_C13mlRZZ-gZavGsVvM9a1GVYZZA,1084
+widgetastic_patternfly5/components/dual_list_selector.py,sha256=jL1SOfnR5z_rWniN-KU9a26n-0HxBcL2pJbBcOFT2b8,4839
+widgetastic_patternfly5/components/expandable_section.py,sha256=QCqonn1kiYfL-mGcjwrG6x4TiJBr9RKXZvyDerVTUmQ,1876
+widgetastic_patternfly5/components/modal.py,sha256=uaOsMxWvgCKrF61YX5Dh9z4YCtB0uheQdQTF6cMswxY,2000
+widgetastic_patternfly5/components/navigation.py,sha256=uaAc-FoOdYt0xiH_oPK564KjztQLEusk3LhhHSX4PQ4,5333
+widgetastic_patternfly5/components/pagination.py,sha256=rumYxlMJcO7F0uQtIU24oANwi6JHHzDkD-YMo-eyltA,8707
+widgetastic_patternfly5/components/popover.py,sha256=_XZlM4v8gsmen73DoSpylMXAMeEkdkjRsuBIIKHHhtE,2242
+widgetastic_patternfly5/components/progress.py,sha256=UXNjRgy7aW0YerRWR6cwMF-9AjitI6LO8qlOdz0dYW8,1391
+widgetastic_patternfly5/components/slider.py,sha256=B9gr8mnndLWivSlS9lIRd3SW6W5Iev9ESnQE9b0A55Y,3128
+widgetastic_patternfly5/components/switch.py,sha256=7-ezYAQ3T_cz70GBIW78vTlVaDmRGRhNgi1hWg14Ig8,2226
+widgetastic_patternfly5/components/table.py,sha256=fA5LM7buASXOH3z32t1D5ZkFXyMa3ZZmzFJ6kjF73ZQ,17183
+widgetastic_patternfly5/components/tabs.py,sha256=tSuS6x3_rnc5z8yUW_75ZtkdFOzzWPMmMa48VEEZWQk,2260
+widgetastic_patternfly5/components/title.py,sha256=bIUzFaptG2i84CF4-AMfjbmdVeKYR32wkOBH9P6V3XQ,920
+widgetastic_patternfly5/components/date_and_time/calendar_month.py,sha256=zGIgIsYEWH3VPVNBVIPVaKlnRY61648tM8rGtohmy7s,3307
+widgetastic_patternfly5/components/forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+widgetastic_patternfly5/components/forms/form_select.py,sha256=ht_go5lOXhMzq_FyLxS1ny9jaiBkRI6K_5vMv1DASaw,3531
+widgetastic_patternfly5/components/forms/radio.py,sha256=d1fpzoicgSDgoV8K9bHlXFvHEjH3zw59t_WbxTGZyQ8,2009
+widgetastic_patternfly5/components/menus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+widgetastic_patternfly5/components/menus/context_selector.py,sha256=Bqj8MrxJypLfjcqrrKQj9jfFWHeSWbHIVcH2aA6sRQ8,1156
+widgetastic_patternfly5/components/menus/dropdown.py,sha256=NUPpKIV-mBzmFVRPjWu0FiCWc9DjcRErK_FOxfag8y0,10471
+widgetastic_patternfly5/components/menus/menu.py,sha256=sRkb46XWMNGueDCkOjs4vyb9Ehjiru71DY3MD2qsorM,8138
+widgetastic_patternfly5/components/menus/menu_toggle.py,sha256=PBwNvg6E2RPdCG6ALBUqyTZxCwThJgk5S-9ghTiZ9hM,1029
+widgetastic_patternfly5/components/menus/options_menu.py,sha256=-7pRukhgxln0rMV77VhNyQ-njLPAE6Wnp2vNAoJUXZk,1474
+widgetastic_patternfly5/components/menus/select.py,sha256=X8DApXg_7tLIOulpmEP-f09bDShYL8jcEb1tYvNHwrE,6482
+widgetastic.patternfly5-25.2.17.1.dist-info/METADATA,sha256=u3xxVUmW53slGMz9XD6BL7XP-TIGG1sH5Khopll1Vw8,6826
+widgetastic.patternfly5-25.2.17.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+widgetastic.patternfly5-25.2.17.1.dist-info/licenses/LICENSE,sha256=nDhhj8jp0XsTdmvWpTWFpOKVn0LPXPb6ecA9zFF3Exk,576
+widgetastic.patternfly5-25.2.17.1.dist-info/RECORD,,

widgetastic_patternfly5/__init__.py

@@ -1,75 +1,64 @@
 from .charts.boxplot_chart import BoxPlotChart
 from .charts.bullet_chart import BulletChart
 from .charts.donut_chart import DonutChart
-from .charts.legend import DataPoint
-from .charts.legend import Legend
+from .charts.legend import DataPoint, Legend
 from .charts.line_chart import LineChart
 from .charts.pie_chart import PieChart
 from .components.alert import Alert
 from .components.breadcrumb import BreadCrumb
 from .components.button import Button
-from .components.card import Card
-from .components.card import CardCheckBox
-from .components.card import CardForCardGroup
-from .components.card import CardGroup
-from .components.card import CardWithActions
-from .components.chip import CategoryChipGroup
-from .components.chip import Chip
-from .components.chip import ChipGroup
-from .components.chip import ChipGroupToolbar
-from .components.chip import ChipGroupToolbarCategory
-from .components.chip import ChipReadOnlyError
-from .components.chip import StandAloneChipGroup
+from .components.card import Card, CardCheckBox, CardForCardGroup, CardGroup, CardWithActions
+from .components.chip import (
+    CategoryChipGroup,
+    Chip,
+    ChipGroup,
+    ChipGroupToolbar,
+    ChipGroupToolbarCategory,
+    ChipReadOnlyError,
+    StandAloneChipGroup,
+)
 from .components.clipboard_copy import ClipboardCopy
 from .components.date_and_time.calendar_month import CalendarMonth
 from .components.description_list import DescriptionList
 from .components.drawer import Drawer
-from .components.dual_list_selector import DualListSelector
-from .components.dual_list_selector import SearchDualListSelector
+from .components.dual_list_selector import DualListSelector, SearchDualListSelector
 from .components.expandable_section import ExpandableSection
-from .components.forms.form_select import FormSelect
-from .components.forms.form_select import FormSelectDisabled
-from .components.forms.form_select import FormSelectOptionDisabled
-from .components.forms.form_select import FormSelectOptionNotFound
+from .components.forms.form_select import (
+    FormSelect,
+    FormSelectDisabled,
+    FormSelectOptionDisabled,
+    FormSelectOptionNotFound,
+)
 from .components.forms.radio import Radio
 from .components.menus.context_selector import ContextSelector
-from .components.menus.dropdown import Dropdown
-from .components.menus.dropdown import DropdownDisabled
-from .components.menus.dropdown import DropdownItemDisabled
-from .components.menus.dropdown import DropdownItemNotFound
-from .components.menus.dropdown import GroupDropdown
-from .components.menus.menu import CheckboxMenu
-from .components.menus.menu import Menu
-from .components.menus.menu import MenuItemDisabled
-from .components.menus.menu import MenuItemNotFound
+from .components.menus.dropdown import (
+    Dropdown,
+    DropdownDisabled,
+    DropdownItemDisabled,
+    DropdownItemNotFound,
+    GroupDropdown,
+)
+from .components.menus.menu import CheckboxMenu, Menu, MenuItemDisabled, MenuItemNotFound
 from .components.menus.menu_toggle import SplitButtonDropdown
 from .components.menus.options_menu import OptionsMenu
-from .components.menus.select import CheckboxSelect
-from .components.menus.select import Select
-from .components.menus.select import SelectItemDisabled
-from .components.menus.select import SelectItemNotFound
-from .components.modal import Modal
-from .components.modal import ModalItemNotFound
-from .components.navigation import Navigation
-from .components.navigation import NavSelectionNotFound
-from .components.pagination import CompactPagination
-from .components.pagination import Pagination
-from .components.pagination import PaginationNavDisabled
+from .components.menus.select import CheckboxSelect, Select, SelectItemDisabled, SelectItemNotFound
+from .components.modal import Modal, ModalItemNotFound
+from .components.navigation import Navigation, NavSelectionNotFound
+from .components.pagination import CompactPagination, Pagination, PaginationNavDisabled
 from .components.popover import Popover
 from .components.progress import Progress
-from .components.slider import InputSlider
-from .components.slider import Slider
-from .components.switch import Switch
-from .components.switch import SwitchDisabled
-from .components.table import ColumnNotExpandable
-from .components.table import CompoundExpandableTable
-from .components.table import ExpandableTable
-from .components.table import PatternflyTable
-from .components.table import RowNotExpandable
+from .components.slider import InputSlider, Slider
+from .components.switch import Switch, SwitchDisabled
+from .components.table import (
+    ColumnNotExpandable,
+    CompoundExpandableTable,
+    ExpandableTable,
+    PatternflyTable,
+    RowNotExpandable,
+)
 from .components.tabs import Tab
 from .components.title import Title
 
-
 __all__ = [
     "Alert",
     "BreadCrumb",

widgetastic_patternfly5/charts/bullet_chart.py

@@ -1,12 +1,10 @@
 import re
 
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import Text
-from widgetastic.widget import View
+from widgetastic.widget import Text, View
 from widgetastic.xpath import quote
 
-from .legend import DataPoint
-from .legend import Legend
+from .legend import DataPoint, Legend
 
 
 class BulletChart(View):
@@ -36,7 +34,7 @@ class BulletChart(View):
     def __init__(self, parent=None, id=None, locator=None, logger=None, *args, **kwargs):
         View.__init__(self, parent=parent, logger=logger)
         if id:
-            self.locator = ".//div[@id={}]".format(quote(id))
+            self.locator = f".//div[@id={quote(id)}]"
         elif locator:
             self.locator = locator
         else:

widgetastic_patternfly5/charts/donut_chart.py

@@ -1,17 +1,13 @@
 import re
 
-from widgetastic.widget import ClickableMixin
-from widgetastic.widget import ParametrizedLocator
-from widgetastic.widget import ParametrizedView
-from widgetastic.widget import View
-from widgetastic.widget import Widget
+from widgetastic.widget import ClickableMixin, ParametrizedLocator, ParametrizedView, View, Widget
 from widgetastic.xpath import quote
 
 
 class DonutLegendItem(ParametrizedView, ClickableMixin):
     PARAMETERS = ("label_text",)
     ROOT = ParametrizedLocator(
-        ".//*[name()='text']" "/*[name()='tspan' and contains(., '{label_text}')]"
+        ".//*[name()='text']/*[name()='tspan' and contains(., '{label_text}')]"
     )
     ALL_ITEMS = ".//*[name()='text']/*[name()='tspan']"
     LEGEND_ITEM_REGEX = re.compile(r"(.*?): ([\d]+)")

widgetastic_patternfly5/charts/line_chart.py

@@ -1,5 +1,4 @@
-from widgetastic.widget import ParametrizedLocator
-from widgetastic.widget import View
+from widgetastic.widget import ParametrizedLocator, View
 from widgetastic.xpath import quote
 
 from .legend import Legend
@@ -37,7 +36,7 @@ class LineChart(View):
         assert id or locator, "Provide id or locator."
 
         if id:
-            self.locator = ".//div[@id={}]".format(quote(id))
+            self.locator = f".//div[@id={quote(id)}]"
         else:
             self.locator = locator
 
@@ -96,7 +95,17 @@ class LineChart(View):
                 self.browser.elements(self.TOOLTIP_LABLES, parent=tooltip_el),
                 self.browser.elements(self.TOOLTIP_VALUES, parent=tooltip_el),
             ):
-                label_data[self.browser.text(label_el)] = self.browser.text(value_el)
+                # Get the label text and handle empty labels
+                label_txt = self.browser.text(label_el)
+                if label_txt == "":
+                    label_txt = "Unknown"
+
+                # Update label_data with the value
+                value_txt = self.browser.text(value_el)
+                if label_txt in label_data:
+                    label_data[label_txt] = f"{label_data[label_txt]}, {value_txt}"
+                else:
+                    label_data[label_txt] = value_txt
 
             _data[x_axis_label] = label_data
 

widgetastic_patternfly5/components/alert.py

@@ -57,12 +57,11 @@ class BaseAlert:
         for class_ in self.browser.classes(self):
             if class_ in self.TYPE_MAPPING:
                 return self.TYPE_MAPPING[class_]
-        else:
-            raise ValueError(
-                "Could not find a proper alert type."
-                f"\nAvailable classes: {self.TYPE_MAPPING!r} "
-                f"\nAlert has: {self.browser.classes(self)!r}"
-            )
+        raise ValueError(
+            "Could not find a proper alert type."
+            f"\nAvailable classes: {self.TYPE_MAPPING!r} "
+            f"\nAlert has: {self.browser.classes(self)!r}"
+        )
 
     def assert_no_error(self):
         """Asserts that the warning is not of the error type."""

widgetastic_patternfly5/components/button.py

@@ -1,6 +1,5 @@
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import ClickableMixin
-from widgetastic.widget import Widget
+from widgetastic.widget import ClickableMixin, Widget
 from widgetastic.xpath import quote
 
 
@@ -36,7 +35,7 @@ class BaseButton:
         return check1 or check2 or self.browser.get_attribute("disabled", self) is not None
 
     def __repr__(self):
-        return "{}{}".format(type(self).__name__, self.locator)
+        return f"{type(self).__name__}{self.locator}"
 
     @property
     def title(self):
@@ -69,25 +68,25 @@ class Button(BaseButton, Widget, ClickableMixin):
             if kwargs:  # classes should have been the only kwarg combined with text args
                 raise TypeError("If you pass button text then only pass classes in addition")
             if len(text) == 1:
-                locator_conditions = "normalize-space(.)={}".format(quote(text[0]))
+                locator_conditions = f"normalize-space(.)={quote(text[0])}"
             elif len(text) == 2 and text[0].lower() == "contains":
-                locator_conditions = "contains(normalize-space(.), {})".format(quote(text[1]))
+                locator_conditions = f"contains(normalize-space(.), {quote(text[1])})"
             else:
                 raise TypeError("An illegal combination of args/kwargs")
         else:
             # Join the kwargs, if any
             locator_conditions = " and ".join(
-                "@{}={}".format(attr, quote(value)) for attr, value in kwargs.items()
+                f"@{attr}={quote(value)}" for attr, value in kwargs.items()
             )
 
         if classes:
             if locator_conditions:
                 locator_conditions += " and "
             locator_conditions += " and ".join(
-                "contains(@class, {})".format(quote(klass)) for klass in classes
+                f"contains(@class, {quote(klass)})" for klass in classes
             )
         if locator_conditions:
-            locator_conditions = "and ({})".format(locator_conditions)
+            locator_conditions = f"and ({locator_conditions})"
 
         return (
             ".//*[(self::a or self::button or (self::input and "

widgetastic_patternfly5/components/card.py

@@ -1,8 +1,5 @@
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import Checkbox
-from widgetastic.widget import GenericLocatorWidget
-from widgetastic.widget import ParametrizedView
-from widgetastic.widget import View
+from widgetastic.widget import Checkbox, GenericLocatorWidget, ParametrizedView, View
 
 from widgetastic_patternfly5.components.menus.dropdown import Dropdown
 
@@ -34,9 +31,7 @@ class BaseCard:
 
 
 class Card(BaseCard, GenericLocatorWidget):
-    DEFAULT_LOCATOR = (
-        ".//div[@data-ouia-component-type='PF5/Card'] | .//article[contains(@class, '-c-card')]"
-    )
+    DEFAULT_LOCATOR = ".//div[contains(@data-ouia-component-type, '/Card')] | .//article[contains(@class, '-c-card')]"
 
     def __init__(self, parent, locator=None, logger=None):
         locator = locator or self.DEFAULT_LOCATOR
@@ -46,9 +41,7 @@ class Card(BaseCard, GenericLocatorWidget):
 
 
 class CardForCardGroup(BaseCard, ParametrizedView):
-    DEFAULT_LOCATOR = (
-        "(.//div[@data-ouia-component-type='PF5/Card'] | .//article[contains(@class, '-c-card')])"
-    )
+    DEFAULT_LOCATOR = "(.//div[contains(@data-ouia-component-type, '/Card')] | .//article[contains(@class, '-c-card')])"
 
     def __init__(self, parent, locator=None, logger=None, **kwargs):
         View.__init__(self, parent, logger=logger, **kwargs)

widgetastic_patternfly5/components/chip.py

@@ -1,9 +1,6 @@
 # TODO: This imported directly form wt.pfy4. I thnk we need to restructure it.
 from wait_for import wait_for
-from widgetastic.widget import ParametrizedLocator
-from widgetastic.widget import ParametrizedView
-from widgetastic.widget import Text
-from widgetastic.widget import View
+from widgetastic.widget import ParametrizedLocator, ParametrizedView, Text, View
 
 from .button import Button
 
@@ -15,18 +12,18 @@ class ChipReadOnlyError(Exception):
 
 
 CHIP_ROOT = (
-    ".//div[contains(@class, '-c-chip') and not(contains(@class, '-m-overflow')) "
-    "and not(contains(@class, '-c-chip-group'))]"
+    ".//*[contains(@data-ouia-component-type, '/Chip') and not(contains(@class, '-m-overflow')) "
+    "and not(contains(@class, '-c-chip-group') or contains(@class, '-c-label-group'))]"
 )
-CHIP_TEXT = ".//span[contains(@class, '-c-chip__text')]"
+CHIP_TEXT = ".//span[contains(@class, '-c-chip__text') or contains(@class, '-c-label__text')]"
 CHIP_BADGE = ".//span[contains(@class, '-c-badge')]"
-GROUP_ROOT = ".//div[contains(@class, '-c-chip-group') and @role='group']"
+GROUP_ROOT = ".//div[(contains(@class, '-c-chip-group') and @role='group') or contains(@class,  '-c-label-group')]"
 CATEGORY_GROUP_ROOT = (
-    ".//div[contains(@class, '-c-chip-group') and @role='group' "
+    ".//div[((contains(@class, '-c-chip-group') and @role='group') or contains(@class, '-c-label-group')) "
     "and contains(@class, 'pf-m-category')]"
 )
-CATEGORY_LABEL = ".//span[contains(@class, '-c-chip-group__label')]"
-CATEGORY_CLOSE = ".//div[contains(@class, '-c-chip-group__close')]/button"
+CATEGORY_LABEL = ".//span[contains(@class, '-group__label')]"
+CATEGORY_CLOSE = ".//div[contains(@class, '-group__close')]/button"
 # For backwards compatibility
 OLD_GROUP_ROOT = ".//ul[contains(@class, '-c-chip-group')]"
 TOOLBAR_GROUP_LABEL = "./li/*[contains(@class, '-c-chip-group__label')]"
@@ -44,7 +41,7 @@ class _BaseChip(View):
 
     _text = Text(CHIP_TEXT)
     _badge = Text(f"{CHIP_TEXT}/{CHIP_BADGE}")
-    button = Button(**{"aria-label": "close"})
+    button = Button()
 
     @property
     def badge(self):
@@ -122,7 +119,7 @@ class OverflowChip(_BaseChip):
     The 'Show More'/'Show Less' button is essentially a special kind of chip
     """
 
-    ROOT = ".//button[contains(@class, '-c-chip') and contains(@class, 'pf-m-overflow')]"
+    ROOT = ".//button[(contains(@class, '-c-chip') or contains(@class, '-c-label')) and contains(@class, 'pf-m-overflow')]"
 
     def _show_less_shown(self):
         return self.text.replace(" ", "").lower() == "showless"
@@ -327,7 +324,7 @@ class ChipGroupToolbar(View):
     # The parent of the chip group toolbar can be any element type
     # The locator should be the parent node which holds all the pf-c-chip-group elements
     TOOLBAR_LOCATOR = (
-        ".//ul[contains(@class, '-c-chip-group') and " "contains(@class, 'pf-m-toolbar')]/parent::*"
+        ".//ul[contains(@class, '-c-chip-group') and contains(@class, 'pf-m-toolbar')]/parent::*"
     )
 
     overflow = OldOverflowChip(

widgetastic_patternfly5/components/clipboard_copy.py

@@ -1,7 +1,5 @@
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import GenericLocatorWidget
-from widgetastic.widget import Text
-from widgetastic.widget import TextInput
+from widgetastic.widget import GenericLocatorWidget, Text, TextInput
 
 from widgetastic_patternfly5 import Button
 

widgetastic_patternfly5/components/drawer.py

@@ -1,14 +1,17 @@
+from wait_for import wait_for
 from widgetastic.utils import ParametrizedLocator
 from widgetastic.widget import View
 
+from widgetastic_patternfly5 import Button
+
 
 class BaseDrawer:
-    """Represents drawer component for pf5
+    """Represents drawer component for pf5/pf6
 
     https://www.patternfly.org/components/drawer
     """
 
-    CLOSE = ".//button[@aria-label='Close drawer panel']"
+    close_btn = Button(locator=".//div[contains(@class, '-c-drawer__close')]/button")
 
     @property
     def is_open(self):
@@ -18,7 +21,8 @@ class BaseDrawer:
     def close(self):
         """Close drawer."""
         if self.is_open:
-            self.browser.click(self.browser.element(self.CLOSE))
+            self.close_btn.click()
+            wait_for(lambda: not self.is_open, num_sec=10)
 
 
 class Drawer(BaseDrawer, View):

widgetastic_patternfly5/components/dual_list_selector.py

@@ -1,5 +1,4 @@
-from widgetastic.widget import GenericLocatorWidget
-from widgetastic.widget import TextInput
+from widgetastic.widget import GenericLocatorWidget, TextInput
 
 from .button import Button
 

widgetastic_patternfly5/components/forms/form_select.py

@@ -81,18 +81,14 @@ class BaseFormSelect:
             FormSelectOptionNotFound: if option not found
         """
         if not self.is_enabled:
-            raise FormSelectDisabled("{} is not enabled".format(repr(self)))
+            raise FormSelectDisabled(f"{repr(self)} is not enabled")
         if value not in self.all_options:
             raise FormSelectOptionNotFound(
-                'Option "{}" not found in {}. Available options: {}'.format(
-                    value, repr(self), self.all_options
-                )
+                f'Option "{value}" not found in {repr(self)}. Available options: {self.all_options}'
             )
         elif value not in self.all_enabled_options:
             raise FormSelectOptionDisabled(
-                'Option "{}" is disabled in {}. Enabled options are: {}'.format(
-                    value, repr(self), self.all_enabled_options
-                )
+                f'Option "{value}" is disabled in {repr(self)}. Enabled options are: {self.all_enabled_options}'
             )
         self._select_element.select_by_visible_text(value)
 
@@ -101,7 +97,7 @@ class BaseFormSelect:
         return self.browser.text(self._select_element.first_selected_option)
 
     def __repr__(self):
-        return "{}({!r})".format(type(self).__name__, self.locator)
+        return f"{type(self).__name__}({self.locator!r})"
 
 
 class FormSelect(BaseFormSelect, GenericLocatorWidget):

widgetastic_patternfly5/components/forms/radio.py

@@ -1,7 +1,4 @@
-from widgetastic.widget import Checkbox
-from widgetastic.widget import ParametrizedLocator
-from widgetastic.widget import Text
-from widgetastic.widget import View
+from widgetastic.widget import Checkbox, ParametrizedLocator, Text, View
 
 
 class BaseRadio:

widgetastic_patternfly5/components/menus/context_selector.py

@@ -3,10 +3,10 @@ from .select import Select
 
 class BaseContextSelector:
     ITEMS_LOCATOR = (
-        ".//ul[@class='pf-v5-c-menu__list' or @class='pf-c-context-selector__menu-list']/li"
+        ".//ul[contains(@class, '-c-menu__list') or @class='pf-c-context-selector__menu-list']/li"
     )
     ITEM_LOCATOR = (
-        ".//*[(contains(@class, 'pf-v5-c-menu__item') or contains(@class, "
+        ".//*[(contains(@class, '-c-menu__list-item') or contains(@class, "
         "'pf-c-context-selector__menu-list-item'))"
         " and normalize-space(.)={}]"
     )

widgetastic_patternfly5/components/menus/dropdown.py

@@ -1,8 +1,7 @@
 from contextlib import contextmanager
 
-from wait_for import wait_for_decorator
-from widgetastic.exceptions import NoSuchElementException
-from widgetastic.exceptions import UnexpectedAlertPresentException
+from cached_property import cached_property
+from widgetastic.exceptions import NoSuchElementException, UnexpectedAlertPresentException
 from widgetastic.utils import ParametrizedLocator
 from widgetastic.widget import Widget
 from widgetastic.xpath import quote
@@ -41,6 +40,13 @@ class BaseDropdown:
         "contains(@class, '-c-dropdown__menu-item')) and normalize-space(.)={}]"
     )
 
+    @cached_property
+    def is_pf6(self):
+        """In PF-v6, item selection requires the use of the root_browser, as the item locators are
+        located outside the ROOT.
+        """
+        return True if self.browser.elements(".//*[contains(@class, 'pf-v6')]") else False
+
     @contextmanager
     def opened(self):
         """A context manager to open and then close a Dropdown."""
@@ -77,10 +83,13 @@ class BaseDropdown:
         if self.is_open:
             return
 
-        @wait_for_decorator(timeout=3)
-        def _click():
-            self.browser.click(self.BUTTON_LOCATOR)
-            return self.is_open
+        # @wait_for_decorator(timeout=3)
+        # def _click():
+        #     self.browser.click(self.BUTTON_LOCATOR)
+        #     return self.is_open
+        el = self.browser.wait_for_element(self.BUTTON_LOCATOR)
+        self.browser.click(el)
+        return self.is_open
 
     def close(self, ignore_nonpresent=False):
         """Close the dropdown
@@ -102,7 +111,10 @@ class BaseDropdown:
     def items(self):
         """Returns a list of all dropdown items as strings."""
         with self.opened():
-            result = [self.browser.text(el) for el in self.browser.elements(self.ITEMS_LOCATOR)]
+            items_element = self.browser.elements(self.ITEMS_LOCATOR) or self.root_browser.elements(
+                self.ITEMS_LOCATOR
+            )
+            result = [self.browser.text(el) for el in items_element]
         return result
 
     def has_item(self, item):
@@ -120,7 +132,11 @@ class BaseDropdown:
         """Returns a WebElement for given item name."""
         try:
             self.open()
-            result = self.browser.element(self.ITEM_LOCATOR.format(quote(item)), **kwargs)
+            result = (
+                self.root_browser.element(self.ITEM_LOCATOR.format(quote(item)), **kwargs)
+                if self.is_pf6
+                else self.browser.element(self.ITEM_LOCATOR.format(quote(item)), **kwargs)
+            )
             if close:
                 self.close()
             return result
@@ -133,7 +149,7 @@ class BaseDropdown:
                 items_string = "These items are present: {}".format("; ".join(items))
             else:
                 items_string = "The dropdown is probably not present"
-            raise DropdownItemNotFound("Item {!r} not found. {}".format(item, items_string))
+            raise DropdownItemNotFound(f"Item {item!r} not found. {items_string}")
 
     def item_enabled(self, item, close=True, **kwargs):
         """Returns whether the given item is enabled.
@@ -243,7 +259,10 @@ class BaseGroupDropdown:
     def groups(self):
         """Returns a list of all group names as strings."""
         with self.opened():
-            result = [self.browser.text(el) for el in self.browser.elements(self.GROUPS_LOCATOR)]
+            groups_element = self.browser.elements(
+                self.GROUPS_LOCATOR
+            ) or self.root_browser.elements(self.GROUPS_LOCATOR)
+            result = [self.browser.text(el) for el in groups_element]
         return result
 
     def item_element(self, item, group_name=None, close=True):
@@ -251,13 +270,19 @@ class BaseGroupDropdown:
         self.open()
         try:
             kwargs = (
-                {"parent": self.browser.element(self.GROUP_LOCATOR.format(quote(group_name)))}
+                {
+                    "parent": (
+                        self.root_browser.element(self.GROUP_LOCATOR.format(quote(group_name)))
+                        if self.is_pf6
+                        else self.browser.element(self.GROUP_LOCATOR.format(quote(group_name)))
+                    )
+                }
                 if group_name
                 else {}
             )
         except NoSuchElementException:
             raise DropdownItemNotFound(
-                'Following group "{}" not found. Available are: {}'.format(group_name, self.groups)
+                f'Following group "{group_name}" not found. Available are: {self.groups}'
             )
         return super().item_element(item, close=close, **kwargs)
 

widgetastic_patternfly5/components/menus/menu.py

@@ -1,8 +1,6 @@
 from widgetastic.exceptions import NoSuchElementException
 
-from .dropdown import Dropdown
-from .dropdown import DropdownItemDisabled
-from .dropdown import DropdownItemNotFound
+from .dropdown import Dropdown, DropdownItemDisabled, DropdownItemNotFound
 
 
 class MenuItemDisabled(DropdownItemDisabled):
@@ -48,9 +46,10 @@ class BaseMenu:
     def selected_items(self):
         """Returns a list of all selected items as strings."""
         with self.opened():
-            result = [
-                self.browser.text(el) for el in self.browser.elements(self.SELECTED_ITEMS_LOCATOR)
-            ]
+            items_element = self.browser.elements(
+                self.SELECTED_ITEMS_LOCATOR
+            ) or self.root_browser.elements(self.SELECTED_ITEMS_LOCATOR)
+            result = [self.browser.text(el) for el in items_element]
         return result
 
     @property
@@ -71,7 +70,7 @@ class BaseMenu:
     def close(self, ignore_nonpresent=False):
         """Close the menu
 
-        It it is always open we do nothing
+        It is always open we do nothing
 
         Args:
             ignore_nonpresent: Will ignore exceptions due to disabled or missing dropdown
@@ -95,9 +94,7 @@ class BaseMenu:
             return super().item_element(item, close)
         except DropdownItemNotFound:
             raise MenuItemNotFound(
-                "Item {!r} not found in {}. Available items: {}".format(
-                    item, repr(self), self.items
-                )
+                f"Item {item!r} not found in {repr(self)}. Available items: {self.items}"
             )
 
     def item_select(self, item):
@@ -113,10 +110,8 @@ class BaseMenu:
             return super().item_select(item)
         except DropdownItemDisabled:
             raise MenuItemDisabled(
-                'Item "{}" of {} is disabled\n'
-                "The following items are available and enabled: {}".format(
-                    item, repr(self), self.enabled_items
-                )
+                f'Item "{item}" of {repr(self)} is disabled\n'
+                f"The following items are available and enabled: {self.enabled_items}"
             )
 
     def fill(self, value):
@@ -153,7 +148,7 @@ class BaseCheckboxMenu(BaseMenu):
             item: Item to be selected
             close: Close the dropdown when finished
         """
-        if not isinstance(items, (list, tuple, set)):
+        if not isinstance(items, list | tuple | set):
             items = [items]
 
         try:
@@ -172,7 +167,7 @@ class BaseCheckboxMenu(BaseMenu):
             item: Item to be selected
             close: Close the dropdown when finished
         """
-        if not isinstance(items, (list, tuple, set)):
+        if not isinstance(items, list | tuple | set):
             items = [items]
 
         try:
@@ -204,7 +199,10 @@ class BaseCheckboxMenu(BaseMenu):
         """Returns a dictionary containing the selected status as bools."""
         selected = {}
         with self.opened():
-            for el in self.browser.elements(self.ITEMS_LOCATOR):
+            item_elements = self.browser.elements(self.ITEMS_LOCATOR) or self.root_browser.elements(
+                self.ITEMS_LOCATOR
+            )
+            for el in item_elements:
                 item = self.browser.text(el)
                 try:
                     # get the child element of the label
@@ -223,7 +221,10 @@ class BaseCheckboxMenu(BaseMenu):
             close: Close the dropdown when finished
         """
         self.open()
-        result = [self.browser.text(el) for el in self.browser.elements(self.ITEMS_LOCATOR)]
+        item_elements = self.browser.elements(self.ITEMS_LOCATOR) or self.root_browser.elements(
+            self.ITEMS_LOCATOR
+        )
+        result = [self.browser.text(el) for el in item_elements]
 
         if close:
             self.close()

widgetastic_patternfly5/components/menus/options_menu.py

@@ -30,9 +30,10 @@ class BaseOptionsMenu:
     def selected_items(self):
         """Returns a list of all selected items in the options menu."""
         with self.opened():
-            return [
-                self.browser.text(el) for el in self.browser.elements(self.SELECTED_ITEMS_LOCATOR)
-            ]
+            selected_items_elements = self.browser.elements(
+                self.SELECTED_ITEMS_LOCATOR
+            ) or self.root_browser.elements(self.SELECTED_ITEMS_LOCATOR)
+            return [self.browser.text(el) for el in selected_items_elements]
 
 
 class OptionsMenu(BaseOptionsMenu, Dropdown):

widgetastic_patternfly5/components/menus/select.py

@@ -1,9 +1,7 @@
 from widgetastic.exceptions import NoSuchElementException
 from widgetastic.widget import TextInput
 
-from .dropdown import Dropdown
-from .dropdown import DropdownItemDisabled
-from .dropdown import DropdownItemNotFound
+from .dropdown import Dropdown, DropdownItemDisabled, DropdownItemNotFound
 
 
 class SelectItemDisabled(DropdownItemDisabled):
@@ -40,9 +38,7 @@ class BaseSelect:
             return super().item_element(item, close)
         except DropdownItemNotFound:
             raise SelectItemNotFound(
-                "Item {!r} not found in {}. Available items: {}".format(
-                    item, repr(self), self.items
-                )
+                f"Item {item!r} not found in {repr(self)}. Available items: {self.items}"
             )
 
     def item_select(self, item):
@@ -85,8 +81,7 @@ class BaseCheckboxSelect(BaseSelect):
         ".//*[contains(@class, '-c-menu__list-item') or contains(@class, '-c-select__menu-item')]"
     )
     ITEM_LOCATOR = (
-        f"{ITEMS_LOCATOR}[.//span[starts-with(normalize-space(.), {{}})]]"
-        f"//input[@type='checkbox']"
+        f"{ITEMS_LOCATOR}[.//span[starts-with(normalize-space(.), {{}})]]//input[@type='checkbox']"
     )
 
     def item_select(self, items, close=True):
@@ -96,7 +91,7 @@ class BaseCheckboxSelect(BaseSelect):
             item: Item to be selected
             close: Close the dropdown when finished
         """
-        if not isinstance(items, (list, tuple, set)):
+        if not isinstance(items, list | tuple | set):
             items = [items]
 
         try:
@@ -115,7 +110,7 @@ class BaseCheckboxSelect(BaseSelect):
             item: Item to be selected
             close: Close the dropdown when finished
         """
-        if not isinstance(items, (list, tuple, set)):
+        if not isinstance(items, list | tuple | set):
             items = [items]
 
         try:
@@ -153,7 +148,10 @@ class BaseCheckboxSelect(BaseSelect):
         """Returns a dictionary containing the selected status as bools."""
         selected = {}
         with self.opened():
-            for el in self.browser.elements(self.ITEMS_LOCATOR):
+            items_element = self.browser.elements(self.ITEMS_LOCATOR) or self.root_browser.elements(
+                self.ITEMS_LOCATOR
+            )
+            for el in items_element:
                 item = self.browser.text(el)
                 try:
                     # get the child element of the label
@@ -172,7 +170,10 @@ class BaseCheckboxSelect(BaseSelect):
             close: Close the dropdown when finished
         """
         self.open()
-        result = [self.browser.text(el) for el in self.browser.elements(self.ITEMS_LOCATOR)]
+        items_element = self.browser.elements(self.ITEMS_LOCATOR) or self.root_browser.elements(
+            self.ITEMS_LOCATOR
+        )
+        result = [self.browser.text(el) for el in items_element]
 
         if close:
             self.close()

widgetastic_patternfly5/components/modal.py

@@ -16,7 +16,7 @@ class BaseModal:
 
     BODY = ".//div[contains(@class, '-c-modal-box__body')]"
     FOOTER = ".//*[contains(@class, '-c-modal-box__footer')]/child::node()"
-    FOOTER_ITEM = ".//*[contains(@class, '-c-modal-box__footer')]" "/button[normalize-space(.)={}]"
+    FOOTER_ITEM = ".//*[contains(@class, '-c-modal-box__footer')]/button[normalize-space(.)={}]"
     TITLE = ".//h1[contains(@class, '-c-title') or contains(@class, '-c-modal-box__title')]"
     CLOSE = ".//button[@aria-label='Close']"
 

widgetastic_patternfly5/components/navigation.py

@@ -126,7 +126,7 @@ class BaseNavigation:
             current_item = self.browser.element(self.SUB_ITEMS_ROOT, parent=li)
 
     def __repr__(self):
-        return "{}({!r})".format(type(self).__name__, self.ROOT)
+        return f"{type(self).__name__}({self.ROOT!r})"
 
 
 class Navigation(BaseNavigation, Widget):
@@ -138,11 +138,11 @@ class Navigation(BaseNavigation, Widget):
 
         quoted_label = quote(label) if label else ""
         if label:
-            label_part = " and @label={} or @aria-label={}".format(quoted_label, quoted_label)
+            label_part = f" and @label={quoted_label} or @aria-label={quoted_label}"
         else:
             label_part = ""
 
-        id_part = " and @id={}".format(quote(id)) if id else ""
+        id_part = f" and @id={quote(id)}" if id else ""
         if locator is not None:
             self.locator = locator
         elif label_part or id_part:

widgetastic_patternfly5/components/pagination.py

@@ -3,10 +3,7 @@ from contextlib import contextmanager
 
 from selenium.webdriver.common.keys import Keys
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import GenericLocatorWidget
-from widgetastic.widget import Text
-from widgetastic.widget import TextInput
-from widgetastic.widget import View
+from widgetastic.widget import GenericLocatorWidget, Text, TextInput, View
 
 from .menus.options_menu import OptionsMenu
 
@@ -169,16 +166,14 @@ class BasePagination:
     def set_per_page(self, count):
         """Sets the number of items per page. (Will cast to str)"""
         value = str(count)
-        value_per_page = "{} per page".format(value)
+        value_per_page = f"{value} per page"
         items = self._options.items
         if value_per_page in items:
             self._options.item_select(value_per_page)
         elif value in items:
             self._options.item_select(value)
         else:
-            raise ValueError(
-                "count '{}' is not a valid option in the pagination dropdown".format(count)
-            )
+            raise ValueError(f"count '{count}' is not a valid option in the pagination dropdown")
 
     def go_to_page(self, value):
         """Navigate to custom page number."""

widgetastic_patternfly5/components/progress.py

@@ -32,9 +32,8 @@ class BaseProgress:
         for class_ in self.browser.classes(self):
             if class_ in self.STATUS_TYPE_MAPPING:
                 return self.STATUS_TYPE_MAPPING[class_]
-        else:
-            default_alert_type = "info"
-            return default_alert_type
+        default_alert_type = "info"
+        return default_alert_type
 
 
 class Progress(BaseProgress, Widget):

widgetastic_patternfly5/components/switch.py

@@ -13,8 +13,9 @@ class BaseSwitch:
     """
 
     CHECKBOX_LOCATOR = "./input"
-    LABEL_ON = "./span[contains(@class, 'pf-m-on')]"
-    LABEL_OFF = "./span[contains(@class, 'pf-m-off')]"
+    PF_5_LABEL_ON = "./span[contains(@class, 'pf-m-on')]"
+    PF_5_LABEL_OFF = "./span[contains(@class, 'pf-m-off')]"
+    PF_6_LABLE = "./span[contains(@class, '-c-switch__label')]"
 
     @property
     def is_enabled(self):
@@ -24,7 +25,7 @@ class BaseSwitch:
     def click(self):
         """Click on a Switch."""
         if not self.is_enabled:
-            raise SwitchDisabled("{} is disabled".format(repr(self)))
+            raise SwitchDisabled(f"{repr(self)} is disabled")
         else:
             self.browser.click(self.CHECKBOX_LOCATOR)
             return True
@@ -37,7 +38,7 @@ class BaseSwitch:
     def fill(self, value):
         """Fills a Switch with the supplied value."""
         if not self.is_enabled:
-            raise SwitchDisabled("{} is disabled".format(repr(self)))
+            raise SwitchDisabled(f"{repr(self)} is disabled")
         if bool(value) == self.selected:
             return False
         else:
@@ -48,9 +49,9 @@ class BaseSwitch:
     def label(self):
         """Returns the label of the Switch."""
         if self.selected:
-            return self._read_locator(self.LABEL_ON)
+            return self._read_locator(self.PF_5_LABEL_ON) or self._read_locator(self.PF_6_LABLE)
         else:
-            return self._read_locator(self.LABEL_OFF)
+            return self._read_locator(self.PF_5_LABEL_OFF) or self._read_locator(self.PF_6_LABLE)
 
     def read(self):
         """Returns a boolean detailing if the Switch is on (True) of off (False)."""
@@ -63,7 +64,7 @@ class BaseSwitch:
             return None
 
     def __repr__(self):
-        return "{}({!r})".format(type(self).__name__, self.locator)
+        return f"{type(self).__name__}({self.locator!r})"
 
 
 class Switch(BaseSwitch, GenericLocatorWidget):

widgetastic_patternfly5/components/table.py

@@ -1,23 +1,23 @@
 from selenium.common.exceptions import NoSuchElementException
 from widgetastic.log import create_item_logger
-from widgetastic.widget import Table
-from widgetastic.widget import TableColumn
-from widgetastic.widget import TableRow
-from widgetastic.widget import Text
-from widgetastic.widget import Widget
+from widgetastic.widget import Table, TableColumn, TableRow, Text, Widget
 from widgetastic.widget.table import resolve_table_widget
 
 
 class HeaderColumn(TableColumn):
     """Represents a cell in the header row."""
 
+    sort_indicator = Text(
+        locator=".//span[contains(@class, '-c-table__sort-indicator')] | .//button[contains(@class, '-c-table__button')]"
+    )
+
     def __locator__(self):
-        return "(./td|./th)[{}]".format(self.position + 1)
+        return f"(./td|./th)[{self.position + 1}]"
 
     @property
     def is_sortable(self):
         """Returns true of the column is sortable."""
-        return "-c-table__sort" in self.browser.classes(self)
+        return any(cls for cls in self.browser.classes(self) if "-c-table__sort" in cls)
 
     @property
     def sorting_order(self):
@@ -28,10 +28,14 @@ class HeaderColumn(TableColumn):
         """Sorts the column according to the supplied "ascending" or "descending"."""
         if order not in ("ascending", "descending"):
             raise ValueError("order should be either 'ascending' or 'descending'")
+
+        if not self.is_sortable:
+            raise ValueError("Column is not sortable.")
+
         for _ in range(10):
             if self.sorting_order == order:
                 break
-            self.click()
+            self.sort_indicator.click()
         else:
             raise AssertionError(f"Could not set sorting order to `{order}` after 10 tries.")
 
@@ -46,7 +50,7 @@ class HeaderRow(TableRow):
         return "./thead/tr"
 
     def __repr__(self):
-        return "{}({!r})".format(type(self).__name__, self.parent)
+        return f"{type(self).__name__}({self.parent!r})"
 
     def __getitem__(self, item):
         if isinstance(item, str):
@@ -149,7 +153,7 @@ class ExpandableTableHeaderColumn(TableColumn):
 
     def __locator__(self):
         """Override the locator to look inside the first 'tr' within the tbody"""
-        return "./tr[1]/th[{}]".format(self.position + 1)
+        return f"./tr[1]/th[{self.position + 1}]"
 
 
 class RowNotExpandable(Exception):
@@ -157,7 +161,7 @@ class RowNotExpandable(Exception):
         self.row = row
 
     def __str__(self):
-        return "Row is not expandable: {}".format(repr(self.row))
+        return f"Row is not expandable: {repr(self.row)}"
 
 
 class ColumnNotExpandable(Exception):
@@ -165,7 +169,7 @@ class ColumnNotExpandable(Exception):
         self.column = column
 
     def __str__(self):
-        return "Column is not expandable: {}".format(repr(self.column))
+        return f"Column is not expandable: {repr(self.column)}"
 
 
 class ExpandableTableRow(PatternflyTableRow):
@@ -231,8 +235,9 @@ class ExpandableTableRow(PatternflyTableRow):
         """Returns a text representation of the table row."""
         result = super().read()
         # Remove the column with the "expand" button in it
-        if 0 in result and not result[0]:
-            del result[0]
+        for expand_col in [0, "Row expansion"]:
+            if expand_col in result and not result[expand_col]:
+                del result[expand_col]
         return result
 
 
@@ -329,9 +334,9 @@ class ExpandableColumn(TableColumn):
         """Override the locator to look inside the first 'tr' within the tbody"""
         if self.position == 0:
             # we assume the th column is in the first position
-            return "./tr[1]/th[{}]".format(self.position + 1)
+            return f"./tr[1]/th[{self.position + 1}]"
         else:
-            return "./tr[1]/td[{}]".format(self.position)
+            return f"./tr[1]/td[{self.position}]"
 
     @property
     def is_expandable(self):

widgetastic_patternfly5/components/tabs.py

@@ -17,7 +17,7 @@ class Tab(View):
 
     # Locator of the Tab selector
     TAB_LOCATOR = ParametrizedLocator(
-        './/div[contains(@class, "-c-tabs")]/ul' "/li[button[normalize-space(.)={@tab_name|quote}]]"
+        './/div[contains(@class, "-c-tabs")]/ul/li[button[normalize-space(.)={@tab_name|quote}]]'
     )
 
     ROOT = ParametrizedLocator(
@@ -44,14 +44,17 @@ class Tab(View):
 
     def click(self):
         """Clicks the tab."""
-        return self.parent_browser.click(self.TAB_LOCATOR)
+        el = self.parent_browser.move_to_element(self.TAB_LOCATOR)
+        if tab_btns := self.browser.elements(".//button", parent=el):
+            return self.browser.click(tab_btns[0])
+        return self.parent_browser.click(el)
 
     def select(self):
         """Selects the tab (checks if active already first)."""
         if not self.is_active():
             self.logger.info("Opening the tab %s", self.tab_name)
 
-            @wait_for_decorator(timeout=3)
+            @wait_for_decorator(timeout=5)
             def _click():
                 self.click()
                 return self.is_active()
@@ -61,4 +64,4 @@ class Tab(View):
         self.select()
 
     def __repr__(self):
-        return "<Tab {!r}>".format(self.tab_name)
+        return f"<Tab {self.tab_name!r}>"

widgetastic_patternfly5/components/title.py

@@ -1,5 +1,4 @@
-from widgetastic.widget import ParametrizedLocator
-from widgetastic.widget import Widget
+from widgetastic.widget import ParametrizedLocator, Widget
 
 
 class BaseTitle:

widgetastic_patternfly5/ouia.py

@@ -1,5 +1,4 @@
-from widgetastic.ouia import OUIAGenericView
-from widgetastic.ouia import OUIAGenericWidget
+from widgetastic.ouia import OUIAGenericView, OUIAGenericWidget
 from widgetastic.ouia.input import TextInput as BaseOuiaTextInput
 from widgetastic.ouia.text import Text as BaseOuiaText
 from widgetastic.widget.table import Table
@@ -12,17 +11,13 @@ from widgetastic_patternfly5.components.card import BaseCard
 from widgetastic_patternfly5.components.clipboard_copy import BaseClipboardCopy
 from widgetastic_patternfly5.components.forms.form_select import BaseFormSelect
 from widgetastic_patternfly5.components.menus.dropdown import BaseDropdown
-from widgetastic_patternfly5.components.menus.menu import BaseCheckboxMenu
-from widgetastic_patternfly5.components.menus.menu import BaseMenu
-from widgetastic_patternfly5.components.menus.select import BaseSelect
-from widgetastic_patternfly5.components.menus.select import BaseTypeaheadSelect
+from widgetastic_patternfly5.components.menus.menu import BaseCheckboxMenu, BaseMenu
+from widgetastic_patternfly5.components.menus.select import BaseSelect, BaseTypeaheadSelect
 from widgetastic_patternfly5.components.modal import BaseModal
 from widgetastic_patternfly5.components.navigation import BaseNavigation
-from widgetastic_patternfly5.components.pagination import BaseCompactPagination
-from widgetastic_patternfly5.components.pagination import BasePagination
+from widgetastic_patternfly5.components.pagination import BaseCompactPagination, BasePagination
 from widgetastic_patternfly5.components.switch import BaseSwitch
-from widgetastic_patternfly5.components.table import BaseExpandableTable
-from widgetastic_patternfly5.components.table import BasePatternflyTable
+from widgetastic_patternfly5.components.table import BaseExpandableTable, BasePatternflyTable
 from widgetastic_patternfly5.components.title import BaseTitle
 
 

widgetastic.patternfly5-25.2.11.0.dist-info/RECORD

@@ -1,46 +0,0 @@
-widgetastic_patternfly5/__init__.py,sha256=YeVCoYFKRjU7Jgm8iYlikzG_aUfdPr--ayP4i_KrKuY,4859
-widgetastic_patternfly5/ouia.py,sha256=DCVMYscDvvhDbYlyfEnuaS1yUAqQ8Ty3sV50tZkXQHI,4299
-widgetastic_patternfly5/charts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-widgetastic_patternfly5/charts/alerts_timeline_chart.py,sha256=U7hJvxAG1Wgj9WFt5QxAmLh9cJm2qzs2YHs2wfEW0Pk,2377
-widgetastic_patternfly5/charts/boxplot_chart.py,sha256=6Ek6gwbmwNeazy-5o2fVfvkjpd6bhbTyitiPomvLBts,405
-widgetastic_patternfly5/charts/bullet_chart.py,sha256=G7-U1l9d8VlkiPKc3IfFtcleHAmM5WXsfAKwiyw5DEg,3737
-widgetastic_patternfly5/charts/donut_chart.py,sha256=phPoVkvxdfUqxsHB8uWvdFUhWGT3ECi89J8H7VCySx4,2693
-widgetastic_patternfly5/charts/legend.py,sha256=fhAg-FhsWpvi91BZ29EztKO3QfANRW-hnfzIkq45q3Y,2983
-widgetastic_patternfly5/charts/line_chart.py,sha256=-TetZ4LiF35p4P1KYc_DE5vpvd4tevytaQx0at2TRP0,3612
-widgetastic_patternfly5/charts/pie_chart.py,sha256=rIxMv6vPERj9FnTp8daejL7MxUTKFCTj9057C1KuuKw,218
-widgetastic_patternfly5/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-widgetastic_patternfly5/components/alert.py,sha256=lSh2TxSOxLob4VO0J7fr-W09R2_Sa4RLRtR5XBjA4_U,2613
-widgetastic_patternfly5/components/breadcrumb.py,sha256=_lQ7pqmh2P9FSwMae_quUTteHsfXFlQvYaXE4Z1gK1g,2035
-widgetastic_patternfly5/components/button.py,sha256=taiZYjFez5zVyOUBklIIz-kEGFLjigf0I97G2PYepCI,3621
-widgetastic_patternfly5/components/card.py,sha256=wwk9QqXl66ikvZ0Q40Sir0JWI2AHxtYSNCRZOJB1YfA,2783
-widgetastic_patternfly5/components/chip.py,sha256=CidCOMOPBVYG8ubg2DHLX6aj9NJhAv1RVWEfQKNdL4A,11142
-widgetastic_patternfly5/components/clipboard_copy.py,sha256=klEgT2RN4Sc7pd7Erwlxyj6ahOwexeMkTzyn6cCHNRk,1352
-widgetastic_patternfly5/components/description_list.py,sha256=sVhKwKnvJguZh9FqyPC1NU2UA_w7uA3ugkY5eoVRlPk,989
-widgetastic_patternfly5/components/drawer.py,sha256=NuWK3DLpY6YmGs3ANi5XGizJRYhEnrrLcucP2ZFZHoA,949
-widgetastic_patternfly5/components/dual_list_selector.py,sha256=tPT3cMmKVU3vs-iEW0D-iH-E17MOufWyrgQQUm5kHzY,4869
-widgetastic_patternfly5/components/expandable_section.py,sha256=QCqonn1kiYfL-mGcjwrG6x4TiJBr9RKXZvyDerVTUmQ,1876
-widgetastic_patternfly5/components/modal.py,sha256=842x6D9Xe4LRW0YA8W-rGp8Ak8tHwinD_zktLCYsjtg,2003
-widgetastic_patternfly5/components/navigation.py,sha256=9CdnD23hlBtfJAi1RDFRSbTpHc7Rz8wS1W-C9XWOGZw,5361
-widgetastic_patternfly5/components/pagination.py,sha256=YIDYCEATEp4BVy0JZYtNIRGy-dKbgZP2WOzZ6z3c56s,8843
-widgetastic_patternfly5/components/popover.py,sha256=_XZlM4v8gsmen73DoSpylMXAMeEkdkjRsuBIIKHHhtE,2242
-widgetastic_patternfly5/components/progress.py,sha256=VWgg48c5YtnaCO4DJopks0ZXJsmpzpD-OUOUaMoCC94,1413
-widgetastic_patternfly5/components/slider.py,sha256=B9gr8mnndLWivSlS9lIRd3SW6W5Iev9ESnQE9b0A55Y,3128
-widgetastic_patternfly5/components/switch.py,sha256=7BkpxRb7aKVWwQn1r_80zvcHlu8H_-sOoKVf1ebgHbY,2090
-widgetastic_patternfly5/components/table.py,sha256=wuA_L2wu2AeTyepeHoMzBoYVAl1REr0lNq7p08BfCRM,16989
-widgetastic_patternfly5/components/tabs.py,sha256=ywk8zfuQ8m2IS7gd84xWQOjMwQjtJS1iCNIg9vDrwxA,2097
-widgetastic_patternfly5/components/title.py,sha256=ZSAT4baAOTBYsM4d9Jt74C7JR6yhRE7ewzMd3Ez6QGk,950
-widgetastic_patternfly5/components/date_and_time/calendar_month.py,sha256=zGIgIsYEWH3VPVNBVIPVaKlnRY61648tM8rGtohmy7s,3307
-widgetastic_patternfly5/components/forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-widgetastic_patternfly5/components/forms/form_select.py,sha256=jQUpwJnJnOl5_0XzeplpHx9vz-6GMXUETny-F1TAU-o,3649
-widgetastic_patternfly5/components/forms/radio.py,sha256=9I7P9hsKRojGvTZtSsqVTI_4ek_qIYKEdamSdUfxsMA,2099
-widgetastic_patternfly5/components/menus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-widgetastic_patternfly5/components/menus/context_selector.py,sha256=uMumIPxuY3f_r5o9JrMibiPQgpFjRaFQwwo08_rVeMQ,1150
-widgetastic_patternfly5/components/menus/dropdown.py,sha256=5nCz0HRG4VcrzD1NFC9Hj1m2T4yHihfNf2MNQWnBOEk,9478
-widgetastic_patternfly5/components/menus/menu.py,sha256=0cUb5V1y3RgRpdAB8DlPIL9OOl7IxBC8A1xjcZgfLBA,7949
-widgetastic_patternfly5/components/menus/menu_toggle.py,sha256=PBwNvg6E2RPdCG6ALBUqyTZxCwThJgk5S-9ghTiZ9hM,1029
-widgetastic_patternfly5/components/menus/options_menu.py,sha256=43D0_JHeY-kPORQi54NL9OVmcMyAolVnI4dqHpo5omY,1353
-widgetastic_patternfly5/components/menus/select.py,sha256=7iT6X9RaXrZWNbMaMZ2tJfCJKKJyaNUjTCktpyH8YKQ,6354
-widgetastic.patternfly5-25.2.11.0.dist-info/METADATA,sha256=RdkbNf1RFcCM6EMqlHDAF2haQhMQ7HYMJ8Gnfxlo5m0,7078
-widgetastic.patternfly5-25.2.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-widgetastic.patternfly5-25.2.11.0.dist-info/licenses/LICENSE,sha256=nDhhj8jp0XsTdmvWpTWFpOKVn0LPXPb6ecA9zFF3Exk,576
-widgetastic.patternfly5-25.2.11.0.dist-info/RECORD,,