L-Sun
2025-02-28 08:23:26 +00:00
parent f1df774188
commit d476d3b1df
27 changed files with 356 additions and 528 deletions

View File

@@ -151,7 +151,7 @@ const usePatchSpecs = (mode: DocMode) => {
builder.extend([patchForAttachmentEmbedViews(reactToLit)]);
}
if (BUILD_CONFIG.isMobileEdition) {
enableMobileExtension(builder);
enableMobileExtension(builder, framework);
}
if (BUILD_CONFIG.isElectron) {
builder.extend([patchForClipboardInElectron(framework)].flat());

View File

@@ -1,29 +1,36 @@
import { createKeyboardToolbarConfig } from '@affine/core/blocksuite/extensions/keyboard-toolbar-config';
import { VirtualKeyboardProvider } from '@affine/core/mobile/modules/virtual-keyboard';
import {
type BlockStdScope,
ConfigIdentifier,
LifeCycleWatcher,
LifeCycleWatcherIdentifier,
} from '@blocksuite/affine/block-std';
import type {
CodeBlockConfig,
ReferenceNodeConfig,
RootBlockConfig,
SpecBuilder,
} from '@blocksuite/affine/blocks';
import {
codeToolbarWidget,
DocModeProvider,
embedCardToolbarWidget,
FeatureFlagService,
formatBarWidget,
imageToolbarWidget,
ParagraphBlockService,
ReferenceNodeConfigIdentifier,
RootBlockConfigExtension,
slashMenuWidget,
surfaceRefToolbarWidget,
VirtualKeyboardProvider as BSVirtualKeyboardProvider,
} from '@blocksuite/affine/blocks';
import type { Container } from '@blocksuite/affine/global/di';
import type {
Container,
ServiceIdentifier,
} from '@blocksuite/affine/global/di';
import { DisposableGroup } from '@blocksuite/affine/global/utils';
import type { ExtensionType } from '@blocksuite/affine/store';
import { batch, signal } from '@preact/signals-core';
import type { FrameworkProvider } from '@toeverything/infra';
class MobileSpecsPatches extends LifeCycleWatcher {
static override key = 'mobile-patches';
@@ -86,28 +93,85 @@ class MobileSpecsPatches extends LifeCycleWatcher {
}
}
const mobileExtensions: ExtensionType[] = [
function KeyboardToolbarExtension(framework: FrameworkProvider): ExtensionType {
const affineVirtualKeyboardProvider = framework.get(VirtualKeyboardProvider);
class BSVirtualKeyboardService
extends LifeCycleWatcher
implements BSVirtualKeyboardProvider
{
setup: di => {
const prev = di.getFactory(RootBlockConfigExtension.identifier);
static override key = BSVirtualKeyboardProvider.identifierName;
di.override(RootBlockConfigExtension.identifier, provider => {
return {
...prev?.(provider),
keyboardToolbar: createKeyboardToolbarConfig(),
} satisfies RootBlockConfig;
private readonly _disposables = new DisposableGroup();
private get _rootContentEditable() {
const editorMode = this.std.get(DocModeProvider).getEditorMode();
if (editorMode !== 'page') return null;
if (!this.std.host.doc.root) return;
return this.std.view.getBlock(this.std.host.doc.root.id);
}
// eslint-disable-next-line rxjs/finnish
readonly visible$ = signal(false);
// eslint-disable-next-line rxjs/finnish
readonly height$ = signal(0);
show() {
if ('show' in affineVirtualKeyboardProvider) {
affineVirtualKeyboardProvider.show();
} else if (this._rootContentEditable) {
this._rootContentEditable.inputMode = '';
}
}
hide() {
if ('hide' in affineVirtualKeyboardProvider) {
affineVirtualKeyboardProvider.hide();
} else if (this._rootContentEditable) {
this._rootContentEditable.inputMode = 'none';
}
}
static override setup(di: Container) {
super.setup(di);
di.addImpl(BSVirtualKeyboardProvider, provider => {
return provider.get(
LifeCycleWatcherIdentifier(
this.key
) as ServiceIdentifier<BSVirtualKeyboardService>
);
});
},
},
MobileSpecsPatches,
];
}
export function enableMobileExtension(specBuilder: SpecBuilder): void {
override mounted() {
this._disposables.add(
affineVirtualKeyboardProvider.onChange(({ visible, height }) => {
batch(() => {
this.visible$.value = visible;
this.height$.value = height;
});
})
);
}
override unmounted() {
this._disposables.dispose();
}
}
return BSVirtualKeyboardService;
}
export function enableMobileExtension(
specBuilder: SpecBuilder,
framework: FrameworkProvider
): void {
specBuilder.omit(formatBarWidget);
specBuilder.omit(embedCardToolbarWidget);
specBuilder.omit(slashMenuWidget);
specBuilder.omit(codeToolbarWidget);
specBuilder.omit(imageToolbarWidget);
specBuilder.omit(surfaceRefToolbarWidget);
specBuilder.extend(mobileExtensions);
specBuilder.extend([MobileSpecsPatches, KeyboardToolbarExtension(framework)]);
}

View File

@@ -1,9 +0,0 @@
import { type KeyboardToolbarConfig } from '@blocksuite/affine/blocks';
export function createKeyboardToolbarConfig(): Partial<KeyboardToolbarConfig> {
return {
// TODO(@L-Sun): check android following the PR
// https://github.com/toeverything/blocksuite/pull/8645
useScreenHeight: BUILD_CONFIG.isIOS,
};
}

View File

@@ -18,7 +18,7 @@ export const AppTabs = ({
fixed?: boolean;
}) => {
const virtualKeyboardService = useService(VirtualKeyboardService);
const virtualKeyboardVisible = useLiveData(virtualKeyboardService.show$);
const virtualKeyboardVisible = useLiveData(virtualKeyboardService.visible$);
const tab = (
<SafeArea

View File

@@ -6,8 +6,5 @@ import { VirtualKeyboardService } from './services/virtual-keyboard';
export { VirtualKeyboardProvider, VirtualKeyboardService };
export function configureMobileVirtualKeyboardModule(framework: Framework) {
framework.service(
VirtualKeyboardService,
f => new VirtualKeyboardService(f.getOptional(VirtualKeyboardProvider))
);
framework.service(VirtualKeyboardService, [VirtualKeyboardProvider]);
}

View File

@@ -1,23 +1,28 @@
import { createIdentifier } from '@toeverything/infra';
export type VirtualKeyboardEvent =
| 'keyboardWillShow'
| 'keyboardDidShow'
| 'keyboardWillHide'
| 'keyboardDidHide';
export interface VirtualKeyboardEventInfo {
keyboardHeight: number;
interface VirtualKeyboardInfo {
visible: boolean;
height: number;
}
type VirtualKeyboardEventListener = (info: VirtualKeyboardEventInfo) => void;
export interface VirtualKeyboardProvider {
addEventListener: (
event: VirtualKeyboardEvent,
callback: VirtualKeyboardEventListener
) => void;
removeAllListeners: () => void;
}
type VirtualKeyboardAction = {
/**
* Open the virtual keyboard, the focused element should not be changed
*/
show: () => void;
/**
* Hide the virtual keyboard, the focused element should not be changed
*/
hide: () => void;
};
type VirtualKeyboardEvent = {
onChange: (callback: (info: VirtualKeyboardInfo) => void) => () => void;
};
export type VirtualKeyboardProvider =
| (VirtualKeyboardEvent & VirtualKeyboardAction)
| VirtualKeyboardEvent;
export const VirtualKeyboardProvider =
createIdentifier<VirtualKeyboardProvider>('VirtualKeyboardProvider');

View File

@@ -3,32 +3,23 @@ import { LiveData, Service } from '@toeverything/infra';
import type { VirtualKeyboardProvider } from '../providers/virtual-keyboard';
export class VirtualKeyboardService extends Service {
show$ = new LiveData(false);
height$ = new LiveData(0);
readonly visible$ = new LiveData(false);
readonly height$ = new LiveData(0);
constructor(
private readonly virtualKeyboardProvider?: VirtualKeyboardProvider
private readonly virtualKeyboardProvider: VirtualKeyboardProvider
) {
super();
this._observe();
}
override dispose() {
super.dispose();
this.virtualKeyboardProvider?.removeAllListeners();
}
private _observe() {
this.virtualKeyboardProvider?.addEventListener(
'keyboardWillShow',
({ keyboardHeight }) => {
this.show$.next(true);
this.height$.next(keyboardHeight);
}
this.disposables.push(
this.virtualKeyboardProvider.onChange(info => {
this.visible$.next(info.visible);
this.height$.next(info.height);
})
);
this.virtualKeyboardProvider?.addEventListener('keyboardWillHide', () => {
this.show$.next(false);
this.height$.next(0);
});
}
}

View File

@@ -23,9 +23,6 @@ globalStyle('body', {
globalStyle('body:has(> #app-tabs)', {
paddingBottom: globalVars.appTabSafeArea,
});
globalStyle('body:has(#app-tabs) affine-keyboard-toolbar[data-shrink="true"]', {
paddingBottom: globalVars.appTabSafeArea,
});
globalStyle('body:has(#app-tabs) affine-keyboard-tool-panel', {
paddingBottom: `calc(${globalVars.appTabHeight} + env(safe-area-inset-bottom) + 8px)`,
});

View File

@@ -322,7 +322,6 @@ export class AtMenuConfigService extends Service {
private getMobileConfig(): Partial<LinkedWidgetConfig['mobile']> {
return {
useScreenHeight: BUILD_CONFIG.isIOS,
scrollContainer: window,
scrollTopOffset: () => {
const header = document.querySelector('header');