Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

feat: upload files by dropping (#292)

boojack086b10717fad
diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsx
index 147114681..8a8d6a9f3 100644
--- a/web/src/components/Memo.tsx
+++ b/web/src/components/Memo.tsx
@@ -13,6 +13,7 @@ import MemoContent from "./MemoContent";
import MemoResources from "./MemoResources";
import showMemoCardDialog from "./MemoCardDialog";
import showShareMemoImageDialog from "./ShareMemoImageDialog";
+import showPreviewImageDialog from "./PreviewImageDialog";
import "../less/memo.less";
dayjs.extend(relativeTime);
@@ -159,6 +160,11 @@ const Memo: React.FC<Props> = (props: Props) => {
});
}
}
+ } else if (targetEl.tagName === "IMG") {
+ const imgUrl = targetEl.getAttribute("src");
+ if (imgUrl) {
+ showPreviewImageDialog(imgUrl);
+ }
}
};
diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx
index 99f8d2520..3619b5994 100644
--- a/web/src/components/MemoEditor.tsx
+++ b/web/src/components/MemoEditor.tsx
@@ -76,6 +76,36 @@ const MemoEditor: React.FC = () => {
prevGlobalStateRef.current = editorState;
}, [state, editorState.editMemoId]);
+ const handleKeyDown = (event: React.KeyboardEvent) => {
+ if (event.key === "Escape") {
+ if (state.fullscreen) {
+ handleFullscreenBtnClick();
+ }
+ } else if (event.key === "Enter" && (event.ctrlKey || event.metaKey)) {
+ handleSaveBtnClick();
+ }
+ };
+
+ const handleDropEvent = async (event: React.DragEvent) => {
+ if (event.dataTransfer && event.dataTransfer.files.length > 0) {
+ event.preventDefault();
+ const resourceList: Resource[] = [];
+ for (const file of event.dataTransfer.files) {
+ const resource = await handleUploadResource(file);
+ if (resource) {
+ resourceList.push(resource);
+ if (editorState.editMemoId) {
+ await upsertMemoResource(editorState.editMemoId, resource.id);
+ }
+ }
+ }
+ setState({
+ ...state,
+ resourceList: [...state.resourceList, ...resourceList],
+ });
+ }
+ };
+
const handlePasteEvent = async (event: React.ClipboardEvent) => {
if (event.clipboardData && event.clipboardData.files.length > 0) {
event.preventDefault();
@@ -239,12 +269,6 @@ const MemoEditor: React.FC = () => {
});
};
- const handleKeyDown = (event: React.KeyboardEvent) => {
- if (event.key === "Escape") {
- state.fullscreen && handleFullscreenBtnClick();
- }
- };
-
const handleTagSeletorClick = useCallback((event: React.MouseEvent) => {
if (tagSeletorRef.current !== event.target && tagSeletorRef.current?.contains(event.target as Node)) {
editorRef.current?.insertText(`#${(event.target as HTMLElement).textContent} ` ?? "");
@@ -296,6 +320,7 @@ const MemoEditor: React.FC = () => {
<div
className={`memo-editor-container ${mobileEditorStyle} ${isEditing ? "edit-ing" : ""} ${state.fullscreen ? "fullscreen" : ""}`}
onKeyDown={handleKeyDown}
+ onDrop={handleDropEvent}
>
<div className={`tip-container ${isEditing ? "" : "!hidden"}`}>
<span className="tip-text">{t("editor.editing")}</span>
diff --git a/web/src/labs/marked/parser/Tag.ts b/web/src/labs/marked/parser/Tag.ts
index cd0e49e90..93ce49c63 100644
--- a/web/src/labs/marked/parser/Tag.ts
+++ b/web/src/labs/marked/parser/Tag.ts
@@ -1,6 +1,6 @@
import { escape } from "lodash-es";
-export const TAG_REG = /[^\s]?#([^\s#]+?) /;
+export const TAG_REG = /#([^\s#]+?) /;
const renderer = (rawStr: string): string => {
const matchResult = rawStr.match(TAG_REG);
diff --git a/web/src/less/memo-resources.less b/web/src/less/memo-resources.less
index 48db9cfbf..cffdf7afa 100644
--- a/web/src/less/memo-resources.less
+++ b/web/src/less/memo-resources.less
@@ -12,7 +12,7 @@
.hide-scroll-bar();
> img {
- @apply w-auto max-h-40 rounded-lg;
+ @apply w-auto max-h-40 rounded;
}
}
}
diff --git a/web/src/less/siderbar.less b/web/src/less/siderbar.less
index f4b2b18af..5d38d30da 100644
--- a/web/src/less/siderbar.less
+++ b/web/src/less/siderbar.less
@@ -22,7 +22,7 @@
}
.mask {
- @apply fixed top-0 right-0 w-screen h-screen bg-transparent transition-all duration-300 z-0;
+ @apply fixed top-0 right-0 w-screen h-screen bg-transparent transition-all duration-300 z-0 sm:hidden;
&.show {
@apply z-20 bg-black opacity-60;