Skip to content

UBERF-8077 Editor left menu fixes #6566

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 3 commits into from
Sep 16, 2024
Merged

UBERF-8077 Editor left menu fixes #6566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf5fa81
fix: add some space for gapcursor
aonnikov Sep 13, 2024
6fa4692
fix: adjust paragraphs styles in editor
aonnikov Sep 13, 2024
682dbd7
fix left menu insert logic
aonnikov Sep 13, 2024
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
7 changes: 5 additions & 2 deletions packages/theme/styles/_text-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
.text-editor-view {
// overflow-y: auto;
color: var(--theme-text-primary-color);
margin: 0.25rem 0;

.suggestion {
padding-left: 0.25rem;
Expand Down Expand Up @@ -63,6 +64,7 @@

p {
margin-block-start: 0.5rem;
margin-block-end: 0.5rem;
}

>*+* {
Expand All @@ -72,6 +74,8 @@

ul,
ol {
margin-top: 0.5rem;
margin-bottom: 0.5rem;
margin-right: .25rem;
margin-left: .75rem;
padding: 0;
Expand All @@ -88,8 +92,7 @@

ul[data-type="todoList"] {
list-style: none;
margin: 0;
padding: 0;
margin-left: 0;

li {
margin: 0;
Expand Down
34 changes: 8 additions & 26 deletions plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,7 @@
editor?.commands.insertTable(options)
},
insertCodeBlock: () => {
editor?.commands.insertContent(
{
type: 'codeBlock',
content: [{ type: 'text', text: ' ' }]
},
{
updateSelection: false
}
)
editor?.commands.setCodeBlock()
},
insertContent: (content) => {
editor?.commands.insertContent(content)
Expand Down Expand Up @@ -341,28 +333,18 @@
targetItem instanceof MouseEvent ? getEventPositionElement(targetItem) : getPopupPositionElement(targetItem)
}

// We need to trigger it asynchronously in order for the editor to finish its focus event
// Otherwise, it hoggs the focus from the popup and keyboard navigation doesn't work
setTimeout(() => {
addTableHandler(editor.commands.insertTable, position)
})
// addTableHandler opens popup so the editor loses focus
// so in the callback we need to refocus again
void addTableHandler((options: { rows?: number, cols?: number, withHeaderRow?: boolean }) => {
editor.chain().insertTable(options).focus(pos).run()
}, position)
break
}
case 'code-block':
// For some reason .setCodeBlock doesnt work in our case
editor.commands.insertContent(
{
type: 'codeBlock',
content: [{ type: 'text', text: ' ' }]
},
{
updateSelection: false
}
)
editor.commands.focus(pos, { scrollIntoView: false })
editor.commands.insertContentAt(pos, { type: 'codeBlock' })
break
case 'todo-list':
editor.commands.toggleTaskList()
editor.chain().insertContentAt(pos, { type: 'paragraph' }).toggleTaskList().run()
break
case 'separator-line':
editor.commands.setHorizontalRule()
Expand Down
7 changes: 4 additions & 3 deletions plugins/text-editor-resources/src/components/extension/leftMenu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ function posAtLeftMenuElement (view: EditorView, leftMenuElement: HTMLElement, o
})

if (position === null) {
return -1
return 0
}

return position.inside >= 0 ? position.inside : position.pos
const pos = position.inside >= 0 ? position.inside : position.pos
const $pos = view.state.doc.resolve(pos)
return $pos.depth === 0 ? $pos.pos : $pos.before($pos.depth)
}

function LeftMenu (options: LeftMenuOptions): Plugin {
Expand Down Expand Up @@ -106,7 +108,6 @@ function LeftMenu (options: LeftMenuOptions): Plugin {
(val) => {
if (leftMenuElement === null) return
const pos = posAtLeftMenuElement(view, leftMenuElement, offsetX)

void options.handleSelect(val, pos, e)
}
)
Expand Down