Skip to content

Commit 241077f

Browse files
streamichstreamich
committed
style: 💄 fix linter issues
1 parent a452682 commit 241077f

File tree

6 files changed

+60
-31
lines changed

6 files changed

+60
-31
lines changed

‎src/json-crdt-extensions/peritext/block/Inline.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -317,15 +317,15 @@ export class Inline<T = string> extends Range<T> implements Printable {
317317
printTree(
318318
tab,
319319
attrKeys.map((key) => () => {
320-
return key === '-1' ? '▚ (cursor)' : (
321-
formatType(key) +
322-
' = ' +
323-
stringify(
324-
attr[key].map((attr) =>
325-
attr.slice instanceof Cursor ? [attr.slice.type, attr.slice.data()] : attr.slice.data(),
326-
),
327-
)
328-
);
320+
return key === '-1'
321+
? '▚ (cursor)'
322+
: formatType(key) +
323+
' = ' +
324+
stringify(
325+
attr[key].map((attr) =>
326+
attr.slice instanceof Cursor ? [attr.slice.type, attr.slice.data()] : attr.slice.data(),
327+
),
328+
);
329329
}),
330330
),
331331
!texts.length

‎src/json-crdt-extensions/peritext/editor/Editor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ export class Editor<T = string> implements Printable {
786786
*/
787787
public splitAt(at: Point<T>, slices: EditorSlices<T> = this.saved): boolean {
788788
const [type, marker] = this.getBlockType(at);
789-
const prevMarker = marker ? this.getMarker(marker.start.copy(p => p.halfstep(-1))) : void 0;
789+
const prevMarker = marker ? this.getMarker(marker.start.copy((p) => p.halfstep(-1))) : void 0;
790790
if (marker && prevMarker) {
791791
const rangeFromMarker = this.txt.range(marker.start, at);
792792
const noLeadingText = rangeFromMarker.length() <= 1;

‎src/json-crdt-extensions/peritext/editor/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {SliceTypeSteps} from '../slice';
1+
import type {SliceTypeSteps} from '../slice';
22
import type {CharPredicate} from './types';
33

44
const LETTER_REGEX = /(\p{Letter}|\d|_)/u;

‎src/json-crdt-extensions/peritext/rga/Point.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class Point<T = string> implements Pick<Stateful, 'refresh'>, Printable {
5151
}
5252

5353
public copy(mutate: (copy: Point<T>) => void): Point<T> {
54-
let copy = this.clone();
54+
const copy = this.clone();
5555
mutate(copy);
5656
return copy;
5757
}

‎src/json-crdt-peritext-ui/dom/util.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
export type GetCursorPosition = (x: number, y: number) => null | [node: Node, offset: number];
22

3-
export const getCursorPosition: GetCursorPosition = typeof document !== 'undefined' && (<any>document).caretPositionFromPoint
4-
? (x, y) => {
5-
const range = (<any>document).caretPositionFromPoint(x, y);
6-
return range ? [range.offsetNode, range.offset] : null;
7-
}
8-
: (x, y) => {
9-
const range = document.caretRangeFromPoint(x, y);
10-
return range ? [range.startContainer, range.startOffset] : null;
11-
};
3+
export const getCursorPosition: GetCursorPosition =
4+
typeof document !== 'undefined' && (<any>document).caretPositionFromPoint
5+
? (x, y) => {
6+
const range = (<any>document).caretPositionFromPoint(x, y);
7+
return range ? [range.offsetNode, range.offset] : null;
8+
}
9+
: (x, y) => {
10+
const range = document.caretRangeFromPoint(x, y);
11+
return range ? [range.startContainer, range.startOffset] : null;
12+
};
1213

1314
export const unit = (event: KeyboardEvent): '' | 'word' | 'line' =>
1415
event.metaKey ? 'line' : event.altKey || event.ctrlKey ? 'word' : '';

‎src/json-crdt-peritext-ui/events/__tests__/marker.spec.ts

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ const testSuite = (getKit: () => Kit) => {
4646
kit.et.marker({action: 'ins'});
4747
kit.peritext.refresh();
4848
const html3 = transfer.toHtml(kit.peritext.rangeAll()!);
49-
expect(html3).toBe('<p>abcde</p><blockquote><p>fghi</p></blockquote><blockquote><p>jklmnopqrstuvwxyz</p></blockquote>');
49+
expect(html3).toBe(
50+
'<p>abcde</p><blockquote><p>fghi</p></blockquote><blockquote><p>jklmnopqrstuvwxyz</p></blockquote>',
51+
);
5052
});
5153

5254
test('can split <p> in list, list item <li> and create two adjacent lists', async () => {
@@ -75,25 +77,51 @@ const testSuite = (getKit: () => Kit) => {
7577
test('can consecutively split two nested lists with a blockquote', async () => {
7678
const kit = setup();
7779
kit.et.cursor({at: 7});
78-
kit.et.marker({action: 'ins', type: [SliceTypeCon.ul, SliceTypeCon.li, SliceTypeCon.ul, SliceTypeCon.li, SliceTypeCon.blockquote, SliceTypeCon.p]});
80+
kit.et.marker({
81+
action: 'ins',
82+
type: [
83+
SliceTypeCon.ul,
84+
SliceTypeCon.li,
85+
SliceTypeCon.ul,
86+
SliceTypeCon.li,
87+
SliceTypeCon.blockquote,
88+
SliceTypeCon.p,
89+
],
90+
});
7991
kit.peritext.refresh();
8092
const transfer = createTransfer(kit.peritext);
8193
const html1 = transfer.toHtml(kit.peritext.rangeAll()!);
82-
expect(html1).toBe('<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmnopqrstuvwxyz</p></blockquote></li></ul></li></ul>');
94+
expect(html1).toBe(
95+
'<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmnopqrstuvwxyz</p></blockquote></li></ul></li></ul>',
96+
);
8397
kit.et.cursor({at: 15});
8498
const pressEnter = (): string => {
8599
kit.et.marker({action: 'ins'});
86100
kit.peritext.refresh();
87101
const html = transfer.toHtml(kit.peritext.rangeAll()!);
88102
return html;
89103
};
90-
expect(pressEnter()).toBe('<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>');
91-
expect(pressEnter()).toBe('<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>');
92-
expect(pressEnter()).toBe('<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>');
93-
expect(pressEnter()).toBe('<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li></ul><ul><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>');
94-
expect(pressEnter()).toBe('<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li></ul></li><li><ul><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>');
95-
expect(pressEnter()).toBe('<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li></ul></li></ul><ul><li><ul><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>');
96-
expect(pressEnter()).toBe('<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li></ul></li></ul><ul><li><ul><li><blockquote><p /></blockquote></li></ul></li></ul><ul><li><ul><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>');
104+
expect(pressEnter()).toBe(
105+
'<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>',
106+
);
107+
expect(pressEnter()).toBe(
108+
'<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>',
109+
);
110+
expect(pressEnter()).toBe(
111+
'<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>',
112+
);
113+
expect(pressEnter()).toBe(
114+
'<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li></ul><ul><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>',
115+
);
116+
expect(pressEnter()).toBe(
117+
'<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li></ul></li><li><ul><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>',
118+
);
119+
expect(pressEnter()).toBe(
120+
'<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li></ul></li></ul><ul><li><ul><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>',
121+
);
122+
expect(pressEnter()).toBe(
123+
'<p>abcdefg</p><ul><li><ul><li><blockquote><p>hijklmn</p></blockquote></li></ul></li></ul><ul><li><ul><li><blockquote><p /></blockquote></li></ul></li></ul><ul><li><ul><li><blockquote><p>opqrstuvwxyz</p></blockquote></li></ul></li></ul>',
124+
);
97125
});
98126
};
99127

0 commit comments

Comments
 (0)