feat(board): handle apply error

worktile · Jun 20, 2024 · be5c386 · be5c386
1 parent 4cc414c
commit be5c386
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 20 deletions.
diff --git a/.changeset/cuddly-insects-grab.md b/.changeset/cuddly-insects-grab.md
@@ -0,0 +1,9 @@
+---
+'@plait/angular-board': patch
+---
+
+handle apply error
+
+add getBoardComponentInjector to export injector
+
+resolve type error for common/utils/text.ts
diff --git a/packages/angular-board/src/board/board.component.interface.ts b/packages/angular-board/src/board/board.component.interface.ts
@@ -1,10 +1,11 @@
-import { ChangeDetectorRef, EventEmitter, ViewContainerRef } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, Injector, ViewContainerRef } from '@angular/core';
 import { OnChangeData } from '../plugins/angular-board';
 
 export interface BoardComponentInterface {
     markForCheck: () => void;
     cdr: ChangeDetectorRef;
     nativeElement: HTMLElement;
     viewContainerRef: ViewContainerRef;
+    injector: Injector;
     onChange: EventEmitter<OnChangeData>;
 }
diff --git a/packages/angular-board/src/board/board.component.ts b/packages/angular-board/src/board/board.component.ts
@@ -8,6 +8,7 @@ import {
     ElementRef,
     EventEmitter,
     HostBinding,
+    Injector,
     Input,
     NgZone,
     OnChanges,
@@ -180,6 +181,7 @@ export class PlaitBoardComponent implements BoardComponentInterface, OnInit, OnC
 
     constructor(
         public cdr: ChangeDetectorRef,
+        public injector: Injector,
         public viewContainerRef: ViewContainerRef,
         private elementRef: ElementRef<HTMLElement>,
         private ngZone: NgZone

diff --git a/packages/angular-board/src/plugins/angular-board.ts b/packages/angular-board/src/plugins/angular-board.ts
@@ -1,6 +1,8 @@
-import { PlaitElement, PlaitOperation, PlaitTheme, Viewport, Selection, ComponentType } from '@plait/core';
+import { PlaitElement, PlaitOperation, PlaitTheme, Viewport, Selection, ComponentType, PlaitBoard } from '@plait/core';
 import { RenderComponentRef } from '@plait/common';
 import { ComponentRef } from '@angular/core';
+import { BOARD_TO_COMPONENT } from '../utils/weak-maps';
+import { BoardComponentInterface } from '../board/board.component.interface';
 
 export interface AngularBoard {
     renderComponent: <T, K extends { nativeElement: () => HTMLElement }>(
@@ -10,6 +12,13 @@ export interface AngularBoard {
     ) => { ref: RenderComponentRef<T>; componentRef: ComponentRef<K> };
 }
 
+export const AngularBoard = {
+    getBoardComponentInjector(board: PlaitBoard) {
+        const boardComponent = BOARD_TO_COMPONENT.get(board) as BoardComponentInterface;
+        return boardComponent.injector;
+    }
+}
+
 export interface OnChangeData {
     children: PlaitElement[];
     operations: PlaitOperation[];

diff --git a/packages/common/src/utils/text.ts b/packages/common/src/utils/text.ts
@@ -3,6 +3,14 @@ import { Editor, Node, Element } from 'slate';
 import { TextManage } from '../text/text-manage';
 import { Alignment, CustomText, ParagraphElement } from '../text/types';
 
+export interface TextInterface {
+    getTextEditors: (board: PlaitBoard, elements?: PlaitElement[]) => Editor[] | undefined;
+    findFirstTextEditor: (board: PlaitBoard) => null;
+    getFirstTextEditor: (element: PlaitElement) => Editor;
+    getTextEditorsByElement: (element: PlaitElement) => Editor[];
+    getEditingTextEditor: (board: PlaitBoard, elements?: PlaitElement[]) => Editor | undefined
+}
+
 export const getTextManages = (element: PlaitElement) => {
     return ELEMENT_TO_TEXT_MANAGES.get(element) || [];
 };
@@ -15,21 +23,21 @@ export const getFirstTextManage = (element: PlaitElement) => {
     return textManage;
 };
 
-export const getTextEditorsByElement = (element: PlaitElement) => {
+export const getTextEditorsByElement: TextInterface['getTextEditorsByElement'] = (element: PlaitElement) => {
     return getTextManages(element).map(manage => {
         return manage.editor;
     });
 };
 
-export const getFirstTextEditor = (element: PlaitElement) => {
+export const getFirstTextEditor: TextInterface['getFirstTextEditor'] = (element: PlaitElement) => {
     const textEditor = getTextEditorsByElement(element)[0];
     if (!textEditor) {
         console.warn('can not find textManage');
     }
     return textEditor;
 };
 
-export const findFirstTextEditor = (board: PlaitBoard) => {
+export const findFirstTextEditor: TextInterface['findFirstTextEditor'] = (board: PlaitBoard) => {
     const selectedElements = getSelectedElements(board);
     let firstEditor: Editor | null = null;
     selectedElements.forEach(element => {
@@ -63,7 +71,7 @@ export const getElementsText = (elements: PlaitElement[]) => {
         .join(' ');
 };
 
-export const getTextEditors = (board: PlaitBoard, elements?: PlaitElement[]) => {
+export const getTextEditors: TextInterface['getTextEditors'] = (board: PlaitBoard, elements?: PlaitElement[]) => {
     const selectedElements = elements || getSelectedElements(board);
     if (selectedElements.length) {
         const textManages: TextManage[] = [];
@@ -81,7 +89,7 @@ export const getTextEditors = (board: PlaitBoard, elements?: PlaitElement[]) =>
     return undefined;
 };
 
-export const getEditingTextEditor = (board: PlaitBoard, elements?: PlaitElement[]) => {
+export const getEditingTextEditor: TextInterface['getEditingTextEditor'] = (board: PlaitBoard, elements?: PlaitElement[]) => {
     const selectedElements = elements || getSelectedElements(board);
     const textManages: TextManage[] = [];
     selectedElements.forEach(item => {

diff --git a/packages/mind/src/emoji/emoji-base.component.ts b/packages/mind/src/emoji/emoji-base.component.ts
@@ -13,18 +13,6 @@ export abstract class MindEmojiBaseComponent {
 
     abstract nativeElement(): HTMLElement;
 
-    // TODO
-    // @HostListener('pointerdown')
-    // handlePointerDown() {
-    //     const currentOptions = (this.board as PlaitOptionsBoard).getPluginOptions(PlaitPluginKey.withSelection);
-    //     (this.board as PlaitOptionsBoard).setPluginOptions<WithPluginOptions>(PlaitPluginKey.withSelection, {
-    //         isDisabledSelect: true
-    //     });
-    //     setTimeout(() => {
-    //         (this.board as PlaitOptionsBoard).setPluginOptions<WithPluginOptions>(PlaitPluginKey.withSelection, { ...currentOptions });
-    //     }, 0);
-    // }
-
     initialize(): void {
         this.nativeElement().style.fontSize = `${this.fontSize}px`;
         this.nativeElement().classList.add('mind-node-emoji');

diff --git a/packages/text-plugins/src/utils/index.ts b/packages/text-plugins/src/utils/index.ts
@@ -1,2 +1,3 @@
 export * from './clipboard';
 export * from './common';
+export * from './marks';
diff --git a/packages/text-plugins/src/utils/marks.ts b/packages/text-plugins/src/utils/marks.ts
@@ -1,6 +1,7 @@
 import { CustomText, getTextEditorsByElement, getTextManages } from '@plait/common';
 import { PlaitElement } from '@plait/core';
 import { PlaitMarkEditor } from '../mark/mark.editor';
+import { Element } from 'slate';
 
 export const getTextMarksByElement = (element: PlaitElement) => {
     const editors = getTextEditorsByElement(element);
@@ -10,7 +11,7 @@ export const getTextMarksByElement = (element: PlaitElement) => {
     }
     if (editor.children.length === 0) {
         const textManage = getTextManages(element)[0];
-        const currentMarks: Omit<CustomText, 'text'> = PlaitMarkEditor.getMarksByElement(textManage.componentRef.instance.children[0]);
+        const currentMarks: Omit<CustomText, 'text'> = PlaitMarkEditor.getMarksByElement(editor.children[0] as Element);
         return currentMarks;
     }
     const currentMarks: Omit<CustomText, 'text'> = PlaitMarkEditor.getMarks(editor);