@blocklet/editor 1.6.241 → 1.6.243

package/lib/ext/AIPlugin/index.d.ts

@@ -1,7 +1,6 @@
 import { LexicalCommand } from 'lexical';
 import { Mode } from '../Aide/types';
 export declare const ACTIVATE_AI_COMMAND: LexicalCommand<Mode>;
-export declare const AI_AVAILABLE_STATE_COMMAND: LexicalCommand<boolean>;
 export declare const AI_TEMPLATES_AVAILABLE_COMMAND: LexicalCommand<boolean>;
 export declare function AideFloatingToolbarButton({ onClick }: {
     onClick?: () => void;

package/lib/ext/AIPlugin/index.js

@@ -12,22 +12,14 @@ import { Aide, AideProvider, useAideContext } from '../Aide';
 import TextGeneration from './TextGeneration';
 import { replace, insertBelow, copy } from './utils';
 import AIKitIcon from './AIIcon';
+import { useAIAvailable } from '../Aide/hooks';
 export const ACTIVATE_AI_COMMAND = createCommand('ACTIVATE_AI_COMMAND');
-// AI 可用性状态变化时通过该命令与 editor 其它插件通讯
-export const AI_AVAILABLE_STATE_COMMAND = createCommand('AI_AVAILABLE_STATE_COMMAND');
 // AI external templates 可用时通过该命令与 editor 其它插件通讯
 export const AI_TEMPLATES_AVAILABLE_COMMAND = createCommand('AI_TEMPLATES_AVAILABLE_COMMAND');
-const globalStates = { available: false, templatesAvailable: false };
+const globalStates = { templatesAvailable: false };
 export function AideFloatingToolbarButton({ onClick }) {
     const [editor] = useLexicalComposerContext();
-    const [available, setAvailable] = useState(globalStates.available);
-    useEffect(() => {
-        return editor.registerCommand(AI_AVAILABLE_STATE_COMMAND, (payload) => {
-            setAvailable(payload);
-            globalStates.available = payload;
-            return false;
-        }, COMMAND_PRIORITY_NORMAL);
-    }, [editor]);
+    const { available } = useAIAvailable();
     return (_jsx("button", { disabled: !available, onClick: () => {
             editor.dispatchCommand(ACTIVATE_AI_COMMAND, 'normal');
             onClick?.();
@@ -35,14 +27,10 @@ export function AideFloatingToolbarButton({ onClick }) {
 }
 export function AideToolbarButton() {
     const [editor] = useLexicalComposerContext();
-    const [available, setAvailable] = useState(globalStates.available);
+    const { available } = useAIAvailable();
     const [templatesAvailable, setTemplatesAvailable] = useState(globalStates.templatesAvailable);
     useEffect(() => {
-        return mergeRegister(editor.registerCommand(AI_AVAILABLE_STATE_COMMAND, (payload) => {
-            setAvailable(payload);
-            globalStates.available = payload;
-            return false;
-        }, COMMAND_PRIORITY_NORMAL), editor.registerCommand(AI_TEMPLATES_AVAILABLE_COMMAND, (payload) => {
+        return mergeRegister(editor.registerCommand(AI_TEMPLATES_AVAILABLE_COMMAND, (payload) => {
             setTemplatesAvailable(payload);
             globalStates.templatesAvailable = payload;
             return false;
@@ -138,9 +126,6 @@ function AidePlugin() {
     const [editor] = useLexicalComposerContext();
     const { available, status, externalTemplates, activateAI } = useAideContext();
     const selectionRef = useRef(null);
-    useEffect(() => {
-        editor.dispatchCommand(AI_AVAILABLE_STATE_COMMAND, available);
-    }, [available]);
     useEffect(() => {
         editor.dispatchCommand(AI_TEMPLATES_AVAILABLE_COMMAND, externalTemplates.templates.length > 0);
     }, [externalTemplates]);
@@ -189,7 +174,7 @@ export default function AidePluginWrapper() {
         const _copy = (output) => {
             copy(output);
         };
-        return (_jsx(AideProvider, { checkAvailable: AI.checkAvailable, completions: AI.completions, replaceSelection: _replaceSelection, copy: _copy, insertBelow: _insertBelow, children: _jsx(AidePlugin, {}) }));
+        return (_jsx(AideProvider, { completions: AI.completions, replaceSelection: _replaceSelection, copy: _copy, insertBelow: _insertBelow, children: _jsx(AidePlugin, {}) }));
     }
     return null;
 }

package/lib/ext/Aide/context.d.ts

@@ -4,13 +4,11 @@ import { Template } from './types';
 interface AideProviderProps {
     children: ReactNode;
     completions: Completions;
-    checkAvailable: () => Promise<boolean> | boolean;
     replaceSelection?: (selection: any, output: string) => void;
     insertBelow?: (selection: any, output: string) => void;
     copy?: (output: string) => void;
 }
 interface AideContextState {
-    available: boolean;
     status: Status;
     mode: Mode;
     templates: Template[];
@@ -27,6 +25,7 @@ interface AideContextState {
     output: string;
 }
 interface AideContextType extends AideContextState, Pick<AideProviderProps, 'replaceSelection' | 'insertBelow' | 'completions' | 'copy'> {
+    available: boolean;
     filteredTemplates: Template[];
     activeBuiltinTemplate?: Template;
     activateAI: ({ mode, selectionText, selection, }: {
@@ -44,5 +43,5 @@ interface AideContextType extends AideContextState, Pick<AideProviderProps, 'rep
 }
 export declare const AideContext: import("react").Context<AideContextType>;
 export declare const useAideContext: () => AideContextType;
-export declare function AideProvider({ checkAvailable, completions, replaceSelection, insertBelow, copy, children, }: AideProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function AideProvider({ completions, replaceSelection, insertBelow, copy, children }: AideProviderProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/ext/Aide/context.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useCallback, useContext, useMemo, useRef } from 'react';
-import { useGetState, useRequest } from 'ahooks';
+import { useGetState } from 'ahooks';
 import builtinTemplates from './builtin-templates';
 import { Template } from './types';
+import { useAIAvailable } from './hooks';
 export const AideContext = createContext({});
 export const useAideContext = () => useContext(AideContext);
-export function AideProvider({ checkAvailable, completions, replaceSelection, insertBelow, copy, children, }) {
+export function AideProvider({ completions, replaceSelection, insertBelow, copy, children }) {
     const [state, setState, getState] = useGetState({
-        available: false,
         templates: builtinTemplates,
         externalTemplates: { templates: [], hasMore: true, tags: [], tag: undefined, loading: false },
         mode: 'normal',
@@ -41,10 +41,7 @@ export function AideProvider({ checkAvailable, completions, replaceSelection, in
     };
     // @deprecated
     const loadMoreTemplates = async () => { };
-    useRequest(async () => {
-        const available = await checkAvailable();
-        setState((prev) => ({ ...prev, available }));
-    }, { cacheKey: 'editor-aide-available' });
+    const { available } = useAIAvailable();
     const activateAI = useCallback(
     // eslint-disable-next-line require-await
     async ({ mode = 'normal', selectionText, selection }) => {
@@ -98,6 +95,7 @@ export function AideProvider({ checkAvailable, completions, replaceSelection, in
     const stop = () => setState((prev) => ({ ...prev, status: 'activated' }));
     const value = useMemo(() => ({
         ...state,
+        available,
         filteredTemplates,
         activeBuiltinTemplate,
         activateAI,

package/lib/ext/Aide/hooks.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 检查 ai 是否可用
+ * 注意: 该 hook 可适用于无法使用 useAideContext 的场景, 比如 editor toolbar button 中
+ */
+export declare function useAIAvailable(): {
+    available: boolean;
+};

package/lib/ext/Aide/hooks.js

@@ -0,0 +1,14 @@
+import { useRequest } from 'ahooks';
+import { useEditorConfig } from '../../config';
+/**
+ * 检查 ai 是否可用
+ * 注意: 该 hook 可适用于无法使用 useAideContext 的场景, 比如 editor toolbar button 中
+ */
+export function useAIAvailable() {
+    const { AI } = useEditorConfig();
+    const { data } = useRequest(async () => {
+        const available = await AI?.checkAvailable();
+        return available;
+    }, { cacheKey: 'editor-aide-available', staleTime: -1 });
+    return { available: !!data };
+}

package/lib/main/themes/customTheme.js

@@ -146,7 +146,7 @@ const createCustomTheme = (theme) => {
       padding-left: 0.25em;
     `, theme.typography.body1, { lineHeight: 1.5 });
     const listItemChecked = css `
-    margin-left: 0;
+    margin-left: 0 !important;
     margin-right: 8px;
     padding-left: 24px;
     padding-right: 24px;
@@ -163,7 +163,7 @@ const createCustomTheme = (theme) => {
     }
   `;
     const listItemUnchecked = css `
-    margin-left: 0;
+    margin-left: 0 !important;
     margin-right: 8px;
     padding-left: 24px;
     padding-right: 24px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/editor",
-  "version": "1.6.241",
+  "version": "1.6.243",
   "main": "lib/index.js",
   "scripts": {
     "dev": "npm run storybook",
@@ -40,7 +40,7 @@
     "@arcblock/ux": "^2.9.77",
     "@blocklet/embed": "^0.1.11",
     "@blocklet/pages-kit": "^0.2.302",
-    "@blocklet/pdf": "1.6.241",
+    "@blocklet/pdf": "1.6.243",
     "@excalidraw/excalidraw": "^0.14.2",
     "@iconify/iconify": "^3.0.1",
     "@iconify/icons-tabler": "^1.2.95",
@@ -110,5 +110,5 @@
     "react": "*",
     "react-dom": "*"
   },
-  "gitHead": "12f3e4ffaaa3856d2c71875efcb0268fad0d8a59"
+  "gitHead": "8b98e3ebd3806ae3808162de2a50541e9b8cbc98"
 }