Skip to content
Open
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,13 @@ export class DataViewHeaderToolsViewOptions extends WidgetBase {
};

openMoreAction = (target: PopupTarget) => {
popViewOptions(target, this.dataViewLogic);
popViewOptions(
{
...target,
root: document.body,
},
this.dataViewLogic
);
};

override render() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ export const affineEdgelessDocViewport = style({

export const docContainer = style({
display: 'block',
position: 'relative',
zIndex: 1,
selectors: ['generating', 'finished', 'error'].reduce<
NonNullable<StyleRule['selectors']>
>((rules, state) => {
Expand Down
4 changes: 1 addition & 3 deletions packages/frontend/core/src/desktop/dialogs/setting/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import { GlobalContextService } from '@affine/core/modules/global-context';
import { createIsland, type Island } from '@affine/core/utils/island';
import { ServerDeploymentType } from '@affine/graphql';
import { Trans, useTranslation } from '@affine/i18n';
import { Trans } from '@affine/i18n';
import { ContactWithUsIcon } from '@blocksuite/icons/rc';
import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
import { debounce } from 'lodash-es';
Expand Down Expand Up @@ -72,12 +72,10 @@
scrollAnchor: initialScrollAnchor,
});
const globalContextService = useService(GlobalContextService);
const { i18n } = useTranslation('translation');

const currentServerId = useLiveData(
globalContextService.globalContext.serverId.$
);
const currentLanguageKey = i18n.resolvedLanguage ?? i18n.language;
const serversService = useService(ServersService);
const defaultServerService = useService(DefaultServerService);
const currentServer =
Expand Down Expand Up @@ -196,7 +194,7 @@
}, [settingState]);
return (
<FrameworkScope
key={`setting-modal-${currentServerId}-${currentLanguageKey}`}

Check failure on line 197 in packages/frontend/core/src/desktop/dialogs/setting/index.tsx

View workflow job for this annotation

GitHub Actions / Typecheck

Cannot find name 'currentLanguageKey'.
scope={currentServer.scope}
>
<SettingSidebar
Expand Down
Loading