Skip to content

chore(app): basic style and example to stop scrollIntoView bug #18736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/app/src/layouts/default.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="h-screen overflow-hidden flex flex-row">
<main class="min-w-0 flex-1 border-t border-gray-200 lg:flex">
<main class="h-screen min-w-0 flex-1 border-t border-gray-200 lg:flex">
<section
aria-labelledby="primary-heading"
class="min-w-0 flex-1 h-full flex flex-col overflow-hidden lg:order-last"
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/navigation/SidebarNavigation.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="flex relative flex-col flex-1 min-h-0 bg-gray-1000">
<div
class="absolute cursor-pointer bg-gray-1000 w-8px bottom-0 top-0 right-0 hover:bg-indigo-300"
class="absolute cursor-pointer bg-gray-800 w-2px hover:w-8px bottom-0 top-0 right-0 hover:bg-indigo-300"
@click="mainStore.toggleNavBar"
/>
<div class="flex flex-col flex-1 pt-5 pb-4 overflow-y-auto">
Expand Down
86 changes: 59 additions & 27 deletions packages/app/src/spec/SpecRunner.vue
Original file line number Diff line number Diff line change
@@ -1,35 +1,44 @@
<template>
<div
id="main-grid"
class="grid p-12 gap-8 h-full"
id="main-pane"
class="flex"
>
<div>
<div
id="inline-spec-list"
class="bg-gray-1000 w-128"
>
<InlineSpecList :gql="props.gql" />
</div>

<div
id="runner"
:style="`width: ${runnerColumnWidth}px`"
class="relative"
>
<SpecRunnerHeader :gql="props.gql" />
<div class="w-128">
<div
:id="RUNNER_ID"
class="viewport origin-top-left"
:style="viewportStyle"
v-once
:id="REPORTER_ID"
/>
<SnapshotControls :event-manager="eventManager" />
</div>

<div
v-once
:id="REPORTER_ID"
/>
ref="runnerPane"
class="relative w-full"
>
<div class="bg-white p-4 border-8 border-blue-300">
<SpecRunnerHeader :gql="props.gql" />
</div>

<div class="flex justify-center bg-gray-100 h-full p-4">
<div
:id="RUNNER_ID"
class="viewport origin-top-left"
:style="viewportStyle"
/>
</div>
<SnapshotControls :event-manager="eventManager" />
</div>
</div>
</template>

<script lang="ts" setup>
import { computed, onBeforeUnmount, onMounted, watch } from 'vue'
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
import { REPORTER_ID, RUNNER_ID, getRunnerElement, getReporterElement, empty } from '../runner/utils'
import { gql } from '@urql/core'
import type { SpecRunnerFragment } from '../generated/graphql'
Expand All @@ -47,16 +56,25 @@ fragment SpecRunner on App {
}
`

const runnerColumnWidth = 400
const eventManager = window.UnifiedRunner.eventManager

const autStore = useAutStore()

const runnerPane = ref<HTMLDivElement>()

const viewportStyle = computed(() => {
if (!runnerPane.value) {
return
}

const scale = runnerPane.value.clientWidth < autStore.viewportDimensions.width
? runnerPane.value.clientWidth / autStore.viewportDimensions.width
: 1

return `
width: ${autStore.viewportDimensions.width}px;
height: ${autStore.viewportDimensions.height}px;
transform: scale(${runnerColumnWidth / autStore.viewportDimensions.width});`
transform: scale(${scale});`
})

const props = defineProps<{
Expand Down Expand Up @@ -90,17 +108,32 @@ onBeforeUnmount(() => {

</script>

<style scoped>
#main-grid {
grid-template-columns: 1fr 2fr 2fr;
<style scoped lang="scss">
$navbar-width: 80px;

#main-pane {
/** There is a "bug" caused by this line:
https://github.com/cypress-io/cypress/blob/develop/packages/driver/src/cy/actionability.ts#L375
Basically `scrollIntoView` is applied even outside of the <iframe>,
scrolling an element "upwards", messing up the UI
Easiest way to reprodudce is remove the `position: fixed`
and run the `SpecList.spec.tsx` test in runner-ct
in CT mode.
Ideally we should not need `position: fixed`, but I don't see
a good way to work around this right now.
*/
position: fixed;
left: $navbar-width;
height: 100vh;
width: calc(100% - #{$navbar-width});
}

.viewport {
border: 2px dotted blue;
#inline-spec-list {
border-right: 2px solid rgb(67 73 97);
}

#runner {
border: 1px solid black;
.viewport {
border: 2px dotted blue;
}

#unified-runner {
Expand All @@ -109,7 +142,6 @@ onBeforeUnmount(() => {

#unified-reporter {
position: relative;
width: 300px;
height: 100%;
}

Expand Down