UBERF-9279: Ctrl/Cmd + K for hyperlinks (#7857)

Signed-off-by: Victor Ilyushchenko <alt13ri@gmail.com>
This commit is contained in:
Victor Ilyushchenko
2025-01-31 22:24:36 +07:00
committed by GitHub
parent e0c6724c73
commit b075ab1ec3
6 changed files with 65 additions and 5 deletions
+2 -2
View File
@@ -399,7 +399,7 @@ export function createModel (builder: Builder): void {
icon: love.icon.Mic,
keyBinding: ['Meta + keyD'],
category: love.category.Office,
allowedForEditableContent: true,
allowedForEditableContent: 'always',
input: 'none',
target: core.class.Doc,
context: {
@@ -415,7 +415,7 @@ export function createModel (builder: Builder): void {
action: love.actionImpl.ToggleVideo,
label: love.string.Camera,
icon: love.icon.Cam,
allowedForEditableContent: true,
allowedForEditableContent: 'always',
keyBinding: ['Meta + keyE'],
category: love.category.Office,
input: 'none',
+1 -1
View File
@@ -866,7 +866,7 @@ export function createModel (builder: Builder): void {
category: view.category.GeneralNavigation,
input: 'none',
target: core.class.Doc,
allowedForEditableContent: true,
allowedForEditableContent: 'noSelection',
context: {
mode: ['workbench', 'browser', 'panel', 'editor', 'input']
}
@@ -0,0 +1,43 @@
//
// Copyright © 2025 Hardcore Engineering Inc.
//
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. You may
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//
// See the License for the specific language governing permissions and
// limitations under the License.
//
import { Extension } from '@tiptap/core'
import { showPopup } from '@hcengineering/ui'
import LinkPopup from '../LinkPopup.svelte'
export const LinkShortcutsExtension = Extension.create<any>({
name: 'defaultShortcuts',
addKeyboardShortcuts () {
return {
'Mod-k': () => {
const { from, to } = this.editor.state.selection
if (from === to) return false
const link = this.editor.getAttributes('link').href
showPopup(LinkPopup, { link }, undefined, undefined, (newLink) => {
if (newLink === '') {
this.editor.chain().focus().extendMarkRange('link').unsetLink().run()
} else {
this.editor.chain().focus().extendMarkRange('link').setLink({ href: newLink }).run()
}
})
return true
}
}
}
})
@@ -46,6 +46,7 @@ import { MermaidExtension, type MermaidOptions, mermaidOptions } from '../compon
import { DrawingBoardExtension, type DrawingBoardOptions } from '../components/extension/drawingBoard'
import { type IndendOptions, IndentExtension, indentExtensionOptions } from '../components/extension/indent'
import TextAlign, { type TextAlignOptions } from '@tiptap/extension-text-align'
import { LinkShortcutsExtension } from '../components/extension/link'
export interface EditorKitOptions extends DefaultKitOptions {
history?: false
@@ -315,6 +316,8 @@ async function buildEditorKit (): Promise<Extension<EditorKitOptions, any>> {
])
}
staticKitExtensions.push([950, LinkShortcutsExtension.configure({})])
if (mode !== 'compact' && this.options.note !== false) {
staticKitExtensions.push([1000, NoteExtension.configure(this.options.note ?? {})])
}
@@ -140,6 +140,9 @@
let elm = evt.target as HTMLElement
let isContentEditable = false
const selection = window.getSelection()
const haveRangeSelection = !(selection?.isCollapsed ?? true)
while (true) {
if (elm.isContentEditable) {
isContentEditable = true
@@ -195,9 +198,20 @@
let postpone = false
let nonSequenceAction: Action | undefined
const checkIsAllowedContentMode = (mode?: 'always' | 'noSelection'): boolean => {
if (!isContentEditable) return true
switch (mode) {
case 'always':
return true
case 'noSelection':
return !haveRangeSelection
}
return false
}
for (const a of currentActions) {
if (a.keyBinding === undefined || a.keyBinding.length < 1) continue
if (isContentEditable && a.allowedForEditableContent !== true) continue
if (!checkIsAllowedContentMode(a.allowedForEditableContent)) continue
const t = lastKey
if (t !== undefined && a.keyBinding.some((it) => matchKeySequence(evt, it, t))) {
evt.preventDefault()
+1 -1
View File
@@ -541,7 +541,7 @@ export interface Action<T extends Doc = Doc, P = Record<string, any>> extends Do
// Available only for workspace owners
secured?: boolean
allowedForEditableContent?: boolean
allowedForEditableContent?: 'always' | 'noSelection'
analyticsEvent?: string
}