There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
fix(ios): mobile modal occlusion issues (#11427)
L-Sunb53b2acfe387
diff --git a/blocksuite/affine/components/src/context-menu/menu-renderer.ts b/blocksuite/affine/components/src/context-menu/menu-renderer.tsindex a84a069e3e..9976f76f30 100644--- a/blocksuite/affine/components/src/context-menu/menu-renderer.ts+++ b/blocksuite/affine/components/src/context-menu/menu-renderer.ts@@ -490,6 +490,7 @@ export type MenuHandler = {const popMobileMenu = (options: MenuOptions): MenuHandler => {const model = createModal(document.body);+ model.style.position = 'fixed';const menu = new Menu({...options,onClose: () => {diff --git a/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts b/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.tsindex 29a09dd47c..63ab1c0d12 100644--- a/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts+++ b/blocksuite/affine/components/src/embed-card-modal/embed-card-create-modal.ts@@ -1,6 +1,9 @@-import { EmbedOptionProvider } from '@blocksuite/affine-shared/services';+import {+ EmbedOptionProvider,+ VirtualKeyboardProvider,+} from '@blocksuite/affine-shared/services';import { isValidUrl, stopPropagation } from '@blocksuite/affine-shared/utils';-import { WithDisposable } from '@blocksuite/global/lit';+import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';import type { EditorHost } from '@blocksuite/std';import { ShadowlessElement } from '@blocksuite/std';import { GfxControllerIdentifier } from '@blocksuite/std/gfx';@@ -8,11 +11,14 @@ import type { BlockModel } from '@blocksuite/store';import { html } from 'lit';import { property, query, state } from 'lit/decorators.js';import { classMap } from 'lit/directives/class-map.js';+import { styleMap } from 'lit-html/directives/style-map.js';import { toast } from '../toast';import { embedCardModalStyles } from './styles.js';-export class EmbedCardCreateModal extends WithDisposable(ShadowlessElement) {+export class EmbedCardCreateModal extends SignalWatcher(+ WithDisposable(ShadowlessElement)+) {static override styles = embedCardModalStyles;private readonly _onCancel = () => {@@ -98,7 +104,14 @@ export class EmbedCardCreateModal extends WithDisposable(ShadowlessElement) {}override render() {- return html`<div class="embed-card-modal">+ const keyboard = this.host.std.getOptional(VirtualKeyboardProvider);+ const style = styleMap({+ height: keyboard?.visible$.value+ ? `calc(100% - ${keyboard.height$.value}px)`+ : undefined,+ });++ return html`<div class="embed-card-modal" style=${style}><div class="embed-card-modal-mask" @click=${this._onCancel}></div><div class="embed-card-modal-wrapper"><div class="embed-card-modal-row">diff --git a/blocksuite/affine/components/src/embed-card-modal/styles.ts b/blocksuite/affine/components/src/embed-card-modal/styles.tsindex 89b2e7bbc2..b63831b67a 100644--- a/blocksuite/affine/components/src/embed-card-modal/styles.ts+++ b/blocksuite/affine/components/src/embed-card-modal/styles.ts@@ -2,6 +2,17 @@ import { fontXSStyle, panelBaseStyle } from '@blocksuite/affine-shared/styles';import { css } from 'lit';export const embedCardModalStyles = css`+ .embed-card-modal {+ position: fixed;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ z-index: 1000;+ height: 100%;+ transition: height 0.3s ease-in-out;+ }+.embed-card-modal-mask {position: absolute;left: 0;diff --git a/packages/frontend/component/src/ui/menu/menu.types.ts b/packages/frontend/component/src/ui/menu/menu.types.tsindex 4db5f868dd..7923e2f992 100644--- a/packages/frontend/component/src/ui/menu/menu.types.ts+++ b/packages/frontend/component/src/ui/menu/menu.types.ts@@ -6,7 +6,7 @@ import type {DropdownMenuSubContentProps,DropdownMenuSubProps,} from '@radix-ui/react-dropdown-menu';-import type { ReactNode } from 'react';+import type { CSSProperties, ReactNode } from 'react';export interface MenuProps {children: ReactNode;@@ -15,6 +15,7 @@ export interface MenuProps {portalOptions?: Omit<DropdownMenuPortalProps, 'children'>;rootOptions?: Omit<DropdownMenuProps, 'children'>;contentOptions?: Omit<DropdownMenuContentProps, 'children'>;+ contentWrapperStyle?: CSSProperties;noPortal?: boolean;}diff --git a/packages/frontend/component/src/ui/menu/mobile/root.tsx b/packages/frontend/component/src/ui/menu/mobile/root.tsxindex ca56d59fa6..1e15bfe230 100644--- a/packages/frontend/component/src/ui/menu/mobile/root.tsx+++ b/packages/frontend/component/src/ui/menu/mobile/root.tsx@@ -32,6 +32,7 @@ export const MobileMenu = ({...otherContentOptions} = {},+ contentWrapperStyle,rootOptions,}: MenuProps) => {const [subMenus, setSubMenus] = useState<SubMenuContent[]>([]);@@ -131,6 +132,7 @@ export const MobileMenu = ({className: clsx(className, styles.mobileMenuModal),...otherContentOptions,}}+ contentWrapperStyle={contentWrapperStyle}disableAutoFocus={true}><divdiff --git a/packages/frontend/core/src/mobile/components/sign-in/layout.css.ts b/packages/frontend/core/src/mobile/components/sign-in/layout.css.tsindex 33558ead15..ae8de1b3b7 100644--- a/packages/frontend/core/src/mobile/components/sign-in/layout.css.ts+++ b/packages/frontend/core/src/mobile/components/sign-in/layout.css.ts@@ -1,9 +1,11 @@import { style } from '@vanilla-extract/css';+import { globalVars } from '../../styles/variables.css';+export const root = style({padding: '40px',justifyContent: 'flex-end',- minHeight: '100dvh',+ minHeight: `calc(100dvh - ${globalVars.appKeyboardHeight})`,display: 'flex',flexDirection: 'column',position: 'relative',diff --git a/packages/frontend/core/src/mobile/dialogs/selectors/date-selector.tsx b/packages/frontend/core/src/mobile/dialogs/selectors/date-selector.tsxindex d28fc08e5c..d808740857 100644--- a/packages/frontend/core/src/mobile/dialogs/selectors/date-selector.tsx+++ b/packages/frontend/core/src/mobile/dialogs/selectors/date-selector.tsx@@ -2,8 +2,11 @@ import { DatePicker, Menu } from '@affine/component';import type { DialogComponentProps } from '@affine/core/modules/dialogs';import type { WORKSPACE_DIALOG_SCHEMA } from '@affine/core/modules/dialogs/constant';import { useI18n } from '@affine/i18n';+import { useLiveData, useService } from '@toeverything/infra';import { useCallback, useState } from 'react';+import { VirtualKeyboardService } from '../../modules/virtual-keyboard';+/*** A global date selector popover for mobile, mainly used in blocksuite editor*/@@ -12,6 +15,9 @@ export const DateSelectorDialog = ({onSelect,}: DialogComponentProps<WORKSPACE_DIALOG_SCHEMA['date-selector']>) => {const [selectedDate, setSelectedDate] = useState<string>();+ const keyboardService = useService(VirtualKeyboardService);+ const keyboardHeight = useLiveData(keyboardService.height$);+ const keyboardVisible = useLiveData(keyboardService.visible$);const t = useI18n();@@ -44,6 +50,13 @@ export const DateSelectorDialog = ({padding: '15px 20px',},}}+ contentWrapperStyle={+ keyboardVisible+ ? {+ paddingBottom: `calc(${keyboardHeight}px + 12px)`,+ }+ : undefined+ }items={<DatePickerweekDays={t['com.affine.calendar-date-picker.week-days']()}