diff --git a/CHANGELOG.md b/CHANGELOG.md index ee168cd..97cb6ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,90 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.0.0-beta.20](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.19...v2.0.0-beta.20) (2025-09-25) + + +### Features + +* upgrade monaco-editor's version ([6eab9cd](https://github.com/DTStack/dt-react-monaco-editor/commit/6eab9cd4999d725e1976b88bf207e4f24b251eda)) + +## [2.0.0-beta.19](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.18...v2.0.0-beta.19) (2025-09-25) + +## [2.0.0-beta.18](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.17...v2.0.0-beta.18) (2025-09-24) + +## [2.0.0-beta.17](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.16...v2.0.0-beta.17) (2025-09-24) + +## [2.0.0-beta.16](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.15...v2.0.0-beta.16) (2025-09-24) + +## [2.0.0-beta.15](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.14...v2.0.0-beta.15) (2025-09-24) + +## [2.0.0-beta.14](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.13...v2.0.0-beta.14) (2025-09-24) + +## [2.0.0-beta.13](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.12...v2.0.0-beta.13) (2025-09-24) + +## [2.0.0-beta.12](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.11...v2.0.0-beta.12) (2025-09-24) + +## [2.0.0-beta.11](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.10...v2.0.0-beta.11) (2025-09-23) + +## [2.0.0-beta.10](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.9...v2.0.0-beta.10) (2025-09-23) + +## [2.0.0-beta.9](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.8...v2.0.0-beta.9) (2025-09-23) + +## [2.0.0-beta.8](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.7...v2.0.0-beta.8) (2025-09-23) + +## [2.0.0-beta.7](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.6...v2.0.0-beta.7) (2025-09-18) + +## [2.0.0-beta.6](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.5...v2.0.0-beta.6) (2025-09-18) + +## [2.0.0-beta.5](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.0...v2.0.0-beta.5) (2025-09-18) + + +### Features + +* optimize ([4a13ddc](https://github.com/DTStack/dt-react-monaco-editor/commit/4a13ddc26816c9adede8231de6067219cfb0b57d)) + +## [2.0.0-beta.4](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.0...v2.0.0-beta.4) (2025-09-18) + + +### Features + +* optimize ([4a13ddc](https://github.com/DTStack/dt-react-monaco-editor/commit/4a13ddc26816c9adede8231de6067219cfb0b57d)) + +## [2.0.0-beta.3](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.0...v2.0.0-beta.3) (2025-09-18) + + +### Features + +* optimize ([4a13ddc](https://github.com/DTStack/dt-react-monaco-editor/commit/4a13ddc26816c9adede8231de6067219cfb0b57d)) + +## [2.0.0-beta.2](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.0...v2.0.0-beta.2) (2025-09-18) + + +### Features + +* optimize ([4a13ddc](https://github.com/DTStack/dt-react-monaco-editor/commit/4a13ddc26816c9adede8231de6067219cfb0b57d)) + +## [2.0.0-beta.2](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.0...v2.0.0-beta.2) (2025-09-18) + + +### Features + +* optimize ([4a13ddc](https://github.com/DTStack/dt-react-monaco-editor/commit/4a13ddc26816c9adede8231de6067219cfb0b57d)) + +## [2.0.0-beta.1](https://github.com/DTStack/dt-react-monaco-editor/compare/v2.0.0-beta.0...v2.0.0-beta.1) (2025-09-18) + + +### Features + +* optimize ([4a13ddc](https://github.com/DTStack/dt-react-monaco-editor/commit/4a13ddc26816c9adede8231de6067219cfb0b57d)) + +## [2.0.0-beta.0](https://github.com/DTStack/dt-react-monaco-editor/compare/v1.0.4...v2.0.0-beta.0) (2025-09-17) + + +### Features + +* **upgrade monaco-editor's version to 0.52.2:** upgrade ([a3b74fb](https://github.com/DTStack/dt-react-monaco-editor/commit/a3b74fb61fdb9cb96eec77967ee84e981663abc5)) + ### [1.0.4](https://github.com/DTStack/dt-react-monaco-editor/compare/v1.0.3...v1.0.4) (2024-04-17) diff --git a/package.json b/package.json index a2d3b68..0143d63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dt-react-monaco-editor", - "version": "1.0.4", + "version": "2.0.0-beta.20", "description": "Monaco editor for React.", "authors": "DTStack Corporation", "keywords": [ @@ -40,15 +40,15 @@ "husky": "^8.0.3", "inquirer": "^8.2.2", "lint-staged": "^10.0.7", - "monaco-editor": "0.31.1", + "monaco-editor": "0.52.2", "prettier": "^2.2.0", - "react": "18.x", + "react": "16.13.x", "standard-version": "^7.0.1", "tslib": "^2.5.0", "typescript": "^5.0.4" }, "peerDependencies": { - "monaco-editor": "^0.31.0", + "monaco-editor": "^0.52.2", "react": ">=16.13.1" }, "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 146e8af..e1f4562 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,14 +32,14 @@ importers: specifier: ^10.0.7 version: 10.5.4 monaco-editor: - specifier: 0.31.1 - version: 0.31.1 + specifier: 0.52.2 + version: 0.52.2 prettier: specifier: ^2.2.0 version: 2.8.8 react: - specifier: 18.x - version: 18.3.1 + specifier: 16.13.x + version: 16.13.1 standard-version: specifier: ^7.0.1 version: 7.1.0 @@ -2034,10 +2034,10 @@ packages: } engines: { node: '>=0.10.0' } - monaco-editor@0.31.1: + monaco-editor@0.52.2: resolution: { - integrity: sha512-FYPwxGZAeP6mRRyrr5XTGHD9gRXVjy7GUzF4IPChnyt3fS5WrNxIkS8DNujWf6EQy0Zlzpxw8oTVE+mWI2/D1Q==, + integrity: sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==, } ms@2.1.2: @@ -2099,6 +2099,13 @@ packages: } engines: { node: '>=0.10.0' } + object-assign@4.1.1: + resolution: + { + integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==, + } + engines: { node: '>=0.10.0' } + once@1.4.0: resolution: { @@ -2319,6 +2326,12 @@ packages: integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==, } + prop-types@15.8.1: + resolution: + { + integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==, + } + pump@3.0.0: resolution: { @@ -2350,10 +2363,16 @@ packages: } engines: { node: '>=8' } - react@18.3.1: + react-is@16.13.1: resolution: { - integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==, + integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==, + } + + react@16.13.1: + resolution: + { + integrity: sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==, } engines: { node: '>=0.10.0' } @@ -4341,7 +4360,7 @@ snapshots: modify-values@1.0.1: {} - monaco-editor@0.31.1: {} + monaco-editor@0.52.2: {} ms@2.1.2: {} @@ -4373,6 +4392,8 @@ snapshots: number-is-nan@1.0.1: {} + object-assign@4.1.1: {} + once@1.4.0: dependencies: wrappy: 1.0.2 @@ -4481,6 +4502,12 @@ snapshots: process-nextick-args@2.0.1: {} + prop-types@15.8.1: + dependencies: + loose-envify: 1.4.0 + object-assign: 4.1.1 + react-is: 16.13.1 + pump@3.0.0: dependencies: end-of-stream: 1.4.4 @@ -4492,9 +4519,13 @@ snapshots: quick-lru@4.0.1: {} - react@18.3.1: + react-is@16.13.1: {} + + react@16.13.1: dependencies: loose-envify: 1.4.0 + object-assign: 4.1.1 + prop-types: 15.8.1 read-pkg-up@3.0.0: dependencies: diff --git a/src/config.ts b/src/config.ts index 33839ba..f6d6863 100644 --- a/src/config.ts +++ b/src/config.ts @@ -13,4 +13,11 @@ export const defaultOptions: monaco.editor.IStandaloneEditorConstructionOptions fontSize: 13, fixedOverflowWidgets: true, renderControlCharacters: true, + dragAndDrop: false, + dropIntoEditor: { + enabled: false, + }, + inlineSuggest: { + enabled: true, + }, }; diff --git a/src/editor.tsx b/src/editor.tsx index 4146b9e..a0ccf20 100644 --- a/src/editor.tsx +++ b/src/editor.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'; import { defaultOptions } from './config'; @@ -80,7 +81,7 @@ class MonacoEditor extends React.Component { ...defaultOptions, ...options, value, - language: language || 'sql', + language: language || 'plaintext', theme, }; this.editor = monaco.editor.create(