Skip to content

Commit c9f664f

Browse files
committed
Merge branch 'release/1.0.7'
2 parents c2ad55e + 48310db commit c9f664f

File tree

20 files changed

+1327
-751
lines changed

20 files changed

+1327
-751
lines changed

β€Ž@noctaCrdt/src/LinkedList.ts

+11-5
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,18 @@ export class BlockLinkedList extends LinkedList<Block> {
278278
let currentIndex = 1;
279279

280280
while (currentNode) {
281-
if (currentNode.deleted) {
282-
currentNode = currentNode.next ? this.getNode(currentNode.next) : null;
283-
continue;
284-
}
285281
if (currentNode.type === "ol") {
286-
const prevNode = currentNode.prev ? this.getNode(currentNode.prev) : null;
282+
let prevNode = currentNode.prev ? this.getNode(currentNode.prev) : null;
283+
284+
// tombstone λ…Έλ“œλ₯Ό κ±΄λ„ˆλ›°λŠ” 둜직
285+
while (prevNode && prevNode.deleted) {
286+
// 이전 λ…Έλ“œμ˜ prevλ₯Ό λ‹€μ‹œ 좔적
287+
if (prevNode.prev) {
288+
prevNode = this.getNode(prevNode.prev);
289+
} else {
290+
prevNode = null;
291+
}
292+
}
287293

288294
if (!prevNode || prevNode.type !== "ol") {
289295
// 이전 λ…Έλ“œκ°€ μ—†κ±°λ‚˜ ol이 μ•„λ‹Œ 경우 1λΆ€ν„° μ‹œμž‘

β€Ž@noctaCrdt/src/types/Interfaces.ts

+17
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,23 @@ export type PageIconType =
6666

6767
export type TextColorType = Exclude<BackgroundColorType, "transparent">;
6868

69+
export type CRDTOperation =
70+
| RemoteBlockInsertOperation
71+
| RemoteBlockDeleteOperation
72+
| RemoteBlockUpdateOperation
73+
| RemoteBlockReorderOperation
74+
| RemoteBlockCheckboxOperation
75+
| RemoteCharInsertOperation
76+
| RemoteCharDeleteOperation
77+
| RemoteCharUpdateOperation;
78+
79+
export type Operation =
80+
| RemotePageCreateOperation
81+
| RemotePageDeleteOperation
82+
| RemotePageUpdateOperation
83+
| CRDTOperation
84+
| CursorPosition;
85+
6986
export interface InsertOperation {
7087
type: "insert";
7188
node: Block | Char;

β€Žclient/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"@noctaCrdt": "workspace:*",
1919
"@pandabox/panda-plugins": "^0.0.8",
2020
"@tanstack/react-query": "^5.60.5",
21+
"@tanstack/react-virtual": "^3.11.2",
2122
"axios": "^1.7.7",
2223
"framer-motion": "^11.11.11",
2324
"react": "^18.3.1",

β€Žclient/src/features/editor/Editor.style.ts

-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ export const editorContainer = css({
1212
},
1313
});
1414

15-
export const editorTitleContainer = css({
16-
display: "flex",
17-
gap: "4px",
18-
flexDirection: "column",
19-
width: "full",
20-
padding: "spacing.sm",
21-
});
22-
2315
export const editorTitle = css({
2416
textStyle: "display-medium28",
2517
outline: "none",

0 commit comments

Comments
Β (0)