* [Major] Introduce a new `Ref` and `Path` type
This introduces a new `Ref` and `Path` type, which try to be as lightweight and rigorous as possible. More description in the PR
* [Minor] Updated Syntax
* [Minor] Updated Type
* [Minor] Renamed file
* [Minor] Updated type
* [Minor] Updated Syntax
* [Major] Rename css classes for wiki links
Previously all the parts of a wiki link were tagged with `sb-wiki-link-page`. This didn't make a whole lot of sense. Also the tag `sb-wiki-link` was could never render, because of the way `HighlightStyle` works. Now every part of a wiki link will be tagged with `sb-wiki-link` (i.e. the link, the alias, the dimensions). Invalid and missing links will be styled separately in a later commit.
* [Minor] Adjust to new API
* [Minor] Small changes
* [Minor] Function and file renames
* [Major] Syscall adjusments
Change behavior of `getCurrentPath` to actually return what's now considered a `Path`. `getCurrentPage(Meta)` now also correctly returns for documents. We could consider a rename to get rid of the `page` association
* [Major] Rework `Client`
Mostly minor adjustments for the new API. Some major changes in `navigateWithinPage` and some unecessary checks removed now
* [Major] Errors on navigate
This now throws an error when the user tries to navigate to a link that is invalid
* [Major] Minor adjustments and remove some old bulk
This does the typicall adjustments to the new API. A thing to consider is that invalid links aren't indexed. Also removed old code about template and query stuff. And reused a regex instead of copy pasting it.
* [Minor] Cleanup editor ui
* [Minor] Adjust to new API
* [Minor] Adjust to new API and reduce ugly regex
* [Minor] New API
* [Minor] Rework link cm plugin
* [Major] Rework wiki links
A lot of code cleanup, reworked for new APIs and also introduces "invalid links"
* [Minor] Part of the editor ui rework
* [Major] Adjust to new API
This also removes the `looksLikePathWithExtension` check. I don't think it was necessary.
* [Minor] PArt of editor ui rewrite
* [Minor] Adjust to new API
* [Major] Adjust renderer to new API
Invalid links now link to `#`
* [Major] Rewrite navigator
This still needs major rework, currently in a "got it working" state
* [Minor] Adjust file name
* [Minor] Mistake during rebase
* [Minor] Navigate to end of header
* [Minor] Remove `tweakEditorDOM` and use proper CM extensions
* [Major] Heavily clean up the navigation code
* [Minor] Make `PageNavigator` closable again
* [Minor] Small fixes to reduce errors bubbling up
* [Minor] Show error message if navigate fails
* [Major] Remove legacy `navigate({ kind = ` syntax
This removes the old navigation syntax. It's still supported but the user will be warned then using it. I also added some validation to editor.navigate for user provided refs.
* [Minor] Make notifications errors
* [Minor] Don't fail if header isn't found
* [Minor] Typo
* [Major] Remove cleanPageRef
* [Minor] Small bug
* [Minor] Align behavior between render and editor
* [Major] Remove `PageRef`. Pretty sure it's obsolete
* [Major] Remove pos from header as it's an invalid ref
* [Minor] Align with original behavior
* [Minor] Get tests working again
* [Minor] check that indexPage is valid
* [Major] Rewrite `resolve.ts` file
* [Minor] More tests, more fixes
* [Minor] Don't just append .md this is weird
* [Minor] More edge cases
* [Minor] Version bumping hono somehow fixes the `/` case
* [Minor] Smaller TODOs
* [Major] We can be a littler looser on the restrictions
* [Major] Change header indexing, to index with pos
* [Minor] More fixes for headers
* [Minor] Rename for clarity
* [Minor] Change more regexes to named groups
* [Major] Inline content rewrite
* [Minor] Fix TODO
* [Minor] Bump index version
* [Major] New Space Primitive to check paths
* [Minor] Fix #1214
* [Minor] Fix #1169
* [Minor] Remove TODO
This check is probably not needed anymore. Unsure. May look into it later
* [Minor] small bug
* [Minor] Not a good rebase without me needing to fix it afterwards
* [Minor] Improve fallback for file upload
* [Minor] Some fixes on the for resolving
* [Minor] Removed doubled test case
* [Minor] Resolve #860
* [Minor] Turn flash notification into an error
* [Minor] Change handling of `.` paths
* [Minor] Show empty URL for index page
* [Minor] Push correct ref to history
* [Major] Capture mini editor events in capture phase
This fixes the issue were when pressing arrowup or arrowdown changed the cursor position inside the editor
* [Major] Add prefix to `FilterList`
This now fixes issues were if you had a prefixed page you con't properly search for it, because the search considered the prefix as part of the name
* [Minor] A little rigor for empty headers
* [Major] Fix #1404
* [Minor] `parseInt` returns `NaN` handle that
* [Minor] Use `fileName`
* [Minor] Fix comment
* [Minor] Fixes
* [Major] disallow `foo.png.md` and `/../`, etc. cases
* [Major] Change name of conflicted pages
* [Minor] Remove unecessary check
* [Minor] Remove some split code
* [Minor] Allow deletion of invalid files
* [Minor] Bug in the regex
* [Minor] Give some possibility of fixing incorrect names
* [Minor] Tiny bug with header completion
* [Major] Docs
* [Minor] Ignore errors for navigation inside of a page
This could be a problem when SB e.g. cached a scrollTop for a page, which, because e.g. the file is now deleted, doesn't exist anymore and thus CM throws an error, when trying to navigate
* Update conflicted copy regex in Maintenance.md
---------
Co-authored-by: Zef Hemel <zef@zef.me>
268 lines
7.4 KiB
TypeScript
268 lines
7.4 KiB
TypeScript
import { useEffect, useRef } from "preact/hooks";
|
|
import { history, historyKeymap, standardKeymap } from "@codemirror/commands";
|
|
import {
|
|
autocompletion,
|
|
closeBracketsKeymap,
|
|
type CompletionContext,
|
|
completionKeymap,
|
|
type CompletionResult,
|
|
} from "@codemirror/autocomplete";
|
|
import { EditorState } from "@codemirror/state";
|
|
import {
|
|
EditorView,
|
|
highlightSpecialChars,
|
|
keymap,
|
|
placeholder,
|
|
ViewPlugin,
|
|
type ViewUpdate,
|
|
} from "@codemirror/view";
|
|
import { getCM as vimGetCm, Vim, vim } from "@replit/codemirror-vim";
|
|
import { createCommandKeyBindings } from "../editor_state.ts";
|
|
|
|
type MiniEditorEvents = {
|
|
onEnter: (newText: string, shiftDown?: boolean) => void;
|
|
onEscape?: (newText: string) => void;
|
|
onBlur?: (newText: string) => void | Promise<void>;
|
|
onChange?: (newText: string) => void;
|
|
onKeyUp?: (view: EditorView, event: KeyboardEvent) => boolean;
|
|
onKeyDown?: (view: EditorView, event: KeyboardEvent) => boolean;
|
|
};
|
|
|
|
export function MiniEditor(
|
|
{
|
|
text,
|
|
placeholderText,
|
|
vimMode,
|
|
darkMode,
|
|
vimStartInInsertMode,
|
|
onBlur,
|
|
onEscape,
|
|
onKeyUp,
|
|
onKeyDown,
|
|
onEnter,
|
|
onChange,
|
|
focus,
|
|
completer,
|
|
}: {
|
|
text: string;
|
|
placeholderText?: string;
|
|
vimMode: boolean;
|
|
darkMode?: boolean;
|
|
vimStartInInsertMode?: boolean;
|
|
focus?: boolean;
|
|
completer?: (
|
|
context: CompletionContext,
|
|
) => Promise<CompletionResult | null>;
|
|
} & MiniEditorEvents,
|
|
) {
|
|
const editorDiv = useRef<HTMLDivElement>(null);
|
|
const editorViewRef = useRef<EditorView>();
|
|
const vimModeRef = useRef<string>("normal");
|
|
// TODO: This super duper ugly, but I don't know how to avoid it
|
|
// Due to how MiniCodeEditor is built, it captures the closures of all callback functions
|
|
// which results in them pointing to old state variables, to avoid this we do this...
|
|
const callbacksRef = useRef<MiniEditorEvents>();
|
|
|
|
useEffect(() => {
|
|
const currentEditorDiv = editorDiv.current;
|
|
if (currentEditorDiv) {
|
|
// console.log("Creating editor view");
|
|
const editorView = new EditorView({
|
|
state: buildEditorState(),
|
|
parent: currentEditorDiv,
|
|
});
|
|
editorViewRef.current = editorView;
|
|
|
|
const focusEditorView = editorView.focus.bind(editorView);
|
|
currentEditorDiv.addEventListener("focusin", focusEditorView);
|
|
|
|
if (focus) {
|
|
editorView.focus();
|
|
}
|
|
|
|
return () => {
|
|
currentEditorDiv.removeEventListener("focusin", focusEditorView);
|
|
if (editorViewRef.current) {
|
|
editorViewRef.current.destroy();
|
|
}
|
|
};
|
|
}
|
|
}, [editorDiv, placeholderText]);
|
|
|
|
useEffect(() => {
|
|
callbacksRef.current = {
|
|
onBlur,
|
|
onEnter,
|
|
onEscape,
|
|
onKeyUp,
|
|
onKeyDown,
|
|
onChange,
|
|
};
|
|
});
|
|
|
|
useEffect(() => {
|
|
if (editorViewRef.current) {
|
|
const currentEditorText = editorViewRef.current.state.sliceDoc();
|
|
if (currentEditorText !== text) {
|
|
editorViewRef.current.setState(buildEditorState());
|
|
editorViewRef.current.dispatch({
|
|
selection: { anchor: text.length },
|
|
});
|
|
}
|
|
}
|
|
}, [text, vimMode]);
|
|
|
|
let onBlurred = false, onEntered = false;
|
|
|
|
return (
|
|
<div
|
|
class="sb-mini-editor"
|
|
onKeyDownCapture={(e) => {
|
|
let stopPropagation = false;
|
|
if (callbacksRef.current!.onKeyDown) {
|
|
stopPropagation = callbacksRef.current!.onKeyDown(
|
|
editorViewRef.current!,
|
|
e,
|
|
);
|
|
}
|
|
if (stopPropagation) {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
}
|
|
}}
|
|
ref={editorDiv}
|
|
/>
|
|
);
|
|
|
|
function buildEditorState() {
|
|
// When vim mode is active, we need for CM to have created the new state
|
|
// and the subscribe to the vim mode's events
|
|
// This needs to happen in the next tick, so we wait a tick with setTimeout
|
|
if (vimMode) {
|
|
// Only applies to vim mode
|
|
setTimeout(() => {
|
|
const cm = vimGetCm(editorViewRef.current!)!;
|
|
cm.on("vim-mode-change", ({ mode }: { mode: string }) => {
|
|
vimModeRef.current = mode;
|
|
});
|
|
if (vimStartInInsertMode) {
|
|
Vim.handleKey(cm, "i", "+input");
|
|
}
|
|
});
|
|
}
|
|
return EditorState.create({
|
|
doc: text,
|
|
extensions: [
|
|
EditorView.theme({}, { dark: darkMode }),
|
|
// Enable vim mode, or not
|
|
[...vimMode ? [vim()] : []],
|
|
|
|
autocompletion({
|
|
override: completer ? [completer] : [],
|
|
}),
|
|
highlightSpecialChars(),
|
|
history(),
|
|
[...placeholderText ? [placeholder(placeholderText)] : []],
|
|
keymap.of([
|
|
{
|
|
key: "Enter",
|
|
run: (view) => {
|
|
onEnter(view, false);
|
|
return true;
|
|
},
|
|
},
|
|
{
|
|
key: "Shift-Enter",
|
|
run: (view) => {
|
|
onEnter(view, true);
|
|
return true;
|
|
},
|
|
},
|
|
{
|
|
key: "Escape",
|
|
run: (view) => {
|
|
callbacksRef.current!.onEscape &&
|
|
callbacksRef.current!.onEscape(view.state.sliceDoc());
|
|
return true;
|
|
},
|
|
},
|
|
...closeBracketsKeymap,
|
|
...standardKeymap,
|
|
...historyKeymap,
|
|
...completionKeymap,
|
|
...createCommandKeyBindings(globalThis.client),
|
|
]),
|
|
EditorView.domEventHandlers({
|
|
click: (e) => {
|
|
e.stopPropagation();
|
|
},
|
|
keyup: (event, view) => {
|
|
if (event.key === "Escape") {
|
|
// Esc should be handled by the keymap
|
|
return false;
|
|
}
|
|
if (event.key === "Enter") {
|
|
// Enter should be handled by the keymap, except when in Vim normal mode
|
|
// because then it's disabled
|
|
if (vimMode && vimModeRef.current === "normal") {
|
|
onEnter(view, event.shiftKey);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
if (callbacksRef.current!.onKeyUp) {
|
|
return callbacksRef.current!.onKeyUp(view, event);
|
|
}
|
|
return false;
|
|
},
|
|
blur: (_e, view) => {
|
|
onBlur(view);
|
|
},
|
|
}),
|
|
|
|
ViewPlugin.fromClass(
|
|
class {
|
|
update(update: ViewUpdate): void {
|
|
if (update.docChanged) {
|
|
callbacksRef.current!.onChange &&
|
|
callbacksRef.current!.onChange(update.state.sliceDoc());
|
|
}
|
|
}
|
|
},
|
|
),
|
|
],
|
|
});
|
|
|
|
// Avoid double triggering these events (may happen due to onkeypress vs onkeyup delay)
|
|
function onEnter(view: EditorView, shiftDown: boolean) {
|
|
if (onEntered) {
|
|
return;
|
|
}
|
|
onEntered = true;
|
|
callbacksRef.current!.onEnter(view.state.sliceDoc(), shiftDown);
|
|
// Event may occur again in 500ms
|
|
setTimeout(() => {
|
|
onEntered = false;
|
|
}, 500);
|
|
}
|
|
|
|
function onBlur(view: EditorView) {
|
|
if (onBlurred || onEntered) {
|
|
return;
|
|
}
|
|
onBlurred = true;
|
|
if (callbacksRef.current!.onBlur) {
|
|
Promise.resolve(callbacksRef.current!.onBlur(view.state.sliceDoc()))
|
|
.catch(() => {
|
|
// Reset the state
|
|
view.setState(buildEditorState());
|
|
});
|
|
}
|
|
// Event may occur again in 500ms
|
|
setTimeout(() => {
|
|
onBlurred = false;
|
|
}, 500);
|
|
}
|
|
}
|
|
}
|