Merge pull request from toeverything/fix/page-plugin

fix page title tranform
This commit is contained in:
Whitewater 2022-08-09 18:02:31 +08:00 committed by GitHub
commit 73d7d4e1a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
libs/components
editor-blocks/src/blocks/page
editor-plugins/src/menu
command-menu
inline-menu

View File

@ -86,7 +86,7 @@ export const PageView: FC<CreateView> = ({ block, editor }) => {
alwaysShowPlaceholder
ref={textRef}
className={'title'}
supportMarkdown={true}
supportMarkdown={false}
handleEnter={onTextEnter}
placeholder={'Untitled'}
block={block}

View File

@ -82,6 +82,11 @@ export const CommandMenu = ({ editor, hooks, style }: CommandMenuProps) => {
const checkIfShowCommandMenu = useCallback(
async (event: React.KeyboardEvent<HTMLDivElement>) => {
const { type, anchorNode } = editor.selection.currentSelectInfo;
// console.log(await editor.getBlockById(anchorNode.id));
const activeBlock = await editor.getBlockById(anchorNode.id);
if (activeBlock.type === Protocol.Block.Type.page) {
return;
}
if (event.key === '/' && type === 'Range') {
if (anchorNode) {
const text = editor.blockHelper.getBlockTextBeforeSelection(

View File

@ -1,4 +1,5 @@
import { useState, useEffect } from 'react';
import { Protocol } from '@toeverything/datasource/db-service';
import {
MuiClickAwayListener as ClickAwayListener,
MuiGrow as Grow,
@ -22,8 +23,14 @@ export const InlineMenuContainer = ({ editor }: InlineMenuContainerProps) => {
useEffect(() => {
// const unsubscribe = editor.selection.onSelectionChange(info => {
const unsubscribe = editor.selection.onSelectEnd(info => {
const unsubscribe = editor.selection.onSelectEnd(async info => {
const { type, browserSelection, anchorNode } = info;
if (anchorNode) {
const activeBlock = await editor.getBlockById(anchorNode.id);
if (activeBlock.type === Protocol.Block.Type.page) {
return;
}
}
if (
type === 'None' ||
!anchorNode ||