Date format fix

src/helpers/ContentType.ts

@@ -937,6 +937,13 @@ export class ContentType {
           contentType
         );
 
+        let isTypeSet = false;
+        if (data.type) {
+          isTypeSet = true;
+        } else {
+          data.type = contentType.name;
+        }
+
         const article: ParsedFrontMatter = {
           content: '',
           data: Object.assign({}, data),
@@ -945,6 +952,10 @@ export class ContentType {
 
         data = ArticleHelper.updateDates(article);
 
+        if (isTypeSet) {
+          delete data.type;
+        }
+
         if (contentType.name !== DEFAULT_CONTENT_TYPE_NAME) {
           data['type'] = contentType.name;
         }

src/listeners/panel/DataListener.ts

@@ -306,7 +306,6 @@ export class DataListener extends BaseListener {
       }
     }
 
-    const dateFields = ContentType.findFieldsByTypeDeep(contentType.fields, 'datetime');
     const imageFields = ContentType.findFieldsByTypeDeep(contentType.fields, 'image');
     const fileFields = ContentType.findFieldsByTypeDeep(contentType.fields, 'file');
     const fieldsWithEmojiEncoding = contentType.fields.filter((f) => f.encodeEmoji);
@@ -314,13 +313,6 @@ export class DataListener extends BaseListener {
     // Support multi-level fields
     const parentObj = DataListener.getParentObject(article.data, article, parents, blockData);
 
-    const dateFieldsArray = dateFields.find((f: Field[]) => {
-      const lastField = f?.[f.length - 1];
-      if (lastField) {
-        return lastField.name === field;
-      }
-    });
-
     // Check multi-image fields
     const multiImageFieldsArray = imageFields.find((f: Field[]) => {
       const lastField = f?.[f.length - 1];
@@ -338,13 +330,7 @@ export class DataListener extends BaseListener {
     });
 
     // Check date fields
-    if (dateFieldsArray && dateFieldsArray.length > 0) {
-      for (const dateField of dateFieldsArray) {
-        if (field === dateField.name && value) {
-          parentObj[field] = Article.formatDate(new Date(value), dateField.dateFormat);
-        }
-      }
-    } else if (multiImageFieldsArray || multiFileFieldsArray) {
+    if (multiImageFieldsArray || multiFileFieldsArray) {
       const fields =
         multiImageFieldsArray && multiImageFieldsArray.length > 0
           ? multiImageFieldsArray

src/panelWebView/components/Fields/DateTimeField.tsx

@@ -11,7 +11,7 @@ import { LocalizationKey } from '../../../localization';
 
 export interface IDateTimeFieldProps extends BaseFieldProps<Date | null> {
   format?: string;
-  onChange: (date: Date) => void;
+  onChange: (date: string) => void;
 }
 
 type InputProps = JSX.IntrinsicElements['input'];
@@ -37,7 +37,7 @@ export const DateTimeField: React.FunctionComponent<IDateTimeFieldProps> = ({
 
   const onDateChange = React.useCallback((date: Date) => {
     setDateValue(date);
-    onChange(date);
+    onChange(DateHelper.format(date, format || DEFAULT_FORMAT) || "");
   }, [format, onChange]);
 
   const showRequiredState = useMemo(() => {