Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

feat(mobile): align note editor with PWA

tianma-if711e0c6dc59e
diff --git a/apps/mobile/src/components/LocalTiptapEditor.tsx b/apps/mobile/src/components/LocalTiptapEditor.tsx
index 868d300f..fcd63f6b 100644
--- a/apps/mobile/src/components/LocalTiptapEditor.tsx
+++ b/apps/mobile/src/components/LocalTiptapEditor.tsx
@@ -6,7 +6,7 @@ import { EditorContent, useEditor, useEditorState } from "@tiptap/react";
import StarterKit from "@tiptap/starter-kit";
import type { TiptapDoc } from "@edgeever/shared";
import { useDOMImperativeHandle, type DOMImperativeFactory, type DOMProps } from "expo/dom";
-import { useCallback, useEffect, useRef, type Ref } from "react";
+import { useCallback, useEffect, useRef, type ReactNode, type Ref } from "react";
type EditorDoc = TiptapDoc;
@@ -144,29 +144,73 @@ export default function LocalTiptapEditor(props: LocalTiptapEditorProps) {
<div className="edgeever-editor-shell">
<style>{getEditorStyles(props.theme)}</style>
<div aria-label={props.locale === "en-US" ? "Editor toolbar" : "编辑器工具栏"} className="edgeever-editor-toolbar" role="toolbar">
- <ToolbarButton label={props.locale === "en-US" ? "Upload image" : "上传图片"} onRun={() => void insertImage()} text={props.locale === "en-US" ? "+ Image" : "+图"} />
- <ToolbarButton active={Boolean(toolbarState & 1)} label={props.locale === "en-US" ? "Bold" : "加粗"} onRun={() => editor?.chain().focus().toggleBold().run()} text="B" />
- <ToolbarButton active={Boolean(toolbarState & 8)} label={props.locale === "en-US" ? "Bullet list" : "无序列表"} onRun={() => editor?.chain().focus().toggleBulletList().run()} text="•" />
- <ToolbarButton active={Boolean(toolbarState & 16)} label={props.locale === "en-US" ? "Quote" : "引用"} onRun={() => editor?.chain().focus().toggleBlockquote().run()} text="❝" />
- <ToolbarButton label={props.locale === "en-US" ? "Horizontal rule" : "分割线"} onRun={() => editor?.chain().focus().setHorizontalRule().run()} text="—" />
+ <ToolbarButton icon={<ImagePlusIcon />} label={props.locale === "en-US" ? "Upload image" : "上传图片"} onRun={() => void insertImage()} />
+ <ToolbarButton active={Boolean(toolbarState & 1)} icon={<BoldIcon />} label={props.locale === "en-US" ? "Bold" : "加粗"} onRun={() => editor?.chain().focus().toggleBold().run()} />
+ <ToolbarButton active={Boolean(toolbarState & 8)} icon={<ListIcon />} label={props.locale === "en-US" ? "Bullet list" : "无序列表"} onRun={() => editor?.chain().focus().toggleBulletList().run()} />
+ <ToolbarButton active={Boolean(toolbarState & 16)} icon={<QuoteIcon />} label={props.locale === "en-US" ? "Quote" : "引用"} onRun={() => editor?.chain().focus().toggleBlockquote().run()} />
+ <ToolbarButton icon={<MinusIcon />} label={props.locale === "en-US" ? "Horizontal rule" : "分割线"} onRun={() => editor?.chain().focus().setHorizontalRule().run()} />
</div>
<EditorContent editor={editor} />
</div>
);
}
-const ToolbarButton = ({ active = false, label, onRun, text }: { active?: boolean; label: string; onRun: () => void; text: string }) => (
+const ToolbarButton = ({ active = false, icon, label, onRun }: { active?: boolean; icon: ReactNode; label: string; onRun: () => void }) => (
<button
aria-label={label}
+ aria-pressed={active}
className={active ? "is-active" : undefined}
onMouseDown={(event) => event.preventDefault()}
onClick={onRun}
type="button"
>
- {text}
+ {icon}
</button>
);
+const EditorIcon = ({ children, size, strokeWidth }: { children: ReactNode; size: number; strokeWidth: number }) => (
+ <svg aria-hidden="true" fill="none" height={size} stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth={strokeWidth} viewBox="0 0 24 24" width={size}>
+ {children}
+ </svg>
+);
+
+// Keep the same Lucide paths as the PWA toolbar without pulling the full icon
+// barrel into the standalone DOM bundle (which adds roughly 1.8 MB in Metro).
+const ImagePlusIcon = () => (
+ <EditorIcon size={18} strokeWidth={2}>
+ <path d="M16 5h6" />
+ <path d="M19 2v6" />
+ <path d="M21 11.5V19a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h7.5" />
+ <path d="m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21" />
+ <circle cx="9" cy="9" r="2" />
+ </EditorIcon>
+);
+
+const BoldIcon = () => (
+ <EditorIcon size={17} strokeWidth={2.4}>
+ <path d="M6 12h9a4 4 0 0 1 0 8H7a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1h7a4 4 0 0 1 0 8" />
+ </EditorIcon>
+);
+
+const ListIcon = () => (
+ <EditorIcon size={18} strokeWidth={2.2}>
+ <path d="M3 5h.01M3 12h.01M3 19h.01M8 5h13M8 12h13M8 19h13" />
+ </EditorIcon>
+);
+
+const QuoteIcon = () => (
+ <EditorIcon size={17} strokeWidth={2.2}>
+ <path d="M16 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2 1 1 0 0 1 1 1v1a2 2 0 0 1-2 2 1 1 0 0 0-1 1v2a1 1 0 0 0 1 1 6 6 0 0 0 6-6V5a2 2 0 0 0-2-2z" />
+ <path d="M5 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2 1 1 0 0 1 1 1v1a2 2 0 0 1-2 2 1 1 0 0 0-1 1v2a1 1 0 0 0 1 1 6 6 0 0 0 6-6V5a2 2 0 0 0-2-2z" />
+ </EditorIcon>
+);
+
+const MinusIcon = () => (
+ <EditorIcon size={18} strokeWidth={2.4}>
+ <path d="M5 12h14" />
+ </EditorIcon>
+);
+
const mapImageSources = (doc: EditorDoc, mapSource: (source: string) => string): EditorDoc => {
const visit = (value: unknown): unknown => {
if (Array.isArray(value)) {
@@ -209,13 +253,13 @@ const getEditorStyles = (theme: "light" | "dark") => `
html, body, #root { width: 100%; height: 100%; margin: 0; background: ${theme === "dark" ? "#0f172a" : "#fff"}; }
body { overflow: hidden; color: ${theme === "dark" ? "#f8fafc" : "#0f172a"}; }
.edgeever-editor-shell { display: flex; height: 100%; min-height: 100%; flex-direction: column; background: ${theme === "dark" ? "#0f172a" : "#fff"}; }
- .edgeever-editor-toolbar { display: flex; flex: 0 0 auto; gap: 6px; overflow-x: auto; padding: 8px 10px; border-bottom: 1px solid ${theme === "dark" ? "#334155" : "#e2e8f0"}; background: ${theme === "dark" ? "#020617" : "#f8fafc"}; scrollbar-width: none; }
+ .edgeever-editor-toolbar { display: flex; flex: 0 0 auto; align-items: center; gap: 4px; min-height: 38px; overflow-x: auto; padding: 6px 12px; border-block: 1px solid ${theme === "dark" ? "#334155" : "#f1f5f9"}; background: ${theme === "dark" ? "#0f172a" : "#fff"}; scrollbar-width: none; }
.edgeever-editor-toolbar::-webkit-scrollbar { display: none; }
- .edgeever-editor-toolbar button { min-width: 38px; height: 36px; padding: 0 10px; border: 0; border-radius: 9px; background: ${theme === "dark" ? "#1e293b" : "#fff"}; color: ${theme === "dark" ? "#e2e8f0" : "#475569"}; font: inherit; font-size: 14px; font-weight: 700; box-shadow: inset 0 0 0 1px ${theme === "dark" ? "#475569" : "#e2e8f0"}; }
- .edgeever-editor-toolbar button.is-active { background: #ccfbf1; color: #0f766e; box-shadow: inset 0 0 0 1px #5eead4; }
+ .edgeever-editor-toolbar button { display: inline-flex; flex: 0 0 auto; align-items: center; justify-content: center; width: 36px; min-height: 32px; padding: 0; border: 1px solid transparent; border-radius: 999px; background: transparent; color: ${theme === "dark" ? "#cbd5e1" : "#64748b"}; }
+ .edgeever-editor-toolbar button:active, .edgeever-editor-toolbar button.is-active { border-color: ${theme === "dark" ? "#166534" : "#bbf7d0"}; background: ${theme === "dark" ? "#14532d" : "#ecfdf5"}; color: ${theme === "dark" ? "#86efac" : "#047857"}; }
.tiptap { min-height: 100%; outline: none; }
.edgeever-editor-shell > div:last-child { min-height: 0; flex: 1; overflow-y: auto; overscroll-behavior: contain; -webkit-overflow-scrolling: touch; }
- .edgeever-editor-content { min-height: 100%; padding: 18px 18px 40vh; font-size: 17px; line-height: 1.7; word-break: break-word; caret-color: #0f766e; }
+ .edgeever-editor-content { min-height: 100%; padding: 18px 12px 32px; font-size: 17px; line-height: 1.7; word-break: break-word; caret-color: #0f766e; }
.edgeever-editor-content > :first-child { margin-top: 0; }
.edgeever-editor-content p.is-editor-empty:first-child::before { float: left; height: 0; color: #94a3b8; content: attr(data-placeholder); pointer-events: none; }
.edgeever-editor-content h1, .edgeever-editor-content h2, .edgeever-editor-content h3 { line-height: 1.3; }
diff --git a/apps/mobile/src/lib/startup-performance.ts b/apps/mobile/src/lib/startup-performance.ts
index 5a309938..ddd14192 100644
--- a/apps/mobile/src/lib/startup-performance.ts
+++ b/apps/mobile/src/lib/startup-performance.ts
@@ -9,16 +9,33 @@ type NativeStartupTiming = {
const marks = new Map<StartupMark, number>();
let latestEditorStartupMs: number | null = null;
+let editorOpenStartedAt: number | null = null;
+
+const logPerformance = (metric: string, durationMs: number) => {
+ console.info(`[EdgeEverPerformance] ${metric}=${Math.max(0, durationMs).toFixed(0)}ms`);
+};
export const markStartup = (name: StartupMark) => {
if (!marks.has(name)) {
- marks.set(name, performance.now());
+ const now = performance.now();
+ marks.set(name, now);
+ const nativeStart = (performance as Performance & { rnStartupTiming?: NativeStartupTiming }).rnStartupTiming?.startTime ?? 0;
+ logPerformance(name, now - nativeStart);
}
};
+export const beginEditorStartup = () => {
+ editorOpenStartedAt = performance.now();
+};
+
export const recordEditorStartup = (durationMs: number) => {
if (Number.isFinite(durationMs) && durationMs >= 0) {
latestEditorStartupMs = durationMs;
+ logPerformance("local-editor-ready", durationMs);
+ if (editorOpenStartedAt !== null) {
+ logPerformance("editor-open-to-ready", performance.now() - editorOpenStartedAt);
+ editorOpenStartedAt = null;
+ }
}
};
diff --git a/apps/mobile/src/screens/WorkspaceScreen.tsx b/apps/mobile/src/screens/WorkspaceScreen.tsx
index 9172812d..611355bb 100644
--- a/apps/mobile/src/screens/WorkspaceScreen.tsx
+++ b/apps/mobile/src/screens/WorkspaceScreen.tsx
@@ -118,7 +118,7 @@ import {
upsertLocalMemo,
} from "../lib/local-mirror";
import { AccountSecurityPanel } from "./AccountSecurityModal";
-import { markStartup, recordEditorStartup } from "../lib/startup-performance";
+import { beginEditorStartup, markStartup, recordEditorStartup } from "../lib/startup-performance";
import LocalTiptapEditor, { type LocalTiptapEditorRef } from "../components/LocalTiptapEditor";
import { resolveMobileThemeStyles, useMobileTheme, type MobileResolvedTheme } from "../lib/mobile-theme";
@@ -4326,9 +4326,11 @@ const MemoDetailModal = ({
<ChevronLeft color="#475569" size={21} />
</Pressable>
<Text style={styles.detailSyncStatus}>{isSaving ? "保存中" : "已同步"}</Text>
- <Pressable accessibilityLabel="笔记操作" accessibilityRole="button" onPress={() => setActionsOpen(true)} style={styles.detailHeaderButton}>
- <MoreHorizontal color="#475569" size={21} />
- </Pressable>
+ {memo?.isDeleted ? (
+ <Pressable accessibilityLabel="笔记操作" accessibilityRole="button" onPress={() => setActionsOpen(true)} style={styles.detailHeaderButton}>
+ <MoreHorizontal color="#475569" size={21} />
+ </Pressable>
+ ) : null}
</View>
{isLoading ? (
@@ -4381,7 +4383,15 @@ const MemoDetailModal = ({
</View>
)}
{memo && !memo.isDeleted ? (
- <Pressable accessibilityLabel="编辑笔记" accessibilityRole="button" onPress={() => onRichEdit(memo)} style={styles.detailEditFab}>
+ <Pressable
+ accessibilityLabel="编辑笔记"
+ accessibilityRole="button"
+ onPress={() => {
+ beginEditorStartup();
+ onRichEdit(memo);
+ }}
+ style={styles.detailEditFab}
+ >
<Pencil color="#ffffff" size={22} />
</Pressable>
) : null}
@@ -4757,7 +4767,7 @@ const RichEditorModal = ({
style={styles.createMemoTitleInput}
value={title}
/>
- <View style={styles.createMemoMetaRow}>
+ <View style={[styles.createMemoMetaRow, styles.richStandaloneMetaRow]}>
<Pressable accessibilityLabel="所在笔记本" accessibilityRole="button" onPress={() => setNotebookPickerOpen(true)} style={styles.createMemoNotebookButton}>
<Text numberOfLines={1} style={styles.createMemoNotebookText}>{notebookLabel}</Text>
<ChevronDown color="#64748b" size={14} />
@@ -4771,7 +4781,7 @@ const RichEditorModal = ({
}}
placeholder="添加标签,用逗号分隔"
placeholderTextColor="#94a3b8"
- style={styles.createMemoTagsInput}
+ style={[styles.createMemoTagsInput, styles.richStandaloneTagsInput]}
value={tagsText}
/>
</View>
@@ -7667,6 +7677,8 @@ const baseWorkspaceStyles = StyleSheet.create({
richEditorContainer: {
backgroundColor: "#ffffff",
flex: 1,
+ paddingHorizontal: 12,
+ paddingTop: 14,
},
richEditorMeta: {
alignItems: "center",
@@ -7737,6 +7749,13 @@ const baseWorkspaceStyles = StyleSheet.create({
},
richEditorFrame: {
flex: 1,
+ marginHorizontal: -12,
+ },
+ richStandaloneMetaRow: {
+ minHeight: 30,
+ },
+ richStandaloneTagsInput: {
+ minHeight: 30,
},
richEditorLoading: {
alignItems: "center",