Skip to content
This repository was archived by the owner on Apr 18, 2024. It is now read-only.
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix DateTime
  • Loading branch information
Gondragos committed Oct 11, 2023
commit ebe3ffa4bfd973ce3b15f8301511d8c0db03aaff
20 changes: 18 additions & 2 deletions src/tags/control/DateTime.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as d3 from 'd3';
import React from 'react';
import React, { useState } from 'react';
import { inject, observer } from 'mobx-react';
import { types } from 'mobx-state-tree';

Expand Down Expand Up @@ -363,14 +363,29 @@ const HtxDateTime = inject('store')(
className: 'ant-input',
};
const [minTime, maxTime] = [item.min, item.max].map(s => s?.match(/\d?\d:\d\d/)?.[0]);
const [dateInputValue, setDateInputValue] = useState('');

const handleDateInputValueChange = event => {
const value = event.target.value;
const validDateArray = item.validDateFormat(value);

setDateInputValue(value);
if (!value || validDateArray) item.setDate(validDateArray);
};

if (item.updateValue) {
if (item.showDate && (item.date === undefined || item.date !== dateInputValue)) {
setDateInputValue(item.date || '');
}
item.setNeedsUpdate(false);
}

const handleDateOnBlur = () => {
const dateWasNotSaved = dateInputValue !== item.date;

if (dateWasNotSaved) setDateInputValue(item.date || '');
};

return (
<div className="htx-datetime" style={visibleStyle}>
{item.showMonth && (
Expand Down Expand Up @@ -411,10 +426,11 @@ const HtxDateTime = inject('store')(
type="date"
readOnly={disabled}
name={item.name + '-date'}
value={item.date ?? ''}
value={dateInputValue || item.date || ''}
min={item.min}
max={item.max}
onChange={disabled ? undefined : handleDateInputValueChange}
onBlur={disabled ? undefined : handleDateOnBlur}
/>
)}
{item.showTime && (
Expand Down