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.

fix: order list starts

johnnyjoy41d9c9d76e44
diff --git a/web/src/components/MemoContent/List.tsx b/web/src/components/MemoContent/List.tsx
index 7e7a9ba2f..6f0c1b83e 100644
--- a/web/src/components/MemoContent/List.tsx
+++ b/web/src/components/MemoContent/List.tsx
@@ -1,4 +1,5 @@
import clsx from "clsx";
+import { head } from "lodash-es";
import React from "react";
import { ListNode_Kind, Node, NodeType } from "@/types/proto/api/v1/markdown_service";
import Renderer from "./Renderer";
@@ -14,7 +15,7 @@ const List: React.FC<Props> = ({ kind, indent, children }: Props) => {
let prevNode: Node | null = null;
let skipNextLineBreakFlag = false;
- const getListContainer = (kind: ListNode_Kind) => {
+ const getListContainer = () => {
switch (kind) {
case ListNode_Kind.ORDERED:
return "ol";
@@ -27,13 +28,26 @@ const List: React.FC<Props> = ({ kind, indent, children }: Props) => {
}
};
+ const getAttributes = () => {
+ if (kind === ListNode_Kind.ORDERED) {
+ const firstChild = head(children);
+ if (firstChild?.type === NodeType.ORDERED_LIST_ITEM) {
+ return {
+ start: firstChild.orderedListItemNode?.number,
+ };
+ }
+ }
+ return {};
+ };
+
return React.createElement(
- getListContainer(kind),
+ getListContainer(),
{
className: clsx(
`list-inside ${kind === ListNode_Kind.ORDERED ? "list-decimal" : kind === ListNode_Kind.UNORDERED ? "list-disc" : "list-none"}`,
indent > 0 ? `pl-${2 * indent}` : "",
),
+ ...getAttributes(),
},
children.map((child, index) => {
if (prevNode?.type !== NodeType.LINE_BREAK && child.type === NodeType.LINE_BREAK && skipNextLineBreakFlag) {