From 76ed96879ed514946dbe68cbb35d40d44f8199af Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Wed, 14 Aug 2024 14:31:02 +0200
Subject: [PATCH 1/4] Fix imports of widgets

---
 plone/app/event/dx/behaviors.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plone/app/event/dx/behaviors.py b/plone/app/event/dx/behaviors.py
index 95de9aa3..1f503cf6 100644
--- a/plone/app/event/dx/behaviors.py
+++ b/plone/app/event/dx/behaviors.py
@@ -15,7 +15,9 @@
 from plone.app.event.dx.interfaces import IDXEvent
 from plone.app.event.dx.interfaces import IDXEventRecurrence
 from plone.app.textfield.value import RichTextValue
-from plone.app.z3cform.widget import DatetimeFieldWidget
+from plone.app.z3cform.widgets.datetime import DatetimeFieldWidget
+from plone.app.z3cform.widgets.text import TextFieldWidget
+from plone.app.z3cform.widgets.text import TextLinesFieldWidget
 from plone.autoform import directives
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.base.utils import safe_text
@@ -28,8 +30,6 @@
 from plone.supermodel import model
 from plone.uuid.interfaces import IUUID
 from z3c.form.browser.checkbox import SingleCheckBoxFieldWidget
-from z3c.form.browser.text import TextFieldWidget
-from z3c.form.browser.textlines import TextLinesFieldWidget
 from zope import schema
 from zope.component import adapter
 from zope.globalrequest import getRequest

From 5f706243847a3167b7454b6e333e070e82ad931c Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Wed, 14 Aug 2024 14:31:11 +0200
Subject: [PATCH 2/4] add news

---
 news/396.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/396.bugfix

diff --git a/news/396.bugfix b/news/396.bugfix
new file mode 100644
index 00000000..68e959c9
--- /dev/null
+++ b/news/396.bugfix
@@ -0,0 +1 @@
+use widgets for behavior fields from `plone.app.z3cform` to make the formfields BS5 ready [1letter]

From 733ee57196376e9c8cf2f1151fcf49497431f801 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Wed, 14 Aug 2024 15:27:07 +0200
Subject: [PATCH 3/4] Fix imports, switch between Plon 6.1 and lower versions

---
 plone/app/event/dx/behaviors.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/plone/app/event/dx/behaviors.py b/plone/app/event/dx/behaviors.py
index 1f503cf6..fd04d6ec 100644
--- a/plone/app/event/dx/behaviors.py
+++ b/plone/app/event/dx/behaviors.py
@@ -16,8 +16,6 @@
 from plone.app.event.dx.interfaces import IDXEventRecurrence
 from plone.app.textfield.value import RichTextValue
 from plone.app.z3cform.widgets.datetime import DatetimeFieldWidget
-from plone.app.z3cform.widgets.text import TextFieldWidget
-from plone.app.z3cform.widgets.text import TextLinesFieldWidget
 from plone.autoform import directives
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.base.utils import safe_text
@@ -41,6 +39,23 @@
 from zope.schema.interfaces import IContextAwareDefaultFactory
 
 
+try:
+    # Import fails for Plone < 6.1
+    # version pin of plone.app.z3cform is set to plone.app.z3cform==4.3.2
+    # TextLinesFieldWidget is introduced in plone.app.z3cform==4.4.0
+    from plone.app.z3cform.widgets.text import TextFieldWidget
+except ImportError:
+    from z3c.form.browser.text import TextFieldWidget
+
+try:
+    # Import fails for Plone < 6.1
+    # version pin of plone.app.z3cform is set to plone.app.z3cform==4.3.2
+    # TextLinesFieldWidget is introduced in plone.app.z3cform==4.4.0
+    from z3c.form.browser.textlines import TextLinesFieldWidget
+except ImportError:
+    from z3c.form.browser.textlines import TextLinesFieldWidget
+
+
 def first_weekday_sun0():
     return wkday_to_mon1(first_weekday())
 

From b5df68283fd1fbc9ea74cbec4880849f2c4f96f6 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Mon, 19 Aug 2024 15:49:56 +0200
Subject: [PATCH 4/4] fix import

---
 plone/app/event/dx/behaviors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plone/app/event/dx/behaviors.py b/plone/app/event/dx/behaviors.py
index fd04d6ec..d29addf2 100644
--- a/plone/app/event/dx/behaviors.py
+++ b/plone/app/event/dx/behaviors.py
@@ -51,7 +51,7 @@
     # Import fails for Plone < 6.1
     # version pin of plone.app.z3cform is set to plone.app.z3cform==4.3.2
     # TextLinesFieldWidget is introduced in plone.app.z3cform==4.4.0
-    from z3c.form.browser.textlines import TextLinesFieldWidget
+    from plone.app.z3cform.widgets.textlines import TextLinesFieldWidget
 except ImportError:
     from z3c.form.browser.textlines import TextLinesFieldWidget