fix(editor): should udpate icon status when formatting the entire block text

Author: fundon

blocksuite/affine/widget-toolbar/src/toolbar.ts

@@ -109,10 +109,14 @@ export class AffineToolbarWidget extends WidgetComponent {
         );
 
         batch(() => {
+          flags.toggle(Flag.Text, activated);
+
+          if (!activated) return;
+
           const range = std.range.value ?? null;
           range$.value = activated ? range : null;
 
-          flags.toggle(Flag.Text, activated);
+          flags.refresh(Flag.Text);
         });
       })
     );
@@ -240,6 +244,15 @@ export class AffineToolbarWidget extends WidgetComponent {
           flags.reset();
           return;
         }
+
+        if (
+          flags.check(Flag.Block) &&
+          record.type === 'update' &&
+          record.props.key === 'text'
+        ) {
+          flags.refresh(Flag.Block);
+          return;
+        }
       })
     );
 

blocksuite/affine/widget-toolbar/src/utils.ts

@@ -47,15 +47,19 @@ export function autoUpdatePosition(
   const update = async () => {
     await Promise.race([
       new Promise(resolve => {
-        if (signal.aborted) {
-          resolve(signal.reason);
-          return;
-        }
-        signal.addEventListener('abort', () => resolve(signal.reason));
+        const listener = () => resolve(signal.reason);
+        signal.addEventListener('abort', listener, { once: true });
+
+        if (signal.aborted) return;
+
+        signal.removeEventListener('abort', listener);
+        resolve(null);
       }),
       toolbar.updateComplete.then(nextTick),
     ]);
 
+    if (signal.aborted) return;
+
     const { x, y } = await computePosition(referenceElement, toolbar, {
       placement,
       middleware: [offset(10), inline(), shift({ padding: 6 }), flip()],
@@ -75,7 +79,8 @@ export function autoUpdatePosition(
 
   return () => {
     cleanup();
-    !signal.aborted && abortController.abort();
+    if (signal.aborted) return;
+    abortController.abort();
   };
 }
 

blocksuite/tests-legacy/e2e/format-bar.spec.ts

@@ -27,7 +27,6 @@ import {
   selectAllBlocksByKeyboard,
   selectAllByKeyboard,
   setInlineRangeInInlineEditor,
-  setSelection,
   switchReadonly,
   type,
   undoByKeyboard,
@@ -332,9 +331,6 @@ test('should format quick bar be able to link text', async ({
     `${testInfo.title}_init.json`
   );
 
-  // FIXME: remove this
-  await focusRichText(page);
-  await setSelection(page, 3, 0, 3, 3);
   // The link button should be active after click
   await expect(linkBtn).toHaveAttribute('active', '');
   await linkBtn.click();