YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: order list starts

Browse Source
This commit is contained in:
johnnyjoy
2024-12-25 22:43:26 +08:00
parent e913271f15
commit 41d9c9d76e
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/src/components/MemoContent/List.tsx
View File

@@ -1,4 +1,5 @@
import clsx from "clsx"; import clsx from "clsx";
import { head } from "lodash-es";
import React from "react"; import React from "react";
import { ListNode_Kind, Node, NodeType } from "@/types/proto/api/v1/markdown_service"; import { ListNode_Kind, Node, NodeType } from "@/types/proto/api/v1/markdown_service";
import Renderer from "./Renderer"; import Renderer from "./Renderer";
@@ -14,7 +15,7 @@ const List: React.FC<Props> = ({ kind, indent, children }: Props) => {
let prevNode: Node | null = null; let prevNode: Node | null = null;
let skipNextLineBreakFlag = false; let skipNextLineBreakFlag = false;
const getListContainer = (kind: ListNode_Kind) => { const getListContainer = () => {
switch (kind) { switch (kind) {
case ListNode_Kind.ORDERED: case ListNode_Kind.ORDERED:
return "ol"; 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( return React.createElement(
getListContainer(kind), getListContainer(),
{ {
className: clsx( className: clsx(
`list-inside ${kind === ListNode_Kind.ORDERED ? "list-decimal" : kind === ListNode_Kind.UNORDERED ? "list-disc" : "list-none"}`, `list-inside ${kind === ListNode_Kind.ORDERED ? "list-decimal" : kind === ListNode_Kind.UNORDERED ? "list-disc" : "list-none"}`,
indent > 0 ? `pl-${2 * indent}` : "", indent > 0 ? `pl-${2 * indent}` : "",
), ),
...getAttributes(),
}, },
children.map((child, index) => { children.map((child, index) => {
if (prevNode?.type !== NodeType.LINE_BREAK && child.type === NodeType.LINE_BREAK && skipNextLineBreakFlag) { if (prevNode?.type !== NodeType.LINE_BREAK && child.type === NodeType.LINE_BREAK && skipNextLineBreakFlag) {