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

fix(editor): Fix NDV resize handle and scrollbar overlapping #12509

Merged
merged 1 commit into from
Jan 8, 2025
Merged

fix(editor): Fix NDV resize handle and scrollbar overlapping #12509

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
78 changes: 48 additions & 30 deletions packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts" setup>
import { computed, ref } from 'vue';
import { computed, ref, useCssModule } from 'vue';

import { directionsCursorMaps, type Direction, type ResizeData } from 'n8n-design-system/types';

Expand Down Expand Up @@ -32,6 +32,7 @@ interface ResizeProps {
scale?: number;
gridSize?: number;
supportedDirections?: Direction[];
outset?: boolean;
}

const props = withDefaults(defineProps<ResizeProps>(), {
Expand All @@ -42,9 +43,12 @@ const props = withDefaults(defineProps<ResizeProps>(), {
minWidth: 0,
scale: 1,
gridSize: 20,
outset: false,
supportedDirections: () => [],
});

const $style = useCssModule();

const emit = defineEmits<{
resizestart: [];
resize: [value: ResizeData];
Expand All @@ -70,6 +74,11 @@ const state = {
y: ref(0),
};

const classes = computed(() => ({
[$style.resize]: true,
[$style.outset]: props.outset,
}));

const mouseMove = (event: MouseEvent) => {
event.preventDefault();
event.stopPropagation();
Expand Down Expand Up @@ -147,7 +156,7 @@ const resizerMove = (event: MouseEvent) => {
</script>

<template>
<div :class="$style.resize">
<div :class="classes">
<div
v-for="direction in enabledDirections"
:key="direction"
Expand All @@ -161,6 +170,10 @@ const resizerMove = (event: MouseEvent) => {

<style lang="scss" module>
.resize {
--resizer--size: 12px;
--resizer--side-offset: -2px;
--resizer--corner-offset: -3px;

position: relative;
width: 100%;
height: 100%;
Expand All @@ -173,66 +186,71 @@ const resizerMove = (event: MouseEvent) => {
}

.right {
width: 12px;
width: var(--resizer--size);
height: 100%;
top: -2px;
right: -2px;
top: var(--resizer--side-offset);
right: var(--resizer--side-offset);
cursor: ew-resize;
}

.top {
width: 100%;
height: 12px;
top: -2px;
left: -2px;
height: var(--resizer--size);
top: var(--resizer--side-offset);
left: var(--resizer--side-offset);
cursor: ns-resize;
}

.bottom {
width: 100%;
height: 12px;
bottom: -2px;
left: -2px;
height: var(--resizer--size);
bottom: var(--resizer--side-offset);
left: var(--resizer--side-offset);
cursor: ns-resize;
}

.left {
width: 12px;
width: var(--resizer--size);
height: 100%;
top: -2px;
left: -2px;
top: var(--resizer--side-offset);
left: var(--resizer--side-offset);
cursor: ew-resize;
}

.topLeft {
width: 12px;
height: 12px;
top: -3px;
left: -3px;
width: var(--resizer--size);
height: var(--resizer--size);
top: var(--resizer--corner-offset);
left: var(--resizer--corner-offset);
cursor: nw-resize;
}

.topRight {
width: 12px;
height: 12px;
top: -3px;
right: -3px;
width: var(--resizer--size);
height: var(--resizer--size);
top: var(--resizer--corner-offset);
right: var(--resizer--corner-offset);
cursor: ne-resize;
}

.bottomLeft {
width: 12px;
height: 12px;
bottom: -3px;
left: -3px;
width: var(--resizer--size);
height: var(--resizer--size);
bottom: var(--resizer--corner-offset);
left: var(--resizer--corner-offset);
cursor: sw-resize;
}

.bottomRight {
width: 12px;
height: 12px;
bottom: -3px;
right: -3px;
width: var(--resizer--size);
height: var(--resizer--size);
bottom: var(--resizer--corner-offset);
right: var(--resizer--corner-offset);
cursor: se-resize;
}

.outset {
--resizer--side-offset: calc(-1 * var(--resizer--size) + 2px);
--resizer--corner-offset: calc(-1 * var(--resizer--size) + 3px);
}
</style>
1 change: 1 addition & 0 deletions packages/editor-ui/src/components/NDVDraggablePanels.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ function onDragEnd() {
:min-width="MIN_PANEL_WIDTH"
:grid-size="20"
:supported-directions="supportedResizeDirections"
outset
@resize="onResizeThrottle"
@resizeend="onResizeEnd"
>
Expand Down
Loading