Skip to content

fix: now newSticker updating #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HanmaDaiki wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: now newSticker updating #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bb392d
fix: now newSticker updating
HanmaDaiki Oct 1, 2023
e8f2fc4
bug: fix preview
HanmaDaiki Oct 2, 2023
1dab3cd
fix
HanmaDaiki Oct 2, 2023
356a6b2
fix
HanmaDaiki Oct 3, 2023
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
84 changes: 60 additions & 24 deletions src/components/NewSticker/NewSticker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,15 @@ import {
updateSticker,
openMessage,
} from '@shared/store';
import { ButtonCustom, Input, InputError, InputField, RadioButton, TooltipCustom, Loader } from '@components/UI';
import {
ButtonCustom,
Input,
InputError,
InputField,
RadioButton,
TooltipCustom,
Loader,
} from '@components/UI';
import { InfoBox, Shape, StickerImage, DragAndDrop } from '@components/index';

import { messages } from '@static/popups';
Expand Down Expand Up @@ -108,6 +116,28 @@ export const NewSticker: FC<IProps> = ({ sticker, stickerActiveId, handleActiveS
.catch(() => dispatch(openMessage({ text: `${messages.somethingWrong}`, isError: true })))
.finally(() => {
setLoading(false);
setCustomVisible(false);
dispatch(
updateSticker({
...sticker,
id: 'newSticker',
image: '',
size_type: 'optimal',
shape: 'square',
amount: 1,
width: 3,
height: 3,
optimal_width: 3,
optimal_height: 3,
})
);
setValue('shape', 'square');
setValue('amount', 1);
setValue('width', 3);
setValue('height', 3);
setValue('optimal_width', 3);
setValue('optimal_height', 3);
setValue('size', 'optimal');
});
}

Expand All @@ -120,7 +150,11 @@ export const NewSticker: FC<IProps> = ({ sticker, stickerActiveId, handleActiveS
};

const sizeValidate = (value: string): boolean => {
return REG_STICKERS.test(value) && Number(value) >= SIZE_INPUT_MIN_LENGTH && Number(value) <= SIZE_INPUT_MAX_LENGTH;
return (
REG_STICKERS.test(value) &&
Number(value) >= SIZE_INPUT_MIN_LENGTH &&
Number(value) <= SIZE_INPUT_MAX_LENGTH
);
};

const onWidthChange = () => {
Expand All @@ -133,7 +167,7 @@ export const NewSticker: FC<IProps> = ({ sticker, stickerActiveId, handleActiveS
...sticker,
width: Number(value),
height: sticker.shape === 'circle' ? Number(value) : sticker.height,
}),
})
);
}
setBlock(false);
Expand All @@ -149,7 +183,7 @@ export const NewSticker: FC<IProps> = ({ sticker, stickerActiveId, handleActiveS
...sticker,
height: Number(value),
width: sticker.shape === 'circle' ? Number(value) : sticker.width,
}),
})
);
}
setBlock(false);
Expand All @@ -164,38 +198,28 @@ export const NewSticker: FC<IProps> = ({ sticker, stickerActiveId, handleActiveS
const height = watch('height');

const initialSize = sticker.size_type;

const fieldsUnchanged =
initialSize === sticker.size_type &&
sticker.shape === shape &&
sticker.amount === amount &&
sticker.width === width &&
sticker.height === height;

useEffect(() => {
// const image = new File([sticker.image], 'image.png');
// setValue('image', image);
setValue('shape', sticker.shape);
setValue('amount', sticker.amount);
setValue('width', sticker.width);
setValue('height', sticker.height);
setValue('optimal_width', sticker.optimal_width);
setValue('optimal_height', sticker.optimal_height);
setValue('size', sticker.size_type);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

return (
<article
className={cn(
styles.card,
sticker.id !== stickerActiveId && styles.card_unactive,
sticker.id !== stickerActiveId && sticker.id === 'newSticker' && styles.card_unactive_new,
sticker.id !== stickerActiveId && sticker.id === 'newSticker' && styles.card_unactive_new
)}
onClick={sticker.id === stickerActiveId ? () => null : () => handleActiveSticker(sticker.id)}
>
{loading && <Loader loading={loading} />}
<form className={sticker.id === stickerActiveId ? styles.info : styles.info_unactive} onSubmit={handleSubmit}>
<form
className={sticker.id === stickerActiveId ? styles.info : styles.info_unactive}
onSubmit={handleSubmit}
>
<div className={styles.image}>
{/* Оставляем драгндроп с инпутом картинки, чтобы при сворачивании карточки он не размонтировался и не очищался инпут*/}
<DragAndDrop
Expand All @@ -219,15 +243,27 @@ export const NewSticker: FC<IProps> = ({ sticker, stickerActiveId, handleActiveS
)}
</label>
<div className={cn(styles.shapes, sticker.id !== stickerActiveId && styles.hidden)}>
<Shape register={register} name='shape' sticker={sticker} value='square' onShapeChange={onShapeChange} />
<Shape
register={register}
name='shape'
sticker={sticker}
value='square'
onShapeChange={onShapeChange}
/>
<Shape
register={register}
name='shape'
sticker={sticker}
value='rounded_square'
onShapeChange={onShapeChange}
/>
<Shape register={register} name='shape' sticker={sticker} value='circle' onShapeChange={onShapeChange} />
<Shape
register={register}
name='shape'
sticker={sticker}
value='circle'
onShapeChange={onShapeChange}
/>
</div>
</fieldset>
<fieldset className={styles.flex}>
Expand Down Expand Up @@ -272,7 +308,7 @@ export const NewSticker: FC<IProps> = ({ sticker, stickerActiveId, handleActiveS
height: sticker.optimal_height,
width: sticker.optimal_width,
size_type: 'optimal',
}),
})
);
}}
>
Expand All @@ -294,7 +330,7 @@ export const NewSticker: FC<IProps> = ({ sticker, stickerActiveId, handleActiveS
height: getValues('height'),
width: getValues('width'),
size_type: 'custom',
}),
})
);
}}
>
Expand Down
4 changes: 4 additions & 0 deletions src/shared/store/stickersSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ const stickerSlice = createSlice({
size_type: 'optimal',
});
}

state.pages = calculateStickerOnList(state.stickers.slice(0, state.stickers.length - 1), pageSizePx);
},
addSticker(state, action) {
state.stickers = state.stickers.map((sticker) => {
Expand All @@ -120,6 +122,8 @@ const stickerSlice = createSlice({
}
return sticker;
});

state.pages = calculateStickerOnList(state.stickers.slice(0, state.stickers.length - 1), pageSizePx);
},
},
extraReducers: (builder) => {
Expand Down