1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-24 20:36:40 +07:00

fixed node editor

This commit is contained in:
Fedor Katurov 2021-11-21 21:30:43 +07:00
parent 64cc47a116
commit 39967c7e9e
3 changed files with 12 additions and 6 deletions

View file

@ -5,6 +5,7 @@ import { ModalWrapper } from '~/components/dialogs/ModalWrapper';
import { LoaderCircle } from '~/components/input/LoaderCircle'; import { LoaderCircle } from '~/components/input/LoaderCircle';
import styles from './styles.module.scss'; import styles from './styles.module.scss';
import { useGetNode } from '~/utils/hooks/data/useGetNode'; import { useGetNode } from '~/utils/hooks/data/useGetNode';
import { EMPTY_NODE } from '~/redux/node/constants';
const EditorEditDialog: FC = () => { const EditorEditDialog: FC = () => {
const history = useHistory(); const history = useHistory();
@ -34,7 +35,7 @@ const EditorEditDialog: FC = () => {
); );
} }
return <EditorDialog node={node} onRequestClose={goBack} />; return <EditorDialog node={node || EMPTY_NODE} onRequestClose={goBack} />;
}; };
export { EditorEditDialog }; export { EditorEditDialog };

View file

@ -15,7 +15,7 @@ import { useDispatch } from 'react-redux';
import { uploadUploadFiles } from '~/redux/uploads/actions'; import { uploadUploadFiles } from '~/redux/uploads/actions';
import { useShallowSelect } from '~/utils/hooks/useShallowSelect'; import { useShallowSelect } from '~/utils/hooks/useShallowSelect';
import { selectUploads } from '~/redux/uploads/selectors'; import { selectUploads } from '~/redux/uploads/selectors';
import { has, path } from 'ramda'; import { path } from 'ramda';
import { IUploadStatus } from '~/redux/uploads/reducer'; import { IUploadStatus } from '~/redux/uploads/reducer';
export const useFileUploader = ( export const useFileUploader = (
@ -66,7 +66,7 @@ export const useFileUploader = (
setPendingIDs(newPending); setPendingIDs(newPending);
setFiles([...files, ...added]); setFiles([...files, ...added]);
} }
}, [statuses, files, pendingIDs, uploadedFiles]); }, [statuses, files, pendingIDs, setFiles, setPendingIDs, uploadedFiles]);
const pending = useMemo(() => pendingIDs.map(id => statuses[id]).filter(el => !!el), [ const pending = useMemo(() => pendingIDs.map(id => statuses[id]).filter(el => !!el), [
statuses, statuses,

View file

@ -61,9 +61,14 @@ export const useNodeFormFormik = (
validateOnChange: true, validateOnChange: true,
}); });
useEffect(() => { useEffect(
formik.setFieldValue('files', uploader.files); () => {
}, [formik, formik.setFieldValue, uploader.files]); formik.setFieldValue('files', uploader.files);
},
// because it breaks files logic
// eslint-disable-next-line
[uploader.files, formik.setFieldValue]
);
return formik; return formik;
}; };