fix: added block id to date ids to ensure unique field ids (#771)

Co-authored-by: Martina Bustacchini <[email protected]>
italia · Sep 19, 2024 · 4c9f6c1 · 4c9f6c1
1 parent 92ab586
commit 4c9f6c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/components/ItaliaTheme/Blocks/BandiSearch/Body.jsx b/src/components/ItaliaTheme/Blocks/BandiSearch/Body.jsx
@@ -167,6 +167,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
                 <>
                   {React.createElement(filterOne.widget.component, {
                     ...filterOne.widget?.props,
+                    blockID: id,
                     id: 'filterOne',
                     onChange: (filter, value) => {
                       dispatchFilter({
@@ -180,6 +181,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
               {filterTwo &&
                 React.createElement(filterTwo.widget?.component, {
                   ...filterTwo.widget?.props,
+                  blockID: id,
                   id: 'filterTwo',
                   onChange: (filter, value) =>
                     dispatchFilter({
@@ -190,6 +192,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
               {filterThree &&
                 React.createElement(filterThree.widget?.component, {
                   ...filterThree.widget?.props,
+                  blockID: id,
                   id: 'filterThree',
                   onChange: (filter, value) =>
                     dispatchFilter({

diff --git a/src/components/ItaliaTheme/Blocks/Common/SearchFilters/DateFilter.jsx b/src/components/ItaliaTheme/Blocks/Common/SearchFilters/DateFilter.jsx
@@ -188,6 +188,7 @@ const DateFilter = (props) => {
     endLabel,
     defaultStart,
     defaultEnd,
+    blockID,
     ...rest
   } = props;
   const { DateRangePicker } = reactDates;
@@ -230,12 +231,12 @@ const DateFilter = (props) => {
       <DateRangePicker
         {...rest}
         startDate={value?.startDate || defaultStart}
-        startDateId="start-date-filter"
+        startDateId={`start-date-filter-${blockID}`}
         startDatePlaceholderText={
           startLabel ?? intl.formatMessage(messages.eventSearchStartDate)
         }
         endDate={value?.endDate || defaultEnd}
-        endDateId="end-date-filter"
+        endDateId={`end-date-filter-${blockID}`}
         endDatePlaceholderText={
           endLabel ?? intl.formatMessage(messages.eventSearchEndDate)
         }

diff --git a/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx b/src/components/ItaliaTheme/Blocks/EventSearch/Body.jsx
@@ -182,6 +182,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
                 <>
                   {React.createElement(filterOne.widget.component, {
                     ...filterOne.widget?.props,
+                    blockID: id,
                     id: 'filterOne',
                     onChange: (filter, value) => {
                       dispatchFilter({
@@ -195,6 +196,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
               {filterTwo &&
                 React.createElement(filterTwo.widget?.component, {
                   ...filterTwo.widget?.props,
+                  blockID: id,
                   id: 'filterTwo',
                   onChange: (filter, value) =>
                     dispatchFilter({
@@ -205,6 +207,7 @@ const Body = ({ data, id, inEditMode, path, onChangeBlock }) => {
               {filterThree &&
                 React.createElement(filterThree.widget?.component, {
                   ...filterThree.widget?.props,
+                  blockID: id,
                   id: 'filterThree',
                   onChange: (filter, value) =>
                     dispatchFilter({