Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { inject } from 'vue';
import { EditorMdInjectionKey, IEditorMdInjection } from '../editor-md-types';

export function useToolbar() {
const { toolbars, toolbarConfig, customToolbars } = inject(EditorMdInjectionKey) as IEditorMdInjection;

return { toolbars, toolbarConfig, customToolbars };
export function useToolbar(): IEditorMdInjection {
return inject(EditorMdInjectionKey) as IEditorMdInjection;
}
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,24 @@ export function useEditorMd(props: EditorMdProps, ctx: SetupContext) {
setTimeout(() => {
ctx.emit('contentChange', editorIns.getValue());
}, 100);

containerRef.value.addEventListener('keydown', (e: KeyboardEvent) => {
let keyCombination = '';
if (e.ctrlKey) {
keyCombination += 'Ctrl-';
}
if (e.altKey) {
keyCombination += 'Alt-';
}
if (e.shiftKey) {
keyCombination += 'Shift-';
}
keyCombination += e.key.toUpperCase();
if (shortKeys[keyCombination] && typeof shortKeys[keyCombination] === 'function') {
e.preventDefault();
shortKeys[keyCombination]();
}
});
};

const onPaste = (e: ClipboardEvent) => {
Expand Down
7 changes: 4 additions & 3 deletions packages/devui-vue/devui/editor-md/src/editor-md-types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { PropType, ExtractPropTypes, InjectionKey, Ref } from 'vue';
import { DEFAULT_TOOLBAR_CONFIG, IToolbarItemConfig } from './toolbar-config';
import { RenderRule } from 'markdown-it/lib/renderer';

export interface MDThemeToolbarConfig {
icons: { [key: string]: string };
Expand All @@ -11,7 +12,7 @@ export interface MDThemeConfig {

export interface MdPlugin {
plugin: any;
opts?: Object;
opts?: Record<string, unknown>;
}

export interface ICustomXssRule {
Expand All @@ -21,7 +22,7 @@ export interface ICustomXssRule {

export interface ICustomRenderRule {
key: string;
value: Function;
value: RenderRule;
}

export type Mode = 'editonly' | 'readonly' | 'normal';
Expand Down Expand Up @@ -112,7 +113,7 @@ export const editorMdProps = {
},
toolbarConfig: {
type: Array as PropType<ToolbarConfigProp>,
default: () => DEFAULT_TOOLBAR_CONFIG,
default: (): (string[] | string)[] => DEFAULT_TOOLBAR_CONFIG,
},
fullscreenZIndex: {
type: Number,
Expand Down
6 changes: 4 additions & 2 deletions packages/devui-vue/devui/editor-md/src/editor-md.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ export default defineComponent({
onPreviewMouseover,
} = useEditorMd(props, ctx);

const { isDarkMode } = useEditorMdTheme(() => {});
const { isDarkMode } = useEditorMdTheme(() => {
return;
});

provide(EditorMdInjectionKey, {
showFullscreen,
Expand Down Expand Up @@ -97,7 +99,7 @@ export default defineComponent({
origin={cursorRef.value || undefined}
align="start"
position={['bottom-start']}
onClick={withModifiers(() => {}, ['stop'])}>
onClick={withModifiers(() => {return ;}, ['stop'])}>
{ctx.slots?.hintTemplate?.()}
</FlexibleOverlay>
{Boolean(maxlength?.value) && (
Expand Down