Merge pull request #841 from culturecreates/feature/issue-784

Feature/issue 784
culturecreates · Dec 5, 2023 · 6002f77 · 6002f77
2 parents 2b16c3f + 946baa8
commit 6002f77
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx
@@ -7,17 +7,31 @@ import frLocale from 'antd/es/date-picker/locale/fr_CA';
 import enLocale from 'antd/es/date-picker/locale/en_US';
 
 function DatePickerStyled(props) {
+  const handleDateChange = (value) => {
+    if (value && value.isValid()) {
+      datePickerRef.current.blur();
+    }
+    if (props.onChange) {
+      props.onChange(value);
+    }
+  };
+
+  const datePickerRef = React.createRef();
+
   return (
     <DatePicker
+      ref={datePickerRef}
       format="DD/MM/YYYY"
       size="large"
       locale={i18n?.language === 'en' ? enLocale : i18n?.language === 'fr' && frLocale}
       className="date-picker-wrapper"
       {...props}
+      changeOnBlur={true}
       placeholder={i18n?.language === 'en' ? 'DD/MM/YYYY' : 'JJ/MM/AAAA'}
       showToday={false}
       popupClassName="date-picker-calendar"
       getPopupContainer={(trigger) => trigger.parentNode}
+      onChange={handleDateChange}
     />
   );
 }

diff --git a/src/components/TextEditor/TextEditor.jsx b/src/components/TextEditor/TextEditor.jsx
@@ -89,6 +89,11 @@ function TextEditor(props) {
           placeholder={placeholder}
           className="text-editor"
           modules={modules}
+          style={{
+            border: `${
+              calendarContentLanguage === contentLanguage.BILINGUAL ? '4px solid #E8E8E8' : '1px solid #b6c1c9'
+            }`,
+          }}
           preserveWhitespace
           onChange={onChange}
           data-cy="text-editor"

diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx
@@ -3278,7 +3278,11 @@ function AddEvent() {
                           )}
                           style={{
                             borderRadius: '4px',
-                            border: '4px solid #E8E8E8',
+                            border: `${
+                              calendarContentLanguage === contentLanguage.BILINGUAL
+                                ? '4px solid #E8E8E8'
+                                : '1px solid #b6c1c9'
+                            }`,
                             width: '423px',
                             resize: 'vertical',
                           }}
@@ -3297,7 +3301,11 @@ function AddEvent() {
                           )}
                           style={{
                             borderRadius: '4px',
-                            border: '4px solid #E8E8E8',
+                            border: `${
+                              calendarContentLanguage === contentLanguage.BILINGUAL
+                                ? '4px solid #E8E8E8'
+                                : '1px solid #b6c1c9'
+                            }`,
                             width: '423px',
                             resize: 'vertical',
                           }}