Skip to content

Add tab index to cypher editor #1847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 8, 2022
Merged

Add tab index to cypher editor #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0b9fcd
Add tabIndex to cypherEditor props
noahmay Nov 8, 2022
ef388e8
update arc version
noahmay Nov 8, 2022
05e6895
remove argument
noahmay Nov 8, 2022
fa0b602
update after review
noahmay Nov 8, 2022
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
11 changes: 9 additions & 2 deletions src/neo4j-arc/cypher-language-support/cypher-editor/CypherEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ type CypherEditorDefaultProps = {
additionalCommands: Partial<
Record<monaco.KeyCode, monaco.editor.ICommandHandler>
>
tabIndex?: number
useDb: null | string
value: string
}
Expand Down Expand Up @@ -347,7 +348,8 @@ export class CypherEditor extends React.Component<
selectionHighlight: false,
value: this.props.value,
wordWrap: 'on',
wrappingStrategy: 'advanced'
wrappingStrategy: 'advanced',
tabIndex: this.props.tabIndex
})

const { KeyCode, KeyMod } = monaco
Expand Down Expand Up @@ -438,7 +440,8 @@ export class CypherEditor extends React.Component<
}

componentDidUpdate(prevProps: CypherEditorProps): void {
const { useDb, fontLigatures, enableMultiStatementMode } = this.props
const { useDb, fontLigatures, enableMultiStatementMode, tabIndex } =
this.props
if (fontLigatures !== prevProps.fontLigatures) {
this.editor?.updateOptions({ fontLigatures })
}
Expand All @@ -454,6 +457,10 @@ export class CypherEditor extends React.Component<
if (enableMultiStatementMode !== prevProps.enableMultiStatementMode) {
this.onContentUpdate()
}

if (tabIndex !== prevProps.tabIndex) {
this.editor?.updateOptions({ tabIndex: this.props.tabIndex })
}
}

componentWillUnmount = (): void => {
Expand Down
2 changes: 1 addition & 1 deletion src/neo4j-arc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@neo4j-devtools/arc",
"version": "0.0.38",
"version": "0.0.39",
"main": "dist/neo4j-arc.js",
"author": "Neo4j Inc.",
"license": "GPL-3.0",
Expand Down