beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Component name change and code corrections

Browse source
This commit is contained in:
jubitjohn 2023-06-09 00:40:19 +05:30
parent 27638f52df
commit 9fd136c02e
2 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/photos/src/components/Collections/CollectionShare/emailShare.tsx
View file

@ -1,6 +1,6 @@
import SingleInputFormEmailShare, {
SingleInputFormEmailShareProps,
} from 'components/SingleInputFormEmailShare';
import SingleInputAutocomplete, {
SingleInputAutocompleteProps,
} from 'components/SingleInputAutocomplete';
import { GalleryContext } from 'pages/gallery';
import React, { useContext, useState, useEffect } from 'react';
import { t } from 'i18next';
@ -47,7 +47,7 @@ export default function EmailShare({ collection }) {
getUpdatedOptionsList();
}, []);
const collectionShare: SingleInputFormEmailShareProps['callback'] = async (
const collectionShare: SingleInputAutocompleteProps['callback'] = async (
email,
setFieldError,
resetForm
@ -72,7 +72,7 @@ export default function EmailShare({ collection }) {
};
return (
<>
<SingleInputFormEmailShare
<SingleInputAutocomplete
callback={collectionShare}
optionsList={updatedOptionsList}
placeholder={t('ENTER_EMAIL')}

26
apps/photos/src/components/SingleInputFormEmailShare.tsx → apps/photos/src/components/SingleInputAutocomplete.tsx
View file

@ -3,7 +3,6 @@ import { Formik, FormikHelpers, FormikState } from 'formik';
import * as Yup from 'yup';
import SubmitButton from './SubmitButton';
import TextField from '@mui/material/TextField';
// import ShowHidePassword from './Form/ShowHidePassword';
import { FlexWrapper } from './Container';
import { Button, FormHelperText } from '@mui/material';
import { t } from 'i18next';
@ -12,7 +11,7 @@ import Autocomplete from '@mui/material/Autocomplete';
interface formValues {
inputValue: string;
}
export interface SingleInputFormEmailShareProps {
export interface SingleInputAutocompleteProps {
callback: (
inputValue: string,
setFieldError: (errorMessage: string) => void,
@ -34,8 +33,8 @@ export interface SingleInputFormEmailShareProps {
optionsList?: string[];
}
export default function SingleInputFormEmailShare(
props: SingleInputFormEmailShareProps
export default function SingleInputAutocomplete(
props: SingleInputAutocompleteProps
) {
const [selectedOptions, setSelectedOptions] = useState([]);
@ -43,7 +42,6 @@ export default function SingleInputFormEmailShare(
const { sx: buttonSx, ...restSubmitButtonProps } = submitButtonProps ?? {};
const [loading, SetLoading] = useState(false);
// const [showPassword, setShowPassword] = useState(false);
const submitForm = async (
values: formValues,
@ -63,26 +61,12 @@ export default function SingleInputFormEmailShare(
SetLoading(false);
};
// const handleClickShowPassword = () => {
// setShowPassword(!showPassword);
// };
// const handleMouseDownPassword = (
// event: React.MouseEvent<HTMLButtonElement>
// ) => {
// event.preventDefault();
// };
const validationSchema = useMemo(() => {
switch (props.fieldType) {
case 'text':
return Yup.object().shape({
inputValue: Yup.string().required(t('REQUIRED')),
});
case 'password':
return Yup.object().shape({
inputValue: Yup.string().required(t('REQUIRED')),
});
case 'email':
return Yup.object().shape({
inputValue: Yup.string()
@ -102,7 +86,7 @@ export default function SingleInputFormEmailShare(
{({
values,
errors,
handleChange,
handleSubmit,
setFieldValue,
}) => (
@ -129,12 +113,14 @@ export default function SingleInputFormEmailShare(
fullWidth
type={props.fieldType}
id={props.fieldType}
onChange={handleChange('inputValue')}
name={props.fieldType}
{...(props.hiddenLabel
? { placeholder: props.placeholder }
: { label: props.placeholder })}
error={Boolean(errors.inputValue)}
helperText={errors.inputValue}
value={values.inputValue}
disabled={loading}
autoFocus={!props.disableAutoFocus}
autoComplete={props.autoComplete}