Skip to content

Commit

Permalink
refactor: remove unreachable code (#7989)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Saul-Mirone
Saul-Mirone authored Aug 15, 2024
1 parent b8c2ef5 commit 8592dbb
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 77 deletions.
2 changes: 1 addition & 1 deletion ...ponents/rich-text/keymap/bracket-pairs.ts → ...affine/shared/src/consts/bracket-pairs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ interface BracketPair {
right: string;
}

export const bracketPairs: BracketPair[] = [
export const BRACKET_PAIRS: BracketPair[] = [
{
name: 'parenthesis',
left: '(',
Expand Down
2 changes: 2 additions & 0 deletions packages/affine/shared/src/consts/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,5 @@ export const CANVAS_EXPORT_IGNORE_TAGS = [
'AFFINE-FORMAT-BAR-WIDGET',
'AFFINE-BLOCK-SELECTION',
];

export * from './bracket-pairs.js';
82 changes: 6 additions & 76 deletions packages/blocks/src/_common/components/rich-text/keymap/container.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import {
insertLinkedNode,
textFormatConfigs,
} from '@blocksuite/affine-components/rich-text';
import { BRACKET_PAIRS } from '@blocksuite/affine-shared/consts';
import { matchFlavours } from '@blocksuite/affine-shared/utils';
import { INLINE_ROOT_ATTR, type InlineRootElement } from '@blocksuite/inline';

import type { RootBlockComponent } from '../../../../root-block/types.js';

import { createDefaultDoc } from '../../../utils/init.js';
import { tryConvertBlock } from '../markdown/block.js';
import {
Expand All @@ -23,15 +22,13 @@ import {
handleRemoveAllIndentForMultiBlocks,
handleUnindent,
} from '../rich-text-operations.js';
import { bracketPairs } from './bracket-pairs.js';

// FIXME: use selection manager to set selection
export const bindContainerHotkey = (block: BlockComponent) => {
const selection = block.host.selection;
const model = block.model;
const editorHost = block.host;
const std = editorHost.std;
const leftBrackets = bracketPairs.map(pair => pair.left);

const _selectBlock = () => {
selection.update(selList => {
Expand Down Expand Up @@ -111,37 +108,9 @@ export const bindContainerHotkey = (block: BlockComponent) => {
block.model.text?.length ?? 0
);
}
const target = ctx.get('defaultState').event.target as Node;
if (!block.host.contains(target)) return;
if (!block.selected?.is('text')) return;

const inlineEditor = _getInlineEditor();
if (!inlineEditor) return;
const inlineRange = inlineEditor.getInlineRange();
if (!inlineRange) return;

block.doc.captureSync();

_preventDefault(ctx);

if (tryConvertBlock(block, inlineEditor)) {
return true;
}

return false;
},
'Mod-Enter': ctx => {
if (!block.selected?.is('text')) return;

const inlineEditor = _getInlineEditor();
if (!inlineEditor) return;
const inlineRange = inlineEditor.getInlineRange();
if (!inlineRange) return;

_preventDefault(ctx);

return true;
},
Space: ctx => handleMarkdown(ctx),
'Shift-Space': ctx => handleMarkdown(ctx),
'Mod-a': ctx => {
Expand Down Expand Up @@ -199,11 +168,6 @@ export const bindContainerHotkey = (block: BlockComponent) => {
'Mod-Backspace': ctx => {
if (!(block.selected?.is('block') || block.selected?.is('text'))) return;

const rootComponent = block.closest<RootBlockComponent>(
'affine-page-root,affine-edgeless-root'
);
if (!rootComponent) return;

{
const [_, context] = std.command
.chain()
Expand Down Expand Up @@ -240,11 +204,6 @@ export const bindContainerHotkey = (block: BlockComponent) => {
'Shift-Tab': ctx => {
if (!(block.selected?.is('block') || block.selected?.is('text'))) return;

const rootComponent = block.closest<RootBlockComponent>(
'affine-page-root,affine-edgeless-root'
);
if (!rootComponent) return;

_preventDefault(ctx);

{
Expand Down Expand Up @@ -278,32 +237,6 @@ export const bindContainerHotkey = (block: BlockComponent) => {
handleMultiBlockOutdent(block.host, models);
return true;
},
Backspace: ctx => {
if (!block.selected?.is('text')) return;
const inlineEditor = _getInlineEditor();
if (!inlineEditor) return;

// Auto delete bracket right
if (matchFlavours(block.model, ['affine:code'])) {
const inlineRange = inlineEditor.getInlineRange();
if (!inlineRange) return;
const left = inlineEditor.yText.toString()[inlineRange.index - 1];
const right = inlineEditor.yText.toString()[inlineRange.index];
if (bracketPairs[leftBrackets.indexOf(left)]?.right === right) {
const index = inlineRange.index - 1;
inlineEditor.deleteText({
index: index,
length: 2,
});
inlineEditor.setInlineRange({
index: index,
length: 0,
});
_preventDefault(ctx);
}
}
return true;
},
});

textFormatConfigs.forEach(config => {
Expand Down Expand Up @@ -379,19 +312,16 @@ export const bindContainerHotkey = (block: BlockComponent) => {
}

// Bracket auto complete
bracketPairs.forEach(pair => {
BRACKET_PAIRS.forEach(pair => {
block.bindHotKey({
[pair.left]: ctx => {
if (block.doc.readonly) return;

const textSelection = block.selection.find('text');
if (!textSelection) return;
const isCodeBlock = matchFlavours(block.model, ['affine:code']);
// When selection is collapsed, only trigger auto complete in code block
if (
textSelection.isCollapsed() &&
!matchFlavours(block.model, ['affine:code'])
)
return;
if (textSelection.isCollapsed() && !isCodeBlock) return;
if (!textSelection.isInSameBlock()) return;

_preventDefault(ctx);
Expand All @@ -403,7 +333,7 @@ export const bindContainerHotkey = (block: BlockComponent) => {
const selectedText = inlineEditor.yText
.toString()
.slice(inlineRange.index, inlineRange.index + inlineRange.length);
if (pair.name === 'square bracket') {
if (!isCodeBlock && pair.name === 'square bracket') {
// [[Selected text]] should automatically be converted to a Linked doc with the title "Selected text".
// See https://github.com/toeverything/blocksuite/issues/2730
const success = tryConvertToLinkedDoc();
Expand All @@ -425,7 +355,7 @@ export const bindContainerHotkey = (block: BlockComponent) => {
});

// Skip redundant right bracket
bracketPairs.forEach(pair => {
BRACKET_PAIRS.forEach(pair => {
block.bindHotKey({
[pair.right]: ctx => {
if (!matchFlavours(block.model, ['affine:code'])) return;
Expand Down
21 changes: 21 additions & 0 deletions packages/blocks/src/code-block/code-block.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from '@blocksuite/affine-components/rich-text';
import '@blocksuite/affine-components/rich-text';
import { toast } from '@blocksuite/affine-components/toast';
import { BRACKET_PAIRS } from '@blocksuite/affine-shared/consts';
import { getInlineRangeProvider } from '@blocksuite/block-std';
import { IS_MAC } from '@blocksuite/global/env';
import { noop } from '@blocksuite/global/utils';
Expand Down Expand Up @@ -189,6 +190,26 @@ export class CodeBlockComponent extends CaptionedBlockComponent<
return true;
}

const inlineEditor = this.inlineEditor;
const inlineRange = inlineEditor?.getInlineRange();
if (!inlineRange || !inlineEditor) return;
const left = inlineEditor.yText.toString()[inlineRange.index - 1];
const right = inlineEditor.yText.toString()[inlineRange.index];
const leftBrackets = BRACKET_PAIRS.map(pair => pair.left);
if (BRACKET_PAIRS[leftBrackets.indexOf(left)]?.right === right) {
const index = inlineRange.index - 1;
inlineEditor.deleteText({
index: index,
length: 2,
});
inlineEditor.setInlineRange({
index: index,
length: 0,
});
state.raw.preventDefault();
return true;
}

return;
},
Tab: ctx => {
Expand Down

1 comment on commit 8592dbb

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Size Report

Bundles

Entry Size Gzip Brotli

Packages

Name Size Gzip Brotli
blocks 2.67 MB (+1.69 kB) 580 kB (+380 B) 413 kB (+34 B)
editor 84 B 89 B 63 B
store 83 B 88 B 63 B
inline 84 B 88 B 63 B

Please sign in to comment.