Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: recentered form view #591

Merged
merged 1 commit into from
Apr 4, 2023
Merged

fix: recentered form view #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions packages/form-js-editor/assets/form-js-editor-base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,24 +118,29 @@
display: flex;
width: 100%;
padding: 3px 0px;
position: relative;
}

.fjs-editor-container .fjs-row-dragger {
visibility: hidden;
z-index: 2;
position: relative;
margin-left: -12px;
margin-top: auto;
margin-bottom: auto;
position: absolute;
top: 25%;
height: 50%;
left: -33px;
width: 23px;
padding-right: 7px;
cursor: grab;
width: 32px;
height: 32px;
display: flex;
justify-content: center;
align-items: center;
}

.fjs-editor-container .fjs-drag-row-move:hover .fjs-row-dragger {
.fjs-editor-container .fjs-row-dragger svg {
visibility: hidden;
}

.fjs-editor-container .fjs-row-dragger:hover svg,
.fjs-editor-container .fjs-drag-row-move:hover .fjs-row-dragger svg {
visibility: visible;
}

Expand Down Expand Up @@ -404,11 +409,8 @@
/* row drop preview */
.fjs-children > .gu-transit {
height: 28px !important;
margin-left: 28px !important;
margin-right: -8px !important;
width: 100% !important;
flex: unset !important;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we have to keep flex: unset, otherwise it will mess up the height of the previews.

image

width: unset !important;
max-width: unset !important;
}

/* error drop preview */
Expand Down
4 changes: 3 additions & 1 deletion packages/form-js-editor/test/spec/FormEditor.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,8 @@ describe('FormEditor', function() {
});


it('should move row', async function() {
// flaky, skipped for now until we migrate it to playwright
it.skip('should move row', async function() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This becomes laggy due to the absolute positioning now, I think. That's always hard to test, so I got your rationale about this particular test.

In general, I think the dragging tests make sense, as the behavior is predictable.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we at least add an comment above the test why we skip it and maybe a note that we could solve it with proper integration testing? Or should we remove it entirely?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can try to move this test o Playwright when I create the setup


// given
formEditor = await createFormEditor({
Expand Down Expand Up @@ -1022,6 +1023,7 @@ describe('FormEditor', function() {
clientX: bounds.x,
clientY: bounds.y
});

endDragging(container);

// then
Expand Down
4 changes: 2 additions & 2 deletions packages/form-js-viewer/assets/form-js-base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@
}

.fjs-container .fjs-layout-row {
width: 100%;
flex: auto;
padding: 9px 0;
position: relative;
margin-left: 1px;
}

.fjs-container .fjs-column {
Expand Down Expand Up @@ -134,6 +133,7 @@
color: var(--color-text);
background-color: var(--color-background);
position: relative;
padding: 0 4px;
}

.fjs-container .fjs-form * {
Expand Down