fix(component): windows client does not have app controls on some pages (#8176)

close AF-1266
This commit is contained in:
JimmFly
2024-09-12 06:35:55 +00:00
parent 3999b04cf1
commit 8e71815e46
11 changed files with 41 additions and 10 deletions

View File

@@ -12,7 +12,6 @@ import {
appSidebarResizingAtom,
} from '@affine/core/components/app-sidebar';
import { appSidebarWidthAtom } from '@affine/core/components/app-sidebar/index.jotai';
import { WindowsAppControls } from '@affine/core/components/pure/header/windows-app-controls';
import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
import { useCatchEventCallback } from '@affine/core/hooks/use-catch-event-hook';
import { track } from '@affine/core/mixpanel';
@@ -475,7 +474,7 @@ export const AppTabsHeader = ({
<RightSidebarIcon />
</IconButton>
{environment.isElectron && environment.isWindows ? (
<WindowsAppControls />
<div className={styles.windowsAppControlsPlaceholder} />
) : null}
</div>
);

View File

@@ -242,6 +242,12 @@ export const spacer = style({
},
});
export const windowsAppControlsPlaceholder = style({
width: '160px',
height: '100%',
flexShrink: 0,
});
export const dropIndicator = style({
position: 'absolute',
height: 32,

View File

@@ -67,4 +67,6 @@ export const PageNotFound = ({
);
};
export const Component = PageNotFound;
export const Component = () => {
return <PageNotFound />;
};

View File

@@ -3,6 +3,7 @@ import {
ChangeEmailPage,
ChangePasswordPage,
ConfirmChangeEmail,
ConfirmVerifiedEmail,
OnboardingPage,
SetPasswordPage,
SignInSuccessPage,
@@ -153,7 +154,7 @@ export const Component = () => {
return <ConfirmChangeEmail onOpenAffine={onOpenAffine} />;
}
case 'verify-email': {
return <ConfirmChangeEmail onOpenAffine={onOpenAffine} />;
return <ConfirmVerifiedEmail onOpenAffine={onOpenAffine} />;
}
}
return null;

View File

@@ -1,3 +1,4 @@
import { AffineOtherPageLayout } from '@affine/component/affine-other-page-layout';
import { AppFallback } from '@affine/core/components/affine/app-container';
import { viewRoutes } from '@affine/core/router';
import { ZipTransformer } from '@blocksuite/blocks';
@@ -108,7 +109,11 @@ export const Component = (): ReactElement => {
/>
);
}
return <PageNotFound noPermission />;
return (
<AffineOtherPageLayout>
<PageNotFound noPermission />
</AffineOtherPageLayout>
);
}
if (!meta) {
return <AppFallback />;