Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-24 18:02:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(editor): improve page viewport implementation (#11090)

Browse Source
This commit is contained in:
Saul-Mirone
2025-03-22 04:41:40 +00:00
parent c1d426d8e9
commit e1fa10af47
3 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
blocksuite/affine/blocks/block-root/src/page/page-root-block.ts
View File

@@ -12,7 +12,6 @@ import {
PageViewportService,
ViewportElementProvider,
} from '@blocksuite/affine-shared/services';
import type { Viewport } from '@blocksuite/affine-shared/types';
import {
focusTitle,
getClosestBlockComponentByPoint,
@@ -158,33 +157,16 @@ export class PageRootBlockComponent extends BlockComponent<
return getScrollContainer(this);
}
get viewport(): Viewport | null {
if (!this.viewportElement) {
return null;
}
const {
scrollLeft,
scrollTop,
scrollWidth,
scrollHeight,
clientWidth,
clientHeight,
} = this.viewportElement;
const { top, left } = this.viewportElement.getBoundingClientRect();
return {
top,
left,
scrollLeft,
scrollTop,
scrollWidth,
scrollHeight,
clientWidth,
clientHeight,
};
get viewportProvider() {
return this.std.get(ViewportElementProvider);
}
get viewport() {
return this.viewportProvider.viewport;
}
get viewportElement(): HTMLElement {
return this.std.get(ViewportElementProvider).viewportElement;
return this.viewportProvider.viewportElement;
}
private _createDefaultNoteBlock() {

12
blocksuite/affine/blocks/block-root/src/widgets/page-dragging-area/page-dragging-area.ts
View File

@@ -1,4 +1,5 @@
import { NoteBlockModel, RootBlockModel } from '@blocksuite/affine-model';
import { ViewportElementProvider } from '@blocksuite/affine-shared/services';
import {
autoScroll,
getScrollContainer,
@@ -15,8 +16,6 @@ import { html, nothing } from 'lit';
import { state } from 'lit/decorators.js';
import { styleMap } from 'lit/directives/style-map.js';
import type { PageRootBlockComponent } from '../../index.js';
type Rect = {
left: number;
top: number;
@@ -32,10 +31,7 @@ type BlockInfo = {
export const AFFINE_PAGE_DRAGGING_AREA_WIDGET =
'affine-page-dragging-area-widget';
export class AffinePageDraggingAreaWidget extends WidgetComponent<
RootBlockModel,
PageRootBlockComponent
> {
export class AffinePageDraggingAreaWidget extends WidgetComponent<RootBlockModel> {
static excludeFlavours: string[] = ['affine:note', 'affine:surface'];
private _dragging = false;
@@ -167,9 +163,7 @@ export class AffinePageDraggingAreaWidget extends WidgetComponent<
}
private get _viewport() {
const rootComponent = this.block;
if (!rootComponent) return;
return rootComponent.viewport;
return this.std.get(ViewportElementProvider).viewport;
}
private get scrollContainer() {

7
blocksuite/affine/blocks/block-root/src/widgets/viewport-overlay/viewport-overlay.ts
View File

@@ -5,14 +5,9 @@ import { state } from 'lit/decorators.js';
import { classMap } from 'lit/directives/class-map.js';
import { styleMap } from 'lit/directives/style-map.js';
import type { PageRootBlockComponent } from '../../index.js';
export const AFFINE_VIEWPORT_OVERLAY_WIDGET = 'affine-viewport-overlay-widget';
export class AffineViewportOverlayWidget extends WidgetComponent<
RootBlockModel,
PageRootBlockComponent
> {
export class AffineViewportOverlayWidget extends WidgetComponent<RootBlockModel> {
static override styles = css`
.affine-viewport-overlay-widget {
position: absolute;