Let's use AI to Earn!
TypeScript auto-publishdouyindouyin-apielectron-appelectron-reactkuaishoukwaipublishedshipinhaotoolxiaohongshu
feat: Enhance ImageEditorModal with dynamic loading and optional imgFile prop
gaoSir0c1a66199d77
diff --git a/src/components/ImageEditorModal/imageEditorModal.module.scss b/src/components/ImageEditorModal/imageEditorModal.module.scssindex 8f17e5c9..c1f5765a 100644--- a/src/components/ImageEditorModal/imageEditorModal.module.scss+++ b/src/components/ImageEditorModal/imageEditorModal.module.scss@@ -6,5 +6,21 @@.tui-image-editor-download-btn, .tui-image-editor-header-logo {display: none !important;}+ .tui-colorpicker-palette-container {+ & > ul {+ &:nth-of-type(1) {+ display: flex;+ flex-wrap: wrap;+ .tui-colorpicker-palette-button {+ cursor: pointer;+ width: 18px;+ height: 18px;+ }+ }+ }+ span {+ color: transparent !important;+ }+ }}}\ No newline at end of filediff --git a/src/components/ImageEditorModal/index.tsx b/src/components/ImageEditorModal/index.tsxindex 5517ae68..5fbacda0 100644--- a/src/components/ImageEditorModal/index.tsx+++ b/src/components/ImageEditorModal/index.tsx@@ -25,7 +25,7 @@ export interface IImageEditorModalRef {}export interface IImageEditorModalProps {open: boolean;onCancel: () => void;- imgFile: IImgFile;+ imgFile?: IImgFile;onOk: (editedImg: IImgFile) => void;}@@ -54,10 +54,10 @@ const ImageEditorModal = memo(}, [lng, t]);useEffect(() => {- if (open) {+ if (open && imgFile) {const inst = imageEditorRef.current?.getInstance();if (inst) {- inst.loadImageFromURL(imgFile.imgUrl, "lena").then(() => {+ inst.loadImageFromURL(imgFile?.imgUrl, "lena").then(() => {inst.ui.resizeEditor();});}@@ -89,6 +89,7 @@ const ImageEditorModal = memo(}useEffect(() => {+ isInit.current = false;const timeId = setInterval(() => {if (!isInit.current &&@@ -96,17 +97,18 @@ const ImageEditorModal = memo() {addCropPreset("preset-4-5", "4:5", 4 / 5);addCropPreset("preset-1-1", "1:1", 1);- addCropPreset("preset-1_9-1", "1.19:1", 1.19);+ addCropPreset("preset-9_1-1", "1.91:1", 1.91);clearInterval(timeId);}}, 100);- }, []);+ }, [imgFile?.imgUrl]);return (<Modaltitle={t("imageEditing")}open={open}onCancel={onCancel}+ getContainer={() => document.body}width={1100}footer={<>@@ -126,7 +128,7 @@ const ImageEditorModal = memo(const image = await formatImg({blob: blob,path:- imgFile.filename ||+ imgFile?.filename ||`aitoearn_edited_image_${Date.now()}.png`,});const uploadCoverRes = await toolsApi.uploadFileTemp(@@ -144,11 +146,12 @@ const ImageEditorModal = memo(><div className={styles.imageEditorModal}><ImageEditor+ key={imgFile?.imgUrl}ref={imageEditorRef}includeUI={{locale: imageEditorLocale,loadImage: {- path: imgFile.imgUrl,+ path: imgFile?.imgUrl,name: "SampleImage",},menu: [diff --git a/src/components/PublishDialog/compoents/PubParmasTextarea/PubParmasTextuploadImage.tsx b/src/components/PublishDialog/compoents/PubParmasTextarea/PubParmasTextuploadImage.tsxindex 5a7c2b53..2ffcc1d6 100644--- a/src/components/PublishDialog/compoents/PubParmasTextarea/PubParmasTextuploadImage.tsx+++ b/src/components/PublishDialog/compoents/PubParmasTextarea/PubParmasTextuploadImage.tsx@@ -1,14 +1,8 @@-import React, { ForwardedRef, forwardRef, memo, useState } from "react";+import React, { ForwardedRef, forwardRef, memo } from "react";import { CloseOutlined, EditOutlined } from "@ant-design/icons";import { Button, Tooltip } from "antd";import { useTranslation } from "react-i18next";import { IImgFile } from "@/components/PublishDialog/publishDialog.type";-import dynamic from "next/dynamic";--const ImageEditorModal = dynamic(- () => import("@/components/ImageEditorModal"),- { ssr: false },-);export interface IPubParmasTextuploadImageRef {}@@ -16,30 +10,24 @@ export interface IPubParmasTextuploadImageProps {onClose: () => void;onClick: () => void;imageFile: IImgFile;- onEditOk: (editedImg: IImgFile) => void;+ onEditClick: () => void;}const PubParmasTextuploadImage = memo(forwardRef((- { onClick, onClose, imageFile, onEditOk }: IPubParmasTextuploadImageProps,+ {+ onClick,+ onClose,+ imageFile,+ onEditClick,+ }: IPubParmasTextuploadImageProps,ref: ForwardedRef<IPubParmasTextuploadImageRef>,) => {const { t } = useTranslation("publish");- const [imageEditorOpen, setImageEditorOpen] = useState(false);return (<>- <ImageEditorModal- onOk={(editedImg) => {- onClose();- onEditOk(editedImg);- }}- imgFile={imageFile}- open={imageEditorOpen}- onCancel={() => setImageEditorOpen(false)}- />-<div className="pubParmasTextarea-uploads-item" onClick={onClick}><divclassName="pubParmasTextarea-uploads-item-close"@@ -61,7 +49,7 @@ const PubParmasTextuploadImage = memo(size="small"onClick={(e) => {e.stopPropagation();- setImageEditorOpen(true);+ onEditClick();}}/></Tooltip>diff --git a/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx b/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsxindex 44a0852b..ceb61f89 100644--- a/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx+++ b/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx@@ -27,6 +27,7 @@ import { PubType } from "@/app/config/publishConfig";import { useTransClient } from "@/app/i18n/client";import PubParmasTextuploadImage from "@/components/PublishDialog/compoents/PubParmasTextarea/PubParmasTextuploadImage";import VideoPreviewModal from "@/components/VideoPreviewModal";+import dynamic from "next/dynamic";const { TextArea } = Input;const { Dragger } = Upload;@@ -56,6 +57,11 @@ export interface IPubParmasTextareaProps {desValue?: string;}+const ImageEditorModal = dynamic(+ () => import("@/components/ImageEditorModal"),+ { ssr: false },+);+const PubParmasTextarea = memo(forwardRef((@@ -92,6 +98,8 @@ const PubParmasTextarea = memo(sort: true,});const { t } = useTransClient("publish");+ // 编辑图片的索引+ const [editImgIndex, setEditImgIndex] = useState(-1);useEffect(() => {if (isFirst.current.effect) {@@ -285,6 +293,19 @@ const PubParmasTextarea = memo(onCancel={() => setPreviewData(undefined)}/>+ <ImageEditorModal+ onOk={(editedImg) => {+ setImageFileList((prevState) => {+ const newState = [...prevState];+ newState[editImgIndex] = editedImg;+ return newState;+ });+ }}+ imgFile={imageFileList[editImgIndex]}+ open={editImgIndex !== -1}+ onCancel={() => setEditImgIndex(-1)}+ />+<div className={styles.pubParmasTextarea} style={style}><div className="pubParmasTextarea-input">{beforeExtend}@@ -339,12 +360,8 @@ const PubParmasTextarea = memo(}}><PubParmasTextuploadImage- onEditOk={(editedImg) => {- setImageFileList((prevState) => {- const newState = [...prevState];- newState[i] = editedImg;- return newState;- });+ onEditClick={() => {+ setEditImgIndex(i);}}imageFile={v}onClick={() => {