diff --git a/packages/app/e2e/conductor-import.electron.spec.ts b/packages/app/e2e/conductor-import.electron.spec.ts index a43b0b97f..040ce1345 100644 --- a/packages/app/e2e/conductor-import.electron.spec.ts +++ b/packages/app/e2e/conductor-import.electron.spec.ts @@ -23,7 +23,7 @@ test.skip(process.env.E2E_DESKTOP_RUNTIME !== "1", "requires the real Electron p test.setTimeout(180_000); const repoRoot = path.resolve(__dirname, "../../.."); -const nodeRequire = createRequire(__filename); +const nodeRequire = createRequire(path.join(repoRoot, "packages", "desktop", "package.json")); const importPackageRoot = path.resolve(path.dirname(nodeRequire.resolve("@getpaseo/import")), ".."); let installation: Awaited>; let electronApp: ElectronApplication; diff --git a/packages/app/playwright.config.ts b/packages/app/playwright.config.ts index cc0d117e7..a1024785d 100644 --- a/packages/app/playwright.config.ts +++ b/packages/app/playwright.config.ts @@ -27,7 +27,10 @@ export default defineConfig({ projects: [ { name: "Desktop Chrome", - testIgnore: ["**/*.real.spec.ts"], + testIgnore: + process.env.E2E_DESKTOP_RUNTIME === "1" + ? ["**/*.real.spec.ts"] + : ["**/*.real.spec.ts", "**/*.electron.spec.ts"], use: { ...devices["Desktop Chrome"] }, }, { diff --git a/packages/app/src/components/adaptive-modal-sheet.tsx b/packages/app/src/components/adaptive-modal-sheet.tsx index 9b91a375e..bf16ca413 100644 --- a/packages/app/src/components/adaptive-modal-sheet.tsx +++ b/packages/app/src/components/adaptive-modal-sheet.tsx @@ -458,6 +458,8 @@ export interface AdaptiveModalSheetProps { desktopMaxWidth?: number; scrollable?: boolean; presentation?: "push" | "replace"; + /** Whether gestures may dismiss the compact bottom sheet. */ + dismissible?: boolean; } export function AdaptiveModalSheet({ @@ -472,6 +474,7 @@ export function AdaptiveModalSheet({ desktopMaxWidth, scrollable = true, presentation, + dismissible = true, }: AdaptiveModalSheetProps) { const { theme } = useUnistyles(); const { t } = useTranslation(); @@ -608,7 +611,7 @@ export function AdaptiveModalSheet({ onChange={handleSheetChange} onDismiss={handleDismiss} backdropComponent={renderBackdrop} - enablePanDownToClose + enablePanDownToClose={dismissible} backgroundComponent={SheetBackground} handleIndicatorStyle={handleIndicatorStyle} keyboardBehavior="extend" diff --git a/packages/app/src/desktop/imports/import-sheet.tsx b/packages/app/src/desktop/imports/import-sheet.tsx index f3d6681b7..1cdfc4c82 100644 --- a/packages/app/src/desktop/imports/import-sheet.tsx +++ b/packages/app/src/desktop/imports/import-sheet.tsx @@ -140,6 +140,7 @@ export function ImportSheet({ footer={footer} desktopMaxWidth={640} testID="import-sheet" + dismissible={state.status !== "running"} > {state.status === "confirm" ? (