mirror of
https://github.com/n8n-io/n8n.git
synced 2024-12-25 04:34:06 -08:00
fix: Fix tags overflow handler in workflows header (#6784)
* fix: fix tags container overflowing * fix: fix intersection observer error
This commit is contained in:
parent
dc295ac5bf
commit
7cd45885bf
|
@ -54,7 +54,9 @@ export default defineComponent({
|
|||
this.observer = observer;
|
||||
|
||||
this.eventBus.on('observe', (observed: Element) => {
|
||||
observer.observe(observed);
|
||||
if (observed) {
|
||||
observer.observe(observed);
|
||||
}
|
||||
});
|
||||
|
||||
this.eventBus.on('unobserve', (observed: Element) => {
|
||||
|
|
|
@ -26,19 +26,18 @@
|
|||
</BreakpointsObserver>
|
||||
|
||||
<span v-if="settingsStore.areTagsEnabled" class="tags" data-test-id="workflow-tags-container">
|
||||
<div v-if="isTagsEditEnabled && !readOnly">
|
||||
<TagsDropdown
|
||||
v-model="appliedTagIds"
|
||||
:createEnabled="true"
|
||||
:eventBus="tagsEditBus"
|
||||
:placeholder="$locale.baseText('workflowDetails.chooseOrCreateATag')"
|
||||
ref="dropdown"
|
||||
class="tags-edit"
|
||||
data-test-id="workflow-tags-dropdown"
|
||||
@blur="onTagsBlur"
|
||||
@esc="onTagsEditEsc"
|
||||
/>
|
||||
</div>
|
||||
<TagsDropdown
|
||||
v-if="isTagsEditEnabled && !readOnly"
|
||||
v-model="appliedTagIds"
|
||||
:createEnabled="true"
|
||||
:eventBus="tagsEditBus"
|
||||
:placeholder="$locale.baseText('workflowDetails.chooseOrCreateATag')"
|
||||
ref="dropdown"
|
||||
class="tags-edit"
|
||||
data-test-id="workflow-tags-dropdown"
|
||||
@blur="onTagsBlur"
|
||||
@esc="onTagsEditEsc"
|
||||
/>
|
||||
<div v-else-if="currentWorkflowTagIds.length === 0 && !readOnly">
|
||||
<span class="add-tag clickable" data-test-id="new-tag-link" @click="onTagsEditEnable">
|
||||
+ {{ $locale.baseText('workflowDetails.addTag') }}
|
||||
|
@ -658,12 +657,16 @@ $--header-spacing: 20px;
|
|||
}
|
||||
|
||||
.tags {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
flex: 1;
|
||||
margin-right: $--header-spacing;
|
||||
}
|
||||
|
||||
.tags-edit {
|
||||
min-width: 100px;
|
||||
width: 100%;
|
||||
max-width: 460px;
|
||||
}
|
||||
|
||||
|
|
|
@ -3,8 +3,10 @@
|
|||
:threshold="1.0"
|
||||
@observed="onObserved"
|
||||
class="tags-container"
|
||||
:style="style"
|
||||
:enabled="responsive"
|
||||
:event-bus="intersectionEventBus"
|
||||
ref="tagsContainer"
|
||||
>
|
||||
<span class="tags">
|
||||
<span
|
||||
|
@ -47,6 +49,7 @@ import IntersectionObserved from './IntersectionObserved.vue';
|
|||
import { mapStores } from 'pinia';
|
||||
import { useTagsStore } from '@/stores/tags.store';
|
||||
import { createEventBus } from 'n8n-design-system/utils';
|
||||
import { debounce } from 'lodash-es';
|
||||
|
||||
// random upper limit if none is set to minimize performance impact of observers
|
||||
const DEFAULT_MAX_TAGS_LIMIT = 20;
|
||||
|
@ -63,12 +66,29 @@ export default defineComponent({
|
|||
props: ['tagIds', 'limit', 'clickable', 'responsive', 'hoverable'],
|
||||
data() {
|
||||
return {
|
||||
maxWidth: 320,
|
||||
intersectionEventBus: createEventBus(),
|
||||
visibility: {} as { [id: string]: boolean },
|
||||
debouncedSetMaxWidth: () => {},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.debouncedSetMaxWidth = debounce(this.setMaxWidth, 100);
|
||||
},
|
||||
mounted() {
|
||||
this.setMaxWidth();
|
||||
window.addEventListener('resize', this.debouncedSetMaxWidth);
|
||||
},
|
||||
beforeUnmount() {
|
||||
window.removeEventListener('resize', this.debouncedSetMaxWidth);
|
||||
},
|
||||
computed: {
|
||||
...mapStores(useTagsStore),
|
||||
style() {
|
||||
return {
|
||||
'max-width': `${this.maxWidth}px`,
|
||||
};
|
||||
},
|
||||
tags() {
|
||||
const tags = this.tagIds
|
||||
.map((tagId: string) => this.tagsStore.getTagById(tagId))
|
||||
|
@ -109,6 +129,17 @@ export default defineComponent({
|
|||
},
|
||||
},
|
||||
methods: {
|
||||
setMaxWidth() {
|
||||
const container = this.$refs.tagsContainer.$el as HTMLElement;
|
||||
const parent = container.parentNode as HTMLElement;
|
||||
|
||||
if (parent) {
|
||||
this.maxWidth = 0;
|
||||
void this.$nextTick(() => {
|
||||
this.maxWidth = parent.clientWidth;
|
||||
});
|
||||
}
|
||||
},
|
||||
onObserved({ el, isIntersecting }: { el: HTMLElement; isIntersecting: boolean }) {
|
||||
if (el.dataset.id) {
|
||||
this.visibility = { ...this.visibility, [el.dataset.id]: isIntersecting };
|
||||
|
@ -130,12 +161,15 @@ export default defineComponent({
|
|||
|
||||
<style lang="scss" scoped>
|
||||
.tags-container {
|
||||
display: inline-flex;
|
||||
overflow: hidden;
|
||||
display: block;
|
||||
max-width: 300px;
|
||||
}
|
||||
|
||||
.tags {
|
||||
display: flex;
|
||||
display: block;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
max-width: 100%;
|
||||
|
||||
> span {
|
||||
padding-right: 4px; // why not margin? for space between tags to be clickable
|
||||
|
|
|
@ -161,8 +161,6 @@ export const useLogStreamingStore = defineStore('logStreaming', {
|
|||
delete this.items[id];
|
||||
},
|
||||
clearDestinationItemTrees() {
|
||||
console.log('clearing destinations');
|
||||
|
||||
this.items = {} as DestinationSettingsStore;
|
||||
},
|
||||
setSelectionAndBuildItems(destination: MessageEventBusDestinationOptions) {
|
||||
|
|
Loading…
Reference in a new issue