chore(editor): remove page block feature flag (#10251)

blocksuite/affine/block-note/src/components/edgeless-note-background.ts

@@ -36,7 +36,6 @@ import { property } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
 import { NoteConfigExtension } from '../config';
-import { isPageBlock } from '../utils';
 import * as styles from './edgeless-note-background.css';
 
 @requiredProperties({
@@ -162,7 +161,7 @@ export class EdgelessNoteBackground extends SignalWatcher(
       @pointerdown=${stopPropagation}
       @click=${this._handleClickAtBackground}
     >
-      ${isPageBlock(this.std, this.note) ? this._renderHeader() : nothing}
+      ${this.note.isPageBlock() ? this._renderHeader() : nothing}
     </div>`;
   }
 

blocksuite/affine/block-note/src/components/edgeless-page-block-title.ts

@@ -12,7 +12,6 @@ import { html } from 'lit';
 import { property } from 'lit/decorators.js';
 
 import { NoteConfigExtension } from '../config';
-import { isPageBlock } from '../utils';
 import * as styles from './edgeless-page-block-title.css';
 
 @requiredProperties({
@@ -22,7 +21,7 @@ export class EdgelessPageBlockTitle extends SignalWatcher(
   WithDisposable(ShadowlessElement)
 ) {
   override render() {
-    if (!isPageBlock(this.std, this.note)) return;
+    if (!this.note.isPageBlock()) return;
 
     const title = this.std
       .getOptional(NoteConfigExtension.identifier)

blocksuite/affine/block-note/src/index.ts

@@ -6,4 +6,3 @@ export * from './note-block';
 export * from './note-edgeless-block';
 export * from './note-service';
 export * from './note-spec';
-export { isPageBlock } from './utils';

blocksuite/affine/block-note/src/note-edgeless-block.ts

@@ -12,10 +12,10 @@ import { ifDefined } from 'lit/directives/if-defined.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
 import { MoreIndicator } from './components/more-indicator';
+import { NoteConfigExtension } from './config';
 import { NoteBlockComponent } from './note-block';
 import { ACTIVE_NOTE_EXTRA_PADDING } from './note-edgeless-block.css';
 import * as styles from './note-edgeless-block.css';
-import { isPageBlock } from './utils';
 
 export const AFFINE_EDGELESS_NOTE = 'affine-edgeless-note';
 
@@ -219,6 +219,9 @@ export class EdgelessNoteBlockComponent extends toGfxBlockComponent(
       ? this._noteFullHeight < height
       : !!collapsedHeight && collapsedHeight < height;
 
+    const hasHeader = !!this.std.getOptional(NoteConfigExtension.identifier)
+      ?.edgelessNoteHeader;
+
     return html`
       <div
         class=${styles.edgelessNoteContainer}
@@ -260,7 +263,7 @@ export class EdgelessNoteBlockComponent extends toGfxBlockComponent(
           .editing=${this._editing}
         ></edgeless-note-mask>
 
-        ${isCollapsable && !isPageBlock(this.std, this.model)
+        ${isCollapsable && (!this.model.isPageBlock() || !hasHeader)
           ? html`<div
               class="${classMap({
                 [styles.collapseButton]: true,

blocksuite/affine/block-note/src/utils.ts

@@ -1,18 +0,0 @@
-import { NoteBlockModel, NoteDisplayMode } from '@blocksuite/affine-model';
-import { FeatureFlagService } from '@blocksuite/affine-shared/services';
-import { matchModels } from '@blocksuite/affine-shared/utils';
-import type { BlockStdScope } from '@blocksuite/block-std';
-
-/**
- * We define a note block as a page block if it is the first visible note
- */
-export function isPageBlock(std: BlockStdScope, note: NoteBlockModel) {
-  return (
-    std.get(FeatureFlagService).getFlag('enable_page_block') &&
-    note.parent?.children.find(
-      child =>
-        matchModels(child, [NoteBlockModel]) &&
-        child.displayMode !== NoteDisplayMode.EdgelessOnly
-    ) === note
-  );
-}

blocksuite/affine/model/src/blocks/note/note-model.ts

@@ -154,4 +154,17 @@ export class NoteBlockModel
     }
     return false;
   }
+
+  /**
+   * We define a note block as a page block if it is the first visible note
+   */
+  isPageBlock() {
+    return (
+      this.parent?.children.find(
+        child =>
+          child instanceof NoteBlockModel &&
+          child.displayMode !== NoteDisplayMode.EdgelessOnly
+      ) === this
+    );
+  }
 }

blocksuite/affine/shared/src/services/feature-flag-service.ts

@@ -18,7 +18,6 @@ export interface BlockSuiteFlags {
   enable_shape_shadow_blur: boolean;
   enable_mobile_keyboard_toolbar: boolean;
   enable_mobile_linked_doc_menu: boolean;
-  enable_page_block: boolean;
 }
 
 export class FeatureFlagService extends StoreExtension {
@@ -41,7 +40,6 @@ export class FeatureFlagService extends StoreExtension {
     enable_shape_shadow_blur: false,
     enable_mobile_keyboard_toolbar: false,
     enable_mobile_linked_doc_menu: false,
-    enable_page_block: false,
   });
 
   setFlag(key: keyof BlockSuiteFlags, value: boolean) {

blocksuite/blocks/src/root-block/edgeless/edgeless-root-block.ts

@@ -18,7 +18,6 @@ import {
   DocModeProvider,
   EditorSettingProvider,
   EditPropsStore,
-  FeatureFlagService,
   FontLoaderService,
   ThemeProvider,
 } from '@blocksuite/affine-shared/services';
@@ -399,11 +398,7 @@ export class EdgelessRootBlockComponent extends BlockComponent<
     const run = () => {
       const storedViewport = std.get(EditPropsStore).getStorage('viewport');
       if (!storedViewport) {
-        const enablePageBlock = this.std
+        if (!pageBlockViewportFitAnimation()) {
-          .get(FeatureFlagService)
-          .getFlag('enable_page_block');
-
-        if (!(enablePageBlock && pageBlockViewportFitAnimation())) {
           this.gfx.fitToScreen();
         }
         return;

blocksuite/blocks/src/root-block/widgets/element-toolbar/change-note-button.ts

@@ -1,6 +1,6 @@
 import {
   changeNoteDisplayMode,
-  isPageBlock,
+  NoteConfigExtension,
 } from '@blocksuite/affine-block-note';
 import { EdgelessCRUDIdentifier } from '@blocksuite/affine-block-surface';
 import type {
@@ -149,10 +149,6 @@ export class EdgelessChangeNoteButton extends WithDisposable(LitElement) {
       .getFlag('enable_advanced_block_visibility');
   }
 
-  private get _pageBlockEnabled() {
-    return this.doc.get(FeatureFlagService).getFlag('enable_page_block');
-  }
-
   private get doc() {
     return this.edgeless.doc;
   }
@@ -348,6 +344,10 @@ export class EdgelessChangeNoteButton extends WithDisposable(LitElement) {
     const onlyOne = len === 1;
     const isDocOnly = displayMode === NoteDisplayMode.DocOnly;
 
+    const hasPageBlockHeader = !!this.edgeless.std.getOptional(
+      NoteConfigExtension.identifier
+    )?.edgelessNoteHeader;
+
     const theme = this.edgeless.std.get(ThemeProvider).theme;
     const buttonIconSize = { width: '20px', height: '20px' };
     const buttons = [
@@ -378,10 +378,7 @@ export class EdgelessChangeNoteButton extends WithDisposable(LitElement) {
           `
         : nothing,
 
-      onlyOne &&
+      onlyOne && !note.isPageBlock() && !this._advancedVisibilityEnabled
-      !isPageBlock(this.edgeless.std, note) &&
-      this._pageBlockEnabled &&
-      !this._advancedVisibilityEnabled
         ? html`<editor-icon-button
             aria-label="Display In Page"
             .showTooltip=${displayMode === NoteDisplayMode.DocAndEdgeless}
@@ -536,7 +533,7 @@ export class EdgelessChangeNoteButton extends WithDisposable(LitElement) {
 
       onlyOne ? this.quickConnectButton : nothing,
 
-      !isPageBlock(this.edgeless.std, this.notes[0])
+      !this.notes[0].isPageBlock() || !hasPageBlockHeader
         ? html`<editor-icon-button
             aria-label="Size"
             data-testid="edgeless-note-auto-height"

packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/widgets/edgeless-note-header.tsx

@@ -3,18 +3,13 @@ import { useSharingUrl } from '@affine/core/components/hooks/affine/use-share-ur
 import { WorkspaceDialogService } from '@affine/core/modules/dialogs';
 import { DocService } from '@affine/core/modules/doc';
 import { EditorService } from '@affine/core/modules/editor';
-import { FeatureFlagService } from '@affine/core/modules/feature-flag';
 import { useInsidePeekView } from '@affine/core/modules/peek-view/view/modal-container';
 import { WorkspaceService } from '@affine/core/modules/workspace';
 import { extractEmojiIcon } from '@affine/core/utils';
 import { useI18n } from '@affine/i18n';
 import { track } from '@affine/track';
 import { GfxControllerIdentifier } from '@blocksuite/affine/block-std/gfx';
-import {
+import { type NoteBlockModel } from '@blocksuite/affine/blocks';
-  matchModels,
-  NoteBlockModel,
-  NoteDisplayMode,
-} from '@blocksuite/affine/blocks';
 import { Bound } from '@blocksuite/affine/global/utils';
 import {
   InformationIcon,
@@ -184,19 +179,9 @@ const LinkButton = ({ note }: { note: NoteBlockModel }) => {
 };
 
 export const EdgelessNoteHeader = ({ note }: { note: NoteBlockModel }) => {
-  const flags = useService(FeatureFlagService).flags;
   const insidePeekView = useInsidePeekView();
 
-  if (!flags.enable_page_block) return null;
+  if (!note.isPageBlock()) return null;
-
-  const isFirstVisibleNote =
-    note.parent?.children.find(
-      child =>
-        matchModels(child, [NoteBlockModel]) &&
-        child.displayMode === NoteDisplayMode.DocAndEdgeless
-    ) === note;
-
-  if (!isFirstVisibleNote) return null;
 
   return (
     <div className={styles.header} data-testid="edgeless-page-block-header">

packages/frontend/core/src/modules/feature-flag/constant.ts

@@ -231,17 +231,6 @@ export const AFFINE_FLAGS = {
     configurable: true,
     defaultState: isCanaryBuild,
   },
-  // TODO(@L-Sun): remove this flag when ready
-  enable_page_block: {
-    category: 'blocksuite',
-    bsFlag: 'enable_page_block',
-    displayName:
-      'com.affine.settings.workspace.experimental-features.enable-page-block-header.name',
-    description:
-      'com.affine.settings.workspace.experimental-features.enable-page-block-header.description',
-    configurable: isCanaryBuild,
-    defaultState: isCanaryBuild,
-  },
   enable_editor_rtl: {
     category: 'affine',
     displayName:

packages/frontend/i18n/src/i18n.gen.ts

@@ -5437,14 +5437,6 @@ export function useAFFiNEI18N(): {
       * `Once enabled, you can preview PDF in embed view.`
       */
     ["com.affine.settings.workspace.experimental-features.enable-pdf-embed-preview.description"](): string;
-    /**
-      * `Page Block Header`
-      */
-    ["com.affine.settings.workspace.experimental-features.enable-page-block-header.name"](): string;
-    /**
-      * `Once enabled, the header of page block will be displayed.`
-      */
-    ["com.affine.settings.workspace.experimental-features.enable-page-block-header.description"](): string;
     /**
       * `Editor RTL`
       */

packages/frontend/i18n/src/resources/en.json

@@ -1357,8 +1357,6 @@
   "com.affine.settings.workspace.experimental-features.enable-mobile-edgeless-editing.description": "Once enabled, users can edit edgeless canvas.",
   "com.affine.settings.workspace.experimental-features.enable-pdf-embed-preview.name": "PDF embed preview",
   "com.affine.settings.workspace.experimental-features.enable-pdf-embed-preview.description": "Once enabled, you can preview PDF in embed view.",
-  "com.affine.settings.workspace.experimental-features.enable-page-block-header.name": "Page Block Header",
-  "com.affine.settings.workspace.experimental-features.enable-page-block-header.description": "Once enabled, the header of page block will be displayed.",
   "com.affine.settings.workspace.experimental-features.enable-editor-rtl.name": "Editor RTL",
   "com.affine.settings.workspace.experimental-features.enable-editor-rtl.description": "Once enabled, the editor will be displayed in RTL mode.",
   "com.affine.settings.workspace.not-owner": "Only an owner can edit the workspace avatar and name. Changes will be shown for everyone.",