From a79d673a7079ce72c10802d165e865ce0243b025 Mon Sep 17 00:00:00 2001 From: Jack Allen Date: Tue, 26 Feb 2019 10:50:13 +0000 Subject: [PATCH 1/4] [updated] Updated Editor API with moveToRangeOfNode() --- types/slate/index.d.ts | 7 ++++--- types/slate/slate-tests.ts | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/types/slate/index.d.ts b/types/slate/index.d.ts index 567b7ee52e..946031e7a7 100644 --- a/types/slate/index.d.ts +++ b/types/slate/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for slate 0.43 +// Type definitions for slate 0.44 // Project: https://github.com/ianstormtaylor/slate // Definitions by: Andy Kent // Jamie Talbot @@ -8,6 +8,7 @@ // Francesco Agnoletto // Irwan Fario Subastian // Hanna Greaves +// Jack Allen // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.8 import * as Immutable from "immutable"; @@ -1144,7 +1145,7 @@ export class Editor implements Controller { moveToStartOfPreviousText(): Editor; moveToStartOfText(): Editor; moveToRangeOfDocument(): Editor; - moveToRangeOf(node: Node): Editor; + moveToRangeOfNode(node: Node): Editor; select(properties: Range | RangeProperties): Editor; addMarkAtRange(range: Range, mark: Mark | MarkProperties | string): Editor; deleteAtRange(range: Range): Editor; @@ -1933,7 +1934,7 @@ export interface Controller { /** * Move the current selection's anchor to the start of the provided node and its focus to the end of it. */ - moveToRangeOf(node: Node): Controller; + moveToRangeOfNode(node: Node): Controller; /** * Merge the current selection with the provided properties */ diff --git a/types/slate/slate-tests.ts b/types/slate/slate-tests.ts index 07f15dcaac..0bb2595165 100644 --- a/types/slate/slate-tests.ts +++ b/types/slate/slate-tests.ts @@ -210,7 +210,7 @@ editor .moveToEndOfPreviousText() .moveToEndOfText() .moveToFocus() -.moveToRangeOf(inline) +.moveToRangeOfNode(inline) .moveToRangeOfDocument() .moveToStart() .moveToStartOfBlock() From 83ca0329f79da06ac2cb14dfef755f66217e318b Mon Sep 17 00:00:00 2001 From: Jack Allen Date: Tue, 26 Feb 2019 10:57:32 +0000 Subject: [PATCH 2/4] [updated] Update Document method for getLeafBlocksAtRange() --- types/slate/index.d.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/types/slate/index.d.ts b/types/slate/index.d.ts index 946031e7a7..b9565fd7e3 100644 --- a/types/slate/index.d.ts +++ b/types/slate/index.d.ts @@ -402,8 +402,6 @@ declare class BaseNode< findDescendants(iterator: (node: Node) => boolean): Node | null; getActiveMarksAtRange(range: Range): Immutable.Set; getAncestors(path: Path): Immutable.List | null; - getBlocksAtRange(range: Range): Immutable.List; - getBlocksAtRangeAsArray(range: Range): Block[]; getBlocks(): Immutable.List; getBlocksAsArray(): Block[]; getBlocksByType(type: string): Immutable.List; @@ -433,6 +431,8 @@ declare class BaseNode< getInsertMarksAtRange(range: Range): Immutable.Set; getKeysToPathsTable(): object; getLastText(): Text | null; + getLeafBlocksAtRange(range: Range): Immutable.List; + getLeafBlocksAtRangeAsArray(range: Range): Block[]; getMarks(): Immutable.Set; getMarksAsArray(): Mark[]; getMarksAtPosition(key: string, offset: number): Immutable.Set; @@ -884,6 +884,8 @@ export type ErrorCode = | "child_required" | "child_type_invalid" | "child_unknown" + | "child_min_invalid" + | "child_max_invalid" | "first_child_object_invalid" | "first_child_type_invalid" | "last_child_object_invalid" From 14ddfefc32b1d6ffcb3f1c38308a910e44a7d57c Mon Sep 17 00:00:00 2001 From: Jack Allen Date: Tue, 26 Feb 2019 14:11:05 +0000 Subject: [PATCH 3/4] [added] getRootBlocksAtRange & getRootInlinesAtRange --- types/slate/index.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/types/slate/index.d.ts b/types/slate/index.d.ts index b9565fd7e3..9b7717e6b8 100644 --- a/types/slate/index.d.ts +++ b/types/slate/index.d.ts @@ -461,6 +461,8 @@ declare class BaseNode< getPreviousNode(path: Path): Node | null; getPreviousSibling(path: Path): Node | null; getPreviousText(path: Path): Text | null; + getRootBlocksAtRange(range: Range): Immutable.List; + getRootInlinesAtRange(range: Range): Immutable.List; getSelectionIndexes( range: Range, isSelected?: boolean From 22b27981b9356229337202ee1eea8cac03bba59f Mon Sep 17 00:00:00 2001 From: Jack Allen Date: Tue, 26 Feb 2019 15:52:43 +0000 Subject: [PATCH 4/4] [updated] moveToRangeOfNode() included into the slate-react Editor --- types/slate-react/index.d.ts | 2 +- types/slate-react/slate-react-tests.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/types/slate-react/index.d.ts b/types/slate-react/index.d.ts index 30e54f2a02..4f7192c4fc 100644 --- a/types/slate-react/index.d.ts +++ b/types/slate-react/index.d.ts @@ -289,7 +289,7 @@ export class Editor extends React.Component implements moveToStartOfPreviousText: CoreEditor['moveToStartOfPreviousText']; moveToStartOfText: CoreEditor['moveToStartOfText']; moveToRangeOfDocument: CoreEditor['moveToRangeOfDocument']; - moveToRangeOf: CoreEditor['moveToRangeOf']; + moveToRangeOfNode: CoreEditor['moveToRangeOfNode']; select: CoreEditor['select']; addMarkAtRange: CoreEditor['addMarkAtRange']; deleteAtRange: CoreEditor['deleteAtRange']; diff --git a/types/slate-react/slate-react-tests.tsx b/types/slate-react/slate-react-tests.tsx index 4f8f55b47b..f4c2ce9df0 100644 --- a/types/slate-react/slate-react-tests.tsx +++ b/types/slate-react/slate-react-tests.tsx @@ -220,7 +220,7 @@ editor .moveToEndOfPreviousText() .moveToEndOfText() .moveToFocus() -.moveToRangeOf(inline) +.moveToRangeOfNode(inline) .moveToRangeOfDocument() .moveToStart() .moveToStartOfBlock()