Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"prepare": "husky"
},
"devDependencies": {
"@lexical/eslint-plugin": "^0.25.0",
"@lexical/eslint-plugin": "^0.27.0",
"@nx/devkit": "19.8.14",
"@nx/eslint": "19.8.14",
"@nx/eslint-plugin": "19.8.14",
Expand Down Expand Up @@ -43,7 +43,7 @@
"lint-staged": "^15.4.3",
"nx": "19.8.14",
"nx-cloud": "^19.1.0",
"prettier": "^3.5.2",
"prettier": "^3.5.3",
"prettier-plugin-tailwindcss": "^0.6.11",
"ts-jest": "^29.2.6",
"ts-node": "^10.9.2",
Expand Down
12 changes: 6 additions & 6 deletions packages/perf-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"react-dom": ">=18.3.1"
},
"dependencies": {
"@lexical/headless": "^0.25.0",
"@lexical/html": "^0.25.0",
"@lexical/react": "^0.25.0",
"@lexical/selection": "^0.25.0",
"@lexical/utils": "^0.25.0",
"@lexical/headless": "^0.27.0",
"@lexical/html": "^0.27.0",
"@lexical/react": "^0.27.0",
"@lexical/selection": "^0.27.0",
"@lexical/utils": "^0.27.0",
"base-64": "^1.0.0",
"epitelete-html": "^0.2.21-beta.2",
"lexical": "^0.25.0",
"lexical": "^0.27.0",
"open-patcher": "1.0.0-beta.1",
"pure-uuid": "^1.8.1"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ContentEditable } from "@lexical/react/LexicalContentEditable";
import LexicalErrorBoundary from "@lexical/react/LexicalErrorBoundary";
import { LexicalErrorBoundary } from "@lexical/react/LexicalErrorBoundary";
import { RichTextPlugin } from "@lexical/react/LexicalRichTextPlugin";
import { forwardRef } from "react";

Expand Down
6 changes: 5 additions & 1 deletion packages/perf-react/src/app/Editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { FlatDocument as PerfDocument } from "shared/plugins/PerfOperations/Type
import Button from "./Components/Button";

import {
$getCommonAncestor,
$getNodeByKey,
$getSelection,
LexicalEditor,
Expand Down Expand Up @@ -230,8 +231,11 @@ export default function Editor({
const startNode = $getNodeByKey(startEndPoints[0].key);
const endNode = $getNodeByKey(startEndPoints[1].key);
if (!startNode || !endNode) return;

const result = $getCommonAncestor(startNode, endNode);
const commonAncestor = result ? result.commonAncestor : undefined;
//This is the selected element expected to be a usfm element;
const selectedElement = startNode.getCommonAncestor(endNode);
const selectedElement = commonAncestor?.getParent();
if ($isUsfmElementNode(selectedElement)) {
setSelectedMarker(selectedElement.getAttribute("data-marker"));
}
Expand Down
6 changes: 3 additions & 3 deletions packages/perf-vanilla/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dev": "vite"
},
"dependencies": {
"@lexical/rich-text": "^0.25.0",
"@lexical/utils": "^0.25.0",
"lexical": "^0.25.0",
"@lexical/rich-text": "^0.27.0",
"@lexical/utils": "^0.27.0",
"lexical": "^0.27.0",
"open-patcher": "1.0.0-beta.1"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/platform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
},
"dependencies": {
"@biblionexus-foundation/scripture-utilities": "workspace:~",
"@lexical/react": "^0.25.0",
"@lexical/selection": "^0.25.0",
"@lexical/text": "^0.25.0",
"@lexical/utils": "^0.25.0",
"@lexical/yjs": "^0.25.0",
"@lexical/react": "^0.27.0",
"@lexical/selection": "^0.27.0",
"@lexical/text": "^0.27.0",
"@lexical/utils": "^0.27.0",
"@lexical/yjs": "^0.27.0",
"@sillsdev/scripture": "^2.0.2",
"fast-equals": "^5.2.2",
"lexical": "^0.25.0",
"lexical": "^0.27.0",
"yjs": "^13.6.20"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/scribe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
"dependencies": {
"@biblionexus-foundation/scripture-utilities": "workspace:~",
"@floating-ui/dom": "^1.6.13",
"@lexical/mark": "^0.25.0",
"@lexical/react": "^0.25.0",
"@lexical/selection": "^0.25.0",
"@lexical/utils": "^0.25.0",
"@lexical/mark": "^0.27.0",
"@lexical/react": "^0.27.0",
"@lexical/selection": "^0.27.0",
"@lexical/utils": "^0.27.0",
"autoprefixer": "^10.4.20",
"fast-equals": "^5.2.2",
"lexical": "^0.25.0"
"lexical": "^0.27.0"
},
"devDependencies": {
"@types/react": "^18.3.18",
Expand Down
3 changes: 1 addition & 2 deletions packages/scribe/src/plugins/NodesMenu/NodeSelectionMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { useEffect, useState } from "react";
import Menu from "./Menu";
import Menu, { OptionItem } from "./Menu";
import { useFilteredItems } from "./Menu/useFilteredItems";
import { COMMAND_PRIORITY_HIGH, KEY_DOWN_COMMAND } from "lexical";
import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
import LexicalMenuNavigation from "./LexicalMenuNavigation";
import { OptionItem } from "./Menu";

interface NodeSelectionMenuProps {
options: Array<OptionItem>;
Expand Down
5 changes: 4 additions & 1 deletion packages/scribe/src/plugins/UsjNodesMenuPlugin.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
import { $dfs, DFSNode, mergeRegister } from "@lexical/utils";
import {
$getCommonAncestor,
$getNodeByKey,
$getRoot,
$getSelection,
Expand Down Expand Up @@ -79,7 +80,9 @@ function useContextMarker(editor: LexicalEditor) {
return;
}

const contextNode = startNode.getCommonAncestor(endNode);
const result = $getCommonAncestor(startNode, endNode);
const commonAncestor = result ? result.commonAncestor : undefined;
const contextNode = commonAncestor?.getParent();
if (!contextNode || !$isReactNodeWithMarker(contextNode)) {
setContextMarker(undefined);
return;
Expand Down
6 changes: 3 additions & 3 deletions packages/shared-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
},
"dependencies": {
"@floating-ui/dom": "^1.6.13",
"@lexical/react": "^0.25.0",
"@lexical/utils": "^0.25.0",
"lexical": "^0.25.0"
"@lexical/react": "^0.27.0",
"@lexical/utils": "^0.27.0",
"lexical": "^0.27.0"
},
"devDependencies": {
"@types/react": "^18.3.18",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { useEffect, useState } from "react";
import Menu from "./Menu";
import Menu, { OptionItem } from "./Menu";
import { useFilteredItems } from "./Menu/useFilteredItems";
import { COMMAND_PRIORITY_HIGH, KEY_DOWN_COMMAND } from "lexical";
import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
import LexicalMenuNavigation from "./LexicalMenuNavigation";
import { OptionItem } from "./Menu";

interface NodeSelectionMenuProps {
options: Array<OptionItem>;
Expand Down
5 changes: 4 additions & 1 deletion packages/shared-react/plugins/UsjNodesMenuPlugin.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
import { $dfs, DFSNode, mergeRegister } from "@lexical/utils";
import {
$getCommonAncestor,
$getNodeByKey,
$getRoot,
$getSelection,
Expand Down Expand Up @@ -74,7 +75,9 @@ function useContextMarker(editor: LexicalEditor) {
return;
}

const contextNode = startNode.getCommonAncestor(endNode);
const result = $getCommonAncestor(startNode, endNode);
const commonAncestor = result ? result.commonAncestor : undefined;
const contextNode = commonAncestor?.getParent();
if (!contextNode || !$isReactNodeWithMarker(contextNode)) {
setContextMarker(undefined);
return;
Expand Down
6 changes: 3 additions & 3 deletions packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
},
"dependencies": {
"@biblionexus-foundation/scripture-utilities": "workspace:*",
"@lexical/mark": "^0.25.0",
"@lexical/utils": "^0.25.0",
"@lexical/mark": "^0.27.0",
"@lexical/utils": "^0.27.0",
"@sillsdev/scripture": "^2.0.2",
"epitelete": "^0.2.20",
"lexical": "^0.25.0",
"lexical": "^0.27.0",
"open-patcher": "1.0.0-beta.1"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ElementNode, LexicalNode, TextNode } from "lexical";
import type { ElementNode, LexicalNode, TextNode } from "lexical";
import { $isElementNode, $isTextNode } from "lexical";
import { CursorData, CursorPosition } from "../utils/CursorSelectionContext";
import {
Expand Down
5 changes: 2 additions & 3 deletions packages/shared/plugins/Typeahead/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
* - Added additional utility functions for text manipulation
*/

import { $getSelection, $isTextNode, LexicalEditor, RangeSelection, TextNode } from "lexical";

import { $isRangeSelection } from "lexical";
import type { LexicalEditor, RangeSelection, TextNode } from "lexical";
import { $getSelection, $isRangeSelection, $isTextNode } from "lexical";
//TODO: This list is very language specific and probably should be externally supplied perhaps by the UI language setting.
export const PUNCTUATION = "\\.,\\+\\*\\?\\$\\@\\|#{}\\(\\)\\^\\-\\[\\]\\\\/!%'\"~=<>_:;";

Expand Down
2 changes: 1 addition & 1 deletion packages/utilities/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@xmldom/xmldom": "^0.9.7"
},
"devDependencies": {
"lexical": "^0.25.0"
"lexical": "^0.27.0"
},
"volta": {
"extends": "../../package.json"
Expand Down
Loading
Loading