mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-07-21 20:16:26 +08:00
fix(editor): keyboard shortcuts in table cells (#15067)
## Description Fixes keyboard shortcuts for text formatting (Ctrl+B, Ctrl+I, Ctrl+U, etc.) not working inside table cells. ## Changes - **Modified `table-cell.ts`**: Updated the `_handleKeyDown` method to only prevent default behavior for Tab key and allow other keyboard events to propagate, enabling text formatting shortcuts to work properly - **Created `table-keymap.ts`**: New module that registers the `textKeymap` for table blocks, ensuring text formatting shortcuts are available in table cells - **Updated `view.ts`**: Registered the `TableKeymapExtension` in the table view extension setup - **Cleaned up `format.ts`**: Removed unnecessary `TextSelection` check that was preventing shortcuts from working in table contexts ## Closes Closes #13916 #12127 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved Tab key handling within table cells for more consistent keyboard navigation. * Simplified read-only detection for keyboard shortcuts to avoid unexpected behavior. * **Refactor** * Reworked table keyboard mapping and registration to streamline shortcut handling and event flow. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
@@ -649,12 +649,9 @@ export class TableCell extends SignalWatcher(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private readonly _handleKeyDown = (e: KeyboardEvent) => {
|
private readonly _handleKeyDown = (e: KeyboardEvent) => {
|
||||||
if (e.key !== 'Escape') {
|
if (e.key !== 'Escape' && e.key === 'Tab') {
|
||||||
if (e.key === 'Tab') {
|
e.preventDefault();
|
||||||
e.preventDefault();
|
return;
|
||||||
return;
|
|
||||||
}
|
|
||||||
e.stopPropagation();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
import { textKeymap } from '@blocksuite/affine-inline-preset';
|
||||||
|
import { TableBlockSchema } from '@blocksuite/affine-model';
|
||||||
|
import { KeymapExtension } from '@blocksuite/std';
|
||||||
|
|
||||||
|
export const TableKeymapExtension = KeymapExtension(textKeymap, {
|
||||||
|
flavour: TableBlockSchema.model.flavour,
|
||||||
|
});
|
||||||
@@ -9,6 +9,7 @@ import { literal } from 'lit/static-html.js';
|
|||||||
|
|
||||||
import { tableSlashMenuConfig } from './configs/slash-menu';
|
import { tableSlashMenuConfig } from './configs/slash-menu';
|
||||||
import { effects } from './effects';
|
import { effects } from './effects';
|
||||||
|
import { TableKeymapExtension } from './table-keymap.js';
|
||||||
|
|
||||||
export class TableViewExtension extends ViewExtensionProvider {
|
export class TableViewExtension extends ViewExtensionProvider {
|
||||||
override name = 'affine-table-block';
|
override name = 'affine-table-block';
|
||||||
@@ -22,6 +23,7 @@ export class TableViewExtension extends ViewExtensionProvider {
|
|||||||
super.setup(context);
|
super.setup(context);
|
||||||
context.register([
|
context.register([
|
||||||
FlavourExtension(TableModelFlavour),
|
FlavourExtension(TableModelFlavour),
|
||||||
|
TableKeymapExtension,
|
||||||
BlockViewExtension(TableModelFlavour, literal`affine-table`),
|
BlockViewExtension(TableModelFlavour, literal`affine-table`),
|
||||||
SlashMenuConfigExtension(TableModelFlavour, tableSlashMenuConfig),
|
SlashMenuConfigExtension(TableModelFlavour, tableSlashMenuConfig),
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
import {
|
import { type BlockStdScope, type UIEventHandler } from '@blocksuite/std';
|
||||||
type BlockStdScope,
|
|
||||||
TextSelection,
|
|
||||||
type UIEventHandler,
|
|
||||||
} from '@blocksuite/std';
|
|
||||||
|
|
||||||
import { textFormatConfigs } from '../command/index.js';
|
import { textFormatConfigs } from '../command/index.js';
|
||||||
|
|
||||||
@@ -14,12 +10,9 @@ export const textFormatKeymap = (std: BlockStdScope) =>
|
|||||||
return {
|
return {
|
||||||
...acc,
|
...acc,
|
||||||
[config.hotkey as string]: ctx => {
|
[config.hotkey as string]: ctx => {
|
||||||
const { store: doc, selection } = std;
|
const { store: doc } = std;
|
||||||
if (doc.readonly) return;
|
if (doc.readonly) return;
|
||||||
|
|
||||||
const textSelection = selection.find(TextSelection);
|
|
||||||
if (!textSelection) return;
|
|
||||||
|
|
||||||
const allowed = config.textChecker?.(std.host) ?? true;
|
const allowed = config.textChecker?.(std.host) ?? true;
|
||||||
if (!allowed) return;
|
if (!allowed) return;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user