Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/#286 스타일 적용된 텍스트 이어서 작성할 때 서버 반영 안되는 문제 해결 #286

Merged
merged 1 commit into from
Dec 4, 2024
Merged

Hotfix/#286 스타일 적용된 텍스트 이어서 작성할 때 서버 반영 안되는 문제 해결 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions @noctaCrdt/Crdt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
this.LinkedList = new LinkedListClass();
}

localInsert(index: number, value: string, blockId?: BlockId, pageId?: string): any {

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'index' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'value' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'blockId' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'pageId' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

Unexpected any. Specify a different type

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'index' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'value' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'blockId' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'pageId' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 29 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

Unexpected any. Specify a different type
// 기본 CRDT에서는 구현하지 않고, 하위 클래스에서 구현
throw new Error("Method not implemented.");
}

localDelete(index: number, blockId?: BlockId, pageId?: string): any {

Check warning on line 34 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'index' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 34 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'blockId' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 34 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'pageId' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 34 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

Unexpected any. Specify a different type

Check warning on line 34 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'index' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 34 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'blockId' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 34 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'pageId' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 34 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

Unexpected any. Specify a different type
// 기본 CRDT에서는 구현하지 않고, 하위 클래스에서 구현
throw new Error("Method not implemented.");
}

remoteInsert(operation: any): void {

Check warning on line 39 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'operation' is defined but never used. Allowed unused args must match /^_/u

Check warning on line 39 in @noctaCrdt/Crdt.ts

View workflow job for this annotation

GitHub Actions / Lint and Unit Test 

'operation' is defined but never used. Allowed unused args must match /^_/u
// 기본 CRDT에서는 구현하지 않고, 하위 클래스에서 구현
throw new Error("Method not implemented.");
}
Expand Down Expand Up @@ -294,12 +294,12 @@
});
}

if (operation.color) {
newNode.color = operation.color;
if (operation.node.color) {
newNode.color = operation.node.color;
}

if (operation.backgroundColor) {
newNode.backgroundColor = operation.backgroundColor;
if (operation.node.backgroundColor) {
newNode.backgroundColor = operation.node.backgroundColor;
}

this.LinkedList.insertById(newNode);
Expand Down
8 changes: 4 additions & 4 deletions client/src/features/editor/hooks/useBlockOperation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ export const useBlockOperation = ({
addedChar,
block.id,
pageId,
prevChar ? prevChar.style : [],
prevChar ? prevChar.color : undefined,
prevChar ? prevChar.backgroundColor : undefined,
prevChar?.style,
prevChar?.color,
prevChar?.backgroundColor,
);
} else {
// 중간에 삽입
const prevChar = editorCRDT.currentBlock?.crdt.LinkedList.findByIndex(
validCaretPosition - 1,
validCaretPosition === 1 ? 0 : validCaretPosition - 2,
);
const addedChar = newContent[validCaretPosition - 1];
charNode = block.crdt.localInsert(
Expand Down
Loading