Skip to content

Commit

Permalink
fix: dispose suggestion providers when component destroyed
Browse files Browse the repository at this point in the history
  • Loading branch information
legends-killer committed Jan 18, 2024
1 parent a2e7228 commit 3a6d74b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 18 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yaje",
"version": "1.1.0",
"version": "1.1.1",
"author": "legends-killer <[email protected]>",
"description": "yet another json editor",
"keywords": [
Expand Down
46 changes: 29 additions & 17 deletions src/JsonEditor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
* @Author: legends-killer
* @Date: 2023-12-27 18:47:08
* @LastEditors: legends-killer
* @LastEditTime: 2024-01-17 22:55:58
* @LastEditTime: 2024-01-18 20:19:15
* @Description:
*/
import { Editor, EditorProps, useMonaco } from '@monaco-editor/react'
import { forwardRef, useEffect, useImperativeHandle, useState } from 'react'
import { forwardRef, useEffect, useImperativeHandle } from 'react'
import { refItemProvider } from './provider/refItemProvider'
import { ISuggestionItem, JsonSchemaProcessor } from './helper/jsonSchemaProcessor'
import { languages as Languages, IDisposable } from 'monaco-editor'
import { IDisposable, languages as Languages } from 'monaco-editor'
import { IProviderParam } from './provider/types'
import { filterRepeateSuggestions } from './utils'

Expand Down Expand Up @@ -89,6 +89,7 @@ export const JsonEditor = forwardRef((props: IJsonEditor, ref: any) => {

// init monaco
useEffect(() => {
const providers: IDisposable[] = []
if (monaco) {
const jsonSchemaProcessor = new JsonSchemaProcessor(promptJsonSchema || {})
const suggestions = jsonSchemaProcessor.getSuggestions()
Expand All @@ -111,31 +112,42 @@ export const JsonEditor = forwardRef((props: IJsonEditor, ref: any) => {
})

// default provider
monaco.languages.registerCompletionItemProvider(
'json',
refItemProvider({
monaco,
jsonKeySuggestions: finalKeySuggestions,
jsonValueSuggestions: finalValueSuggestions,
onSuggestionItemSelect,
triggerCharacters,
})
)

// users provider
userDefinedItemCompleteProviders.forEach((userProvider) => {
providers.push(
monaco.languages.registerCompletionItemProvider(
'json',
userProvider({
refItemProvider({
monaco,
jsonKeySuggestions: finalKeySuggestions,
jsonValueSuggestions: finalValueSuggestions,
onSuggestionItemSelect,
triggerCharacters,
})
)
)

// users provider
userDefinedItemCompleteProviders.forEach((userProvider) => {
providers.push(
monaco.languages.registerCompletionItemProvider(
'json',
userProvider({
monaco,
jsonKeySuggestions: finalKeySuggestions,
jsonValueSuggestions: finalValueSuggestions,
onSuggestionItemSelect,
triggerCharacters,
})
)
)
})
}
return () => {
if (monaco) {
providers.forEach((item) => {
item.dispose()
})
}
}
}, [
addedKeySuggestions,
addedValueSuggestions,
Expand Down

0 comments on commit 3a6d74b

Please sign in to comment.