Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): fix selecting multiple cells to move add katex plugin for md render #351

Merged
merged 2 commits into from
Dec 18, 2024
Merged
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
15 changes: 9 additions & 6 deletions packages/libro-ai-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,21 @@
"typecheck:tsc": "tsc --noEmit"
},
"dependencies": {
"@difizen/libro-jupyter": "^0.3.2",
"@difizen/libro-code-editor": "^0.3.2",
"@ant-design/icons": "^5.4.0",
"@difizen/mana-app": "latest",
"@difizen/mana-l10n": "latest",
"@difizen/magent-libro": "^0.1.27",
"@difizen/libro-code-editor": "^0.3.2",
"@difizen/libro-jupyter": "^0.3.2",
"@difizen/magent-chat": "^0.1.27",
"@difizen/magent-core": "^0.1.27",
"@difizen/magent-libro": "^0.1.27",
"@difizen/mana-app": "latest",
"@difizen/mana-l10n": "latest",
"copy-to-clipboard": "^3.3.3",
"eventsource-parser": "^1.1.2",
"react-syntax-highlighter": "^15.5.0",
"katex": "^0.16.10",
"markdown-it": "^13.0.1",
"react-syntax-highlighter": "^15.5.0",
"rehype-katex": "^7.0.1",
"rehype-raw": "^7.0.0",
"remark-breaks": "^4.0.0",
"remark-gfm": "^4.0.0",
"uuid": "^9.0.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/libro-ai-native/src/ai-native-for-cell-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ import { l10n } from '@difizen/mana-l10n';
import { Button } from 'antd';
import type { ParsedEvent } from 'eventsource-parser/stream';
import { EventSourceParserStream } from 'eventsource-parser/stream';
import rehypeKatex from 'rehype-katex';
import rehypeRaw from 'rehype-raw';
import breaks from 'remark-breaks';
import remarkGfm from 'remark-gfm';
import 'katex/dist/katex.min.css'; // 引入 KaTeX 样式

import { CodeBlockInCell } from './ai-native-code-block.js';
import { LibroAINativeService } from './ai-native-service.js';
Expand Down Expand Up @@ -49,6 +52,7 @@ export function LibroAINativeForCellRender() {
type="message"
components={{ code: CodeBlockInCell }}
remarkPlugins={[remarkGfm, breaks]}
rehypePlugins={[rehypeKatex, rehypeRaw]}
>
{msgItem?.content || ''}
</LLMRender>
Expand Down
1 change: 1 addition & 0 deletions packages/libro-ai-native/src/chat-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
ViewRender,
} from '@difizen/mana-app';
import { useRef } from 'react';
import 'katex/dist/katex.min.css'; // 引入 KaTeX 样式

import { LibroAINativeService } from './ai-native-service.js';
import { LibroAiNativeChatView } from './libro-ai-native-chat-view.js';
Expand Down
3 changes: 3 additions & 0 deletions packages/libro-ai-native/src/libro-ai-native-chat-view.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { CellView, LibroView } from '@difizen/libro-jupyter';
import { ChatView, ChatComponents } from '@difizen/magent-chat';
import { inject, prop, transient, view, ViewOption } from '@difizen/mana-app';
import rehypeKatex from 'rehype-katex';
import rehypeRaw from 'rehype-raw';
import breaks from 'remark-breaks';
import remarkGfm from 'remark-gfm';

Expand Down Expand Up @@ -32,6 +34,7 @@ export class LibroAiNativeChatView extends ChatView {
return {
components: { code: CodeBlockInChat, img: ImageModal },
remarkPlugins: [remarkGfm, breaks],
rehypePlugins: [rehypeRaw, rehypeKatex] as any[],
};
}

Expand Down
2 changes: 1 addition & 1 deletion packages/libro-core/src/libro-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ export class LibroModel implements NotebookModel, DndListModel {
//往上交换cell
if (startIndex === this.activeIndex) {
//active在头
this.activeIndex = targetIndex - source.length;
this.activeIndex = targetIndex;
} else {
//active在尾
this.activeIndex = targetIndex + 1;
Expand Down
27 changes: 15 additions & 12 deletions packages/libro-core/src/libro-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -742,13 +742,15 @@ export class LibroView extends BaseView implements NotebookView {
this.collapseCell(previousCell, false);
}
if (this.model.selections.length !== 0 && this.isSelected(cell)) {
for (const selectedCell of this.model.selections) {
const selectIndex = this.findCellIndex(selectedCell);
if (selectIndex === 0) {
return;
}
this.model.exchangeCells(this.model.selections, selectIndex - 1);
const startIndex = this.findCellIndex(this.model.selections[0]);
const endIndex = this.findCellIndex(
this.model.selections[this.model.selections.length - 1],
);
const index = Math.min(startIndex, endIndex);
if (startIndex === 0) {
return;
}
this.model.exchangeCells(this.model.selections, index - 1);
} else {
const sourceIndex = this.findCellIndex(cell);
if (sourceIndex > -1) {
Expand All @@ -764,13 +766,14 @@ export class LibroView extends BaseView implements NotebookView {
this.collapseCell(nextCell, false);
}
if (this.model.selections.length !== 0 && this.isSelected(cell)) {
for (let i = this.model.selections.length - 1; i > -1; i--) {
const selectIndex = this.findCellIndex(this.model.selections[i]);
if (selectIndex === this.model.cells.length - 1) {
return;
}
this.model.exchangeCells(this.model.selections, selectIndex + 1);
const startIndex = this.findCellIndex(this.model.selections[0]) + 1;
const endIndex =
this.findCellIndex(this.model.selections[this.model.selections.length - 1]) + 1;
const index = Math.max(startIndex, endIndex);
if (index === this.model.cells.length) {
return;
}
this.model.exchangeCells(this.model.selections, index + 1);
} else {
const sourceIndex = this.findCellIndex(cell);
if (sourceIndex > -1) {
Expand Down
Loading