refactor(edgeless): remove redundant and unused blocks exports (#5754)

toeverything · Dec 18, 2023 · 993a889 · 993a889 · vercel · Dec 18, 2023
1 parent 9944b0e
commit 993a889
Show file tree

Hide file tree

Showing 43 changed files with 114 additions and 192 deletions.
diff --git a/packages/blocks/src/_common/test-utils/test-utils.ts b/packages/blocks/src/_common/test-utils/test-utils.ts
@@ -23,10 +23,6 @@ export class TestUtils {
 
 import type { BlockSnapshot } from '@blocksuite/store';
 
-export function logJson(ast: unknown) {
-  console.log(JSON.stringify(ast, null, 2));
-}
-
 export function nanoidReplacement(snapshot: BlockSnapshot) {
   return JSON.parse(nanoidReplacementString(JSON.stringify(snapshot)));
 }

diff --git a/packages/blocks/src/_legacy/content-parser/index.ts b/packages/blocks/src/_legacy/content-parser/index.ts
@@ -11,7 +11,6 @@ import {
   type SerializedBlock,
   type TopLevelBlockModel,
 } from '../../_common/utils/index.js';
-import type { Renderer } from '../../index.js';
 import type { PageBlockModel } from '../../models.js';
 import type { EdgelessPageBlockComponent } from '../../page-block/edgeless/edgeless-page-block.js';
 import { getBlocksInFrame } from '../../page-block/edgeless/frame-manager.js';
@@ -20,6 +19,7 @@ import { getBackgroundGrid } from '../../page-block/edgeless/utils/query.js';
 import type { IBound } from '../../surface-block/consts.js';
 import { EdgelessBlockType } from '../../surface-block/edgeless-types.js';
 import type { SurfaceElement } from '../../surface-block/elements/surface-element.js';
+import type { Renderer } from '../../surface-block/index.js';
 import { Bound } from '../../surface-block/utils/bound.js';
 import { FileExporter } from './file-exporter/file-exporter.js';
 import type {

diff --git a/packages/blocks/src/_legacy/content-parser/parse-base.ts b/packages/blocks/src/_legacy/content-parser/parse-base.ts
@@ -2,16 +2,12 @@ import { type DeltaOperation, nanoid, type Page } from '@blocksuite/store';
 import { lightCssVariables } from '@toeverything/theme';
 
 import { getTagColor } from '../../_common/components/tags/colors.js';
+import type { SerializedBlock } from '../../_common/types.js';
 import { getStandardLanguage } from '../../code-block/utils/code-languages.js';
 import { FALLBACK_LANG } from '../../code-block/utils/consts.js';
 import { columnManager } from '../../database-block/common/columns/manager.js';
 import { richTextPureColumnConfig } from '../../database-block/common/columns/rich-text/define.js';
-import type {
-  BlockSchemas,
-  Cell,
-  Column,
-  SerializedBlock,
-} from '../../index.js';
+import type { BlockSchemas, Cell, Column } from '../../index.js';
 import type { ContentParser, ContextedContentParser } from './index.js';
 
 export type FetchFileHandler = (

diff --git a/packages/blocks/src/_legacy/content-parser/parse-markdown.ts b/packages/blocks/src/_legacy/content-parser/parse-markdown.ts
@@ -1,7 +1,7 @@
 import { assertExists } from '@blocksuite/global/utils';
 import type { Page } from '@blocksuite/store';
 
-import type { SerializedBlock } from '../../index.js';
+import type { SerializedBlock } from '../../_common/types.js';
 import type { ContentParser, ContextedContentParser } from './index.js';
 import {
   BaseParser,

diff --git a/packages/blocks/src/_legacy/content-parser/parse-notion-html.ts b/packages/blocks/src/_legacy/content-parser/parse-notion-html.ts
@@ -1,7 +1,7 @@
 import { assertExists } from '@blocksuite/global/utils';
 import type { Page } from '@blocksuite/store';
 
-import type { SerializedBlock } from '../../index.js';
+import type { SerializedBlock } from '../../_common/types.js';
 import type { ContentParser, ContextedContentParser } from './index.js';
 import {
   BaseParser,

diff --git a/packages/blocks/src/attachment-block/index.ts b/packages/blocks/src/attachment-block/index.ts
@@ -1,4 +1,7 @@
 export * from './attachment-block.js';
-export * from './attachment-model.js';
+export {
+  AttachmentBlockModel,
+  type AttachmentBlockProps,
+  AttachmentBlockSchema,
+} from './attachment-model.js';
 export * from './attachment-service.js';
-export { uploadBlobForAttachment } from './utils.js';
diff --git a/packages/blocks/src/attachment-block/utils.ts b/packages/blocks/src/attachment-block/utils.ts
@@ -117,7 +117,7 @@ export function turnImageIntoCardView(model: ImageBlockModel, blob: Blob) {
  *
  * @internal
  */
-export async function uploadBlobForAttachment(
+async function uploadBlobForAttachment(
   page: Page,
   attachmentModelId: string,
   blob: Blob

diff --git a/packages/blocks/src/bookmark-block/bookmark-model.ts b/packages/blocks/src/bookmark-block/bookmark-model.ts
@@ -43,7 +43,7 @@ export type BookmarkBlockProps = {
 } & BookmarkBlockUrlData &
   BookmarkBlockEdgelessProps;
 
-export const defaultBookmarkProps: BookmarkBlockProps = {
+const defaultBookmarkProps: BookmarkBlockProps = {
   style: 'horizontal',
   url: '',
   caption: null,

diff --git a/packages/blocks/src/index.ts b/packages/blocks/src/index.ts
@@ -8,7 +8,6 @@ import './frame-block/index.js';
 import './divider-block/index.js';
 import './code-block/affine-code-line.js';
 import './image-block/index.js';
-import './surface-block/index.js';
 import './database-block/index.js';
 import './surface-ref-block/index.js';
 
@@ -17,8 +16,10 @@ import { matchFlavours } from './_common/utils/index.js';
 import { splitElements } from './page-block/edgeless/utils/clipboard-utils.js';
 
 export * from './_common/adapters/index.js';
-export * from './_common/components/index.js';
-export { NOTE_WIDTH } from './_common/consts.js';
+export {
+  type AffineInlineEditor,
+  RichText,
+} from './_common/components/index.js';
 export {
   EdgelessPresentationConsts as EdgelessPresentationConsts,
   type NavigatorMode,
@@ -35,8 +36,8 @@ export {
   ThemeObserver,
 } from './_common/theme/theme-observer.js';
 export * from './_common/transformers/index.js';
-export * from './_common/types.js';
-export { on, once, stopPropagation } from './_common/utils/event.js';
+export { type AbstractEditor } from './_common/types.js';
+export { on, once } from './_common/utils/event.js';
 export { createDefaultPage } from './_common/utils/init.js';
 export type { BlockModels } from './_common/utils/model.js';
 export { getThemeMode } from './_common/utils/query.js';
@@ -60,9 +61,18 @@ export * from './models.js';
 export * from './note-block/index.js';
 export * from './page-block/index.js';
 export * from './paragraph-block/index.js';
-export * from './surface-block/index.js';
-export * from './surface-block/surface-block.js';
-export * from './surface-block/surface-model.js';
+export {
+  Bound,
+  CanvasElementType,
+  ConnectorEndpointStyle,
+  ConnectorMode,
+  EdgelessBlockType,
+  generateKeyBetween,
+  ShapeStyle,
+  StrokeStyle,
+} from './surface-block/index.js';
+export { SurfaceBlockComponent } from './surface-block/surface-block.js';
+export { SurfaceBlockSchema } from './surface-block/surface-model.js';
 export * from './surface-block/surface-service.js';
 export * from './surface-ref-block/index.js';
 

diff --git a/...ges/blocks/src/page-block/edgeless/components/component-toolbar/change-bookmark-button.ts b/...ges/blocks/src/page-block/edgeless/components/component-toolbar/change-bookmark-button.ts
@@ -10,7 +10,6 @@ import { toggleBookmarkEditModal } from '../../../../bookmark-block/components/i
 import type { BookmarkBlockComponent } from '../../../../index.js';
 import type { BookmarkBlockModel } from '../../../../models.js';
 import type { SurfaceBlockComponent } from '../../../../surface-block/surface-block.js';
-import type { EdgelessSelectionSlots } from '../../edgeless-page-block.js';
 
 @customElement('edgeless-change-bookmark-button')
 export class EdgelessChangeBookmarkButton extends WithDisposable(LitElement) {
@@ -29,9 +28,6 @@ export class EdgelessChangeBookmarkButton extends WithDisposable(LitElement) {
   @property({ attribute: false })
   surface!: SurfaceBlockComponent;
 
-  @property({ attribute: false })
-  slots!: EdgelessSelectionSlots;
-
   override render() {
     return html`<div class="change-bookmark-container">
       <icon-button

diff --git a/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-brush-button.ts b/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-brush-button.ts
@@ -16,7 +16,6 @@ import type {
   CanvasElementType,
 } from '../../../../surface-block/index.js';
 import type { SurfaceBlockComponent } from '../../../../surface-block/surface-block.js';
-import type { EdgelessSelectionSlots } from '../../edgeless-page-block.js';
 import {
   type ColorEvent,
   type EdgelessColorPanel,
@@ -100,9 +99,6 @@ export class EdgelessChangeBrushButton extends WithDisposable(LitElement) {
   @property({ attribute: false })
   surface!: SurfaceBlockComponent;
 
-  @property({ attribute: false })
-  slots!: EdgelessSelectionSlots;
-
   @state()
   private _showPopper = false;
 

diff --git a/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-note-button.ts b/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-note-button.ts
@@ -24,7 +24,6 @@ import { matchFlavours } from '../../../../_common/utils/model.js';
 import { type NoteBlockModel } from '../../../../note-block/note-model.js';
 import { Bound, StrokeStyle } from '../../../../surface-block/index.js';
 import type { SurfaceBlockComponent } from '../../../../surface-block/surface-block.js';
-import type { EdgelessSelectionSlots } from '../../edgeless-page-block.js';
 import { type ColorEvent, ColorUnit } from '../panel/color-panel.js';
 import {
   LineStylesPanel,
@@ -172,9 +171,6 @@ export class EdgelessChangeNoteButton extends WithDisposable(LitElement) {
   @property({ attribute: false })
   surface!: SurfaceBlockComponent;
 
-  @property({ attribute: false })
-  slots!: EdgelessSelectionSlots;
-
   @state()
   private _queryCache = false;
 

diff --git a/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-shape-button.ts b/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-shape-button.ts
@@ -21,14 +21,17 @@ import type { CssVariableName } from '../../../../_common/theme/css-variables.js
 import { LineWidth, type ShapeTool } from '../../../../_common/types.js';
 import { countBy, maxBy } from '../../../../_common/utils/iterable.js';
 import { CanvasTextFontFamily } from '../../../../surface-block/consts.js';
+import {
+  FILL_COLORS,
+  STROKE_COLORS,
+} from '../../../../surface-block/elements/shape/consts.js';
 import type { CanvasElementType } from '../../../../surface-block/index.js';
 import {
   type ShapeElement,
   ShapeStyle,
   StrokeStyle,
 } from '../../../../surface-block/index.js';
 import type { SurfaceBlockComponent } from '../../../../surface-block/surface-block.js';
-import type { EdgelessSelectionSlots } from '../../edgeless-page-block.js';
 import {
   SHAPE_FILL_COLOR_BLACK,
   SHAPE_TEXT_COLOR_PURE_BLACK,
@@ -123,38 +126,6 @@ function getMostCommonShapeStyle(elements: ShapeElement[]): ShapeStyle {
   return max ? (max[0] as ShapeStyle) : ShapeStyle.Scribbled;
 }
 
-const FILL_COLORS: CssVariableName[] = [
-  '--affine-palette-shape-yellow',
-  '--affine-palette-shape-orange',
-  '--affine-palette-shape-tangerine',
-  '--affine-palette-shape-red',
-  '--affine-palette-shape-magenta',
-  '--affine-palette-shape-purple',
-  '--affine-palette-shape-green',
-  '--affine-palette-shape-blue',
-  '--affine-palette-shape-navy',
-  '--affine-palette-shape-black',
-  '--affine-palette-shape-white',
-  '--affine-palette-transparent',
-];
-export const DEFAULT_SHAPE_FILL_COLOR = FILL_COLORS[0];
-
-const STROKE_COLORS: CssVariableName[] = [
-  '--affine-palette-line-yellow',
-  '--affine-palette-line-orange',
-  '--affine-palette-line-tangerine',
-  '--affine-palette-line-red',
-  '--affine-palette-line-magenta',
-  '--affine-palette-line-purple',
-  '--affine-palette-line-green',
-  '--affine-palette-line-blue',
-  '--affine-palette-line-navy',
-  '--affine-palette-line-black',
-  '--affine-palette-line-white',
-  '--affine-palette-transparent',
-];
-export const DEFAULT_SHAPE_STROKE_COLOR = STROKE_COLORS[0];
-
 @customElement('edgeless-change-shape-button')
 export class EdgelessChangeShapeButton extends WithDisposable(LitElement) {
   static override styles = [
@@ -270,9 +241,6 @@ export class EdgelessChangeShapeButton extends WithDisposable(LitElement) {
   @property({ attribute: false })
   surface!: SurfaceBlockComponent;
 
-  @property({ attribute: false })
-  slots!: EdgelessSelectionSlots;
-
   @state()
   private _showPopper = false;
 
@@ -590,7 +558,6 @@ export class EdgelessChangeShapeButton extends WithDisposable(LitElement) {
                 .elements=${this.elements}
                 .elementType=${'shape'}
                 .surface=${this.surface}
-                .slots=${this.slots}
               ></edgeless-change-text-menu>`
           : nothing}
       </div>

diff --git a/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-text-button.ts b/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-text-button.ts
@@ -8,7 +8,6 @@ import { customElement, property } from 'lit/decorators.js';
 
 import type { TextElement } from '../../../../surface-block/index.js';
 import type { SurfaceBlockComponent } from '../../../../surface-block/surface-block.js';
-import type { EdgelessSelectionSlots } from '../../edgeless-page-block.js';
 
 @customElement('edgeless-change-text-button')
 export class EdgelessChangeTextButton extends WithDisposable(LitElement) {
@@ -31,16 +30,12 @@ export class EdgelessChangeTextButton extends WithDisposable(LitElement) {
   @property({ attribute: false })
   surface!: SurfaceBlockComponent;
 
-  @property({ attribute: false })
-  slots!: EdgelessSelectionSlots;
-
   override render() {
     return html`<div class="change-text-container">
       <edgeless-change-text-menu
         .elements=${this.texts}
         .elementType=${'text'}
         .surface=${this.surface}
-        .slots=${this.slots}
       ></edgeless-change-text-menu>
     </div>`;
   }

diff --git a/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-text-menu.ts b/packages/blocks/src/page-block/edgeless/components/component-toolbar/change-text-menu.ts
@@ -34,7 +34,6 @@ import {
   type TextElement,
 } from '../../../../surface-block/index.js';
 import type { SurfaceBlockComponent } from '../../../../surface-block/surface-block.js';
-import type { EdgelessSelectionSlots } from '../../edgeless-page-block.js';
 import type { EdgelessAlignPanel } from '../panel/align-panel.js';
 import {
   type ColorEvent,
@@ -151,9 +150,6 @@ export class EdgelessChangeTextMenu extends WithDisposable(LitElement) {
   @property({ attribute: false })
   surface!: SurfaceBlockComponent;
 
-  @property({ attribute: false })
-  slots!: EdgelessSelectionSlots;
-
   @state()
   private _textColorPopperShow = false;
   @state()

diff --git a/packages/blocks/src/page-block/edgeless/components/component-toolbar/component-toolbar.ts b/packages/blocks/src/page-block/edgeless/components/component-toolbar/component-toolbar.ts
@@ -137,7 +137,6 @@ export class EdgelessComponentToolbar extends WithDisposable(LitElement) {
           .elements=${shapeElements}
           .page=${this.page}
           .surface=${this.surface}
-          .slots=${this.slots}
         >
         </edgeless-change-shape-button>`
       : nothing;
@@ -150,7 +149,6 @@ export class EdgelessComponentToolbar extends WithDisposable(LitElement) {
           .elements=${brushElements}
           .page=${this.page}
           .surface=${this.surface}
-          .slots=${this.slots}
         >
         </edgeless-change-brush-button>`
       : nothing;
@@ -173,7 +171,6 @@ export class EdgelessComponentToolbar extends WithDisposable(LitElement) {
       ? html`<edgeless-change-note-button
           .notes=${notes}
           .surface=${this.surface}
-          .slots=${this.slots}
         >
         </edgeless-change-note-button>`
       : nothing;
@@ -186,7 +183,6 @@ export class EdgelessComponentToolbar extends WithDisposable(LitElement) {
             .bookmark=${bookmarks[0]}
             .page=${this.page}
             .surface=${this.surface}
-            .slots=${this.slots}
           ></edgeless-change-bookmark-button>
         `
       : nothing;
@@ -198,7 +194,6 @@ export class EdgelessComponentToolbar extends WithDisposable(LitElement) {
           .texts=${textElements}
           .page=${this.page}
           .surface=${this.surface}
-          .slots=${this.slots}
         >
         </edgeless-change-text-button>`
       : nothing;

diff --git a/packages/blocks/src/page-block/edgeless/components/toolbar/shape/shape-menu.ts b/packages/blocks/src/page-block/edgeless/components/toolbar/shape/shape-menu.ts
@@ -11,12 +11,12 @@ import {
 } from '../../../../../_common/icons/index.js';
 import type { CssVariableName } from '../../../../../_common/theme/css-variables.js';
 import type { EdgelessTool } from '../../../../../_common/utils/index.js';
+import { DEFAULT_SHAPE_FILL_COLOR } from '../../../../../surface-block/elements/shape/consts.js';
 import {
   ShapeStyle,
   type ShapeType,
 } from '../../../../../surface-block/index.js';
 import type { EdgelessPageBlockComponent } from '../../../edgeless-page-block.js';
-import { DEFAULT_SHAPE_FILL_COLOR } from '../../component-toolbar/change-shape-button.js';
 import type { ColorEvent } from '../../panel/color-panel.js';
 import {
   LINE_COLOR_PREFIX,

diff --git a/packages/blocks/src/page-block/edgeless/components/toolbar/shape/shape-tool-button.ts b/packages/blocks/src/page-block/edgeless/components/toolbar/shape/shape-tool-button.ts
@@ -19,12 +19,12 @@ import type {
   EdgelessTool,
   ShapeToolState,
 } from '../../../../../_common/utils/index.js';
-import { ShapeStyle } from '../../../../../surface-block/index.js';
-import type { EdgelessPageBlockComponent } from '../../../edgeless-page-block.js';
 import {
   DEFAULT_SHAPE_FILL_COLOR,
   DEFAULT_SHAPE_STROKE_COLOR,
-} from '../../component-toolbar/change-shape-button.js';
+} from '../../../../../surface-block/elements/shape/consts.js';
+import { ShapeStyle } from '../../../../../surface-block/index.js';
+import type { EdgelessPageBlockComponent } from '../../../edgeless-page-block.js';
 import { getTooltipWithShortcut } from '../../utils.js';
 import { createPopper, type MenuPopper } from '../common/create-popper.js';
 import type { EdgelessShapeMenu } from './shape-menu.js';