Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
bedre7 committed Nov 5, 2024
2 parents 05839e1 + af344f3 commit e84877f
Show file tree
Hide file tree
Showing 100 changed files with 9,058 additions and 4,629 deletions.
3 changes: 2 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ untyped-type-import=error
[options]
server.max_workers=4
exact_by_default=true
component_syntax=true

;; [generated-start update-flowconfig]
module.name_mapper='^lexical$' -> '<PROJECT_ROOT>/packages/lexical/flow/Lexical.js.flow'
Expand Down Expand Up @@ -105,4 +106,4 @@ nonstrict-import
unclear-type

[version]
^0.226.0
^0.250.0
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ npm
.env.production.local
.ts-temp
.docusaurus
.playwright-clipboard.lock
e2e-screenshots
test-results
playwright-report
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ packages/playwright-core
packages/**/vite.config.js
packages/**/vite.prod.config.js
packages/lexical-website/docs/api
packages/lexical-website/fb/*.json
**/*.md
**/*.js.flow
**/node_modules
Expand Down
39 changes: 39 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
## v0.19.0 (2024-10-28)

- lexical Add missing commands to Lexical.js.flow (#6769) Sherry
- lexical-react Feature add attributes in LinkPlugin (#6760) Taro Shono
- lexical-react replace abstract component (#6752) Sherry
- Trust HTML for rich text clipboard (#6755) Gerard Rovira
- lexical-playground Bug Fix Disable editing of Excalidraw Component in Read-Only Mode (#6704) Neysan Foo
- lexical-playground Bug Fix Disable table hover actions in read-only mode (#6706) Neysan Foo
- lexical-table lexical-selection Try to fix calling split on undefined (#6746) Ivaylo Pavlov
- Add ariaErrorMessage and ariaInvalid to Flow type (#6751) EJ Hammond
- lexical-react Feature Add aria-errormessage and aria-invalid support to LexicalContentEditable (#6745) EJ Hammond
- lexical-table Return inserted node from insertTableRowEXPERIMENTAL and insertTableColumnEXPERIMENTAL (#6741) Aman Harwara
- Bug Fix Shiftdown selects an extra subsequent element for Table selection (#6679) Katsia
- lexical-playground Bug Fix Disable equation editing in read-only mode (#6707) Neysan Foo
- lexical-markdown Feature add ability to hook into the import process for multiline element transformers (#6682) Alessio Gravili
- lexical-playground Bug Fix Disable image and inline focusing, adding caption and editing in read-only mode (#6705) Neysan Foo
- lexical-code Bug Fix Add global type declarations for Prism (#6736) Bob Ippolito
- Chore Disable react-beta test job for now (#6738) Bob Ippolito
- lexical-playground Table Hover Actions Layout Fixes (#6725) Ivaylo Pavlov
- lexical Bug Fix lines were being deleted with deleteLine (#6719) Taro Shono
- lexical-table Bug Fix colWidths not imported from DOM for TableNode (#6731) cwstra
- Chore add workflow to auto close stale pr based on label (#6732) Sherry
- lexical-playground Bug Fix match toolbar font size input with the rest of toolbar items in Read-Only mode (#6698) Bedru Umer
- lexical-playground Remove unused command (#6726) Ivaylo Pavlov
- fix preserve custom fields in Lexical-Yjs sync (#6724) Vadim Nicolaev
- lexicallexical-listlexical-rich-text Fix Preserve indentation when serializing to and from HTML (#6693) Germn Jabloski
- lexicallexical-list Bug Fix Retain indentation when list format is removed and reapplied (#6684) Sebastian Arrazola
- lexical Bug Fix Insertion into inline ElementNode should not crash (#6703) Bob Ippolito
- lexical-playground Bug Fix Track Resizing Actions for Excalidraw in History Stack (#6696) Neysan Foo
- lexical-playground Bug Fix toolbar font size input keyboard accessibility (#6695) Riley Pearce
- lexical-playground 3 Bug Fixes, 1 UX Improvement All Regarding Excalidraw Node (#6666) Neysan Foo
- lexical Bug Fix TextNode in token mode should not be split by removeText (#6690) Bob Ippolito
- lexical-yjs Bug Fix Add missing setLocalStateField method to ProviderAwareness type (#6683) Vadim Nicolaev
- lexical Bug Fix Fix Table formatting when no TextNodes present (#6675) Katsia
- lexical-tablelexical-playground Bug Fix Make style buttons in toolbar respect table selection (#6678) Katsia
- Support backward selection in rows deletion (#6680) Maksim Horbachevsky
- v0.18.0 (#6676) Sherry
- v0.18.0 Lexical GitHub Actions Bot

## v0.18.0 (2024-09-26)

- lexical-markdown set shouldMergeAdjacentLines default to be false (#6660) Sherry
Expand Down
6 changes: 3 additions & 3 deletions examples/react-plain-text/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@lexical/react-plain-text-example",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview"
},
"dependencies": {
"@lexical/react": "0.18.0",
"lexical": "0.18.0",
"@lexical/react": "0.19.0",
"lexical": "0.19.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
8 changes: 4 additions & 4 deletions examples/react-rich-collab/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@lexical/react-rich-collab-example",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -12,9 +12,9 @@
"server:webrtc": "cross-env HOST=localhost PORT=1235 npx y-webrtc"
},
"dependencies": {
"@lexical/react": "0.18.0",
"@lexical/yjs": "0.18.0",
"lexical": "0.18.0",
"@lexical/react": "0.19.0",
"@lexical/yjs": "0.19.0",
"lexical": "0.19.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"y-webrtc": "^10.3.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/react-rich/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@lexical/react-rich-example",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview"
},
"dependencies": {
"@lexical/react": "0.18.0",
"lexical": "0.18.0",
"@lexical/react": "0.19.0",
"lexical": "0.19.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
6 changes: 3 additions & 3 deletions examples/react-table/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@lexical/react-table-example",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview"
},
"dependencies": {
"@lexical/react": "0.18.0",
"lexical": "0.18.0",
"@lexical/react": "0.19.0",
"lexical": "0.19.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
12 changes: 6 additions & 6 deletions examples/vanilla-js-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"name": "@lexical/vanilla-js-plugin-example",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview"
},
"dependencies": {
"@lexical/dragon": "0.18.0",
"@lexical/history": "0.18.0",
"@lexical/rich-text": "0.18.0",
"@lexical/utils": "0.18.0",
"@lexical/dragon": "0.19.0",
"@lexical/history": "0.19.0",
"@lexical/rich-text": "0.19.0",
"@lexical/utils": "0.19.0",
"emoji-datasource-facebook": "15.1.2",
"lexical": "0.18.0"
"lexical": "0.19.0"
},
"devDependencies": {
"typescript": "^5.2.2",
Expand Down
12 changes: 6 additions & 6 deletions examples/vanilla-js/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "@lexical/vanilla-js-example",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview"
},
"dependencies": {
"@lexical/dragon": "0.18.0",
"@lexical/history": "0.18.0",
"@lexical/rich-text": "0.18.0",
"@lexical/utils": "0.18.0",
"lexical": "0.18.0"
"@lexical/dragon": "0.19.0",
"@lexical/history": "0.19.0",
"@lexical/rich-text": "0.19.0",
"@lexical/utils": "0.19.0",
"lexical": "0.19.0"
},
"devDependencies": {
"typescript": "^5.2.2",
Expand Down
1 change: 1 addition & 0 deletions libdefs/yjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,7 @@ declare module 'yjs' {
};

declare type StackItem = {
// $FlowFixMe: perhaps add generic typing instead of mixed
meta: Map<mixed, mixed>,
type: 'undo' | 'redo',
};
Expand Down
Loading

0 comments on commit e84877f

Please sign in to comment.