TagSpaces is an offline, open source, document manager with tagging support
fix edit DateTag (#1532)
Stanimira8f453c2a056
diff --git a/app/components/dialogs/EditEntryTagDialog.tsx b/app/components/dialogs/EditEntryTagDialog.tsxindex 58117d804..eb99c282f 100644--- a/app/components/dialogs/EditEntryTagDialog.tsx+++ b/app/components/dialogs/EditEntryTagDialog.tsx@@ -16,7 +16,13 @@**/-import React, { useState, useEffect, useMemo } from 'react';+import React, {+ useState,+ useEffect,+ useMemo,+ ChangeEvent,+ useRef+} from 'react';import { connect } from 'react-redux';import { bindActionCreators } from 'redux';import withMobileDialog from '@material-ui/core/withMobileDialog';@@ -29,6 +35,7 @@ import { withStyles } from '@material-ui/core/styles';import FormControl from '@material-ui/core/FormControl';import FormHelperText from '@material-ui/core/FormHelperText';import Dialog from '@material-ui/core/Dialog';+import EditIcon from '@material-ui/icons/Edit';import i18n from '-/services/i18n';import { isGeoTag } from '-/utils/misc';import { Pro } from '-/pro';@@ -69,16 +76,10 @@ const EditEntryTagDialog = (props: Props) => {const [title, setTitle] = useState(props.selectedTag && props.selectedTag.title);- const { setError, haveError } = useValidation();- const { onClose, open, fullScreen } = props;-- useEffect(() => {- handleValidation();- }, [title]);-+ const titleRef = useRef<HTMLInputElement>(null);const isShowDatePeriodEditor = useMemo(() => {let showDatePeriodEditor = false;- if (title.indexOf('-') > -1) {+ if (title && title.indexOf('-') > -1) {const a = title.split('-');if (a.length === 2) {for (let i = 0; i < a.length; i += 1) {@@ -93,6 +94,16 @@ const EditEntryTagDialog = (props: Props) => {} else showDatePeriodEditor = isDateTimeTag(title);return DateTagEditor && showDatePeriodEditor;}, []);+ const [editDisabled, setEditDisabled] = useState<boolean>(isShowDatePeriodEditor);+ const { setError, haveError } = useValidation();+ const { onClose, open, fullScreen } = props;++ useEffect(() => {+ if (titleRef && titleRef.current) {+ titleRef.current.value = title;+ }+ // handleValidation();+ }, [title]);function handleValidation() {const tagCheck = RegExp(/^[^#/\\ [\]]{1,}$/);@@ -104,6 +115,7 @@ const EditEntryTagDialog = (props: Props) => {}function onConfirm() {+ handleValidation();if (!haveError()) {if (props.selectedEntries.length > 0) {props.selectedEntries.forEach(entry =>@@ -131,28 +143,37 @@ const EditEntryTagDialog = (props: Props) => {<DialogContentdata-tid="editEntryTagDialog"className={props.classes.root}- style={{ overflow: AppConfig.isFirefox ? 'auto' : 'overlay' }}+ style={{+ overflow: AppConfig.isFirefox ? 'auto' : 'overlay'+ }}><FormControl fullWidth={true} error={haveError('tag')}><TextFieldfullWidth={true}error={haveError('tag')}+ disabled={editDisabled}+ inputRef={titleRef}margin="dense"name="title"autoFocuslabel={i18n.t('core:editTag')}- onChange={event => {+ onChange={(event: ChangeEvent<HTMLInputElement>) => {const { target } = event;setTitle(target.value);}}- value={title}+ defaultValue={title}data-tid="editTagEntryDialog_input"+ InputProps={{+ endAdornment: (+ <EditIcon onClick={() => setEditDisabled(!editDisabled)} />+ )+ }}/>{haveError('tag') && (<FormHelperText>{i18n.t('core:tagTitleHelper')}</FormHelperText>)}</FormControl>- {showGeoEditor && (+ {editDisabled && showGeoEditor && (<GeoTagEditorgeoTag={title}onChange={setTitle}@@ -164,7 +185,7 @@ const EditEntryTagDialog = (props: Props) => {tileServer={props.tileServer}/>)}- {isShowDatePeriodEditor && (+ {editDisabled && isShowDatePeriodEditor && (<DateTagEditordatePeriodTag={props.selectedTag && props.selectedTag.title}onChange={setTitle}@@ -176,7 +197,11 @@ const EditEntryTagDialog = (props: Props) => {function renderActions() {return (- <DialogActions style={{ justifyContent: 'space-between' }}>+ <DialogActions+ style={{+ justifyContent: 'space-between'+ }}+ >{GeoTagEditor && isGeoTag(title) ? (<Buttondata-tid="switchAdvancedModeTID"@@ -249,7 +274,15 @@ function mapDispatchToProps(dispatch) {);}+const areEqual = (prevProp, nextProp) =>+ JSON.stringify(nextProp.selectedTag) === JSON.stringify(prevProp.selectedTag);+export default connect(mapStateToProps,mapDispatchToProps-)(withMobileDialog()(withStyles(styles)(EditEntryTagDialog)));+)(+ React.memo(+ withMobileDialog()(withStyles(styles)(EditEntryTagDialog)),+ areEqual+ )+);