Browse Source

fix(nc-gui): disable open modal on double clicking longtext cell

pull/7703/head
Ramesh Mane 9 months ago
parent
commit
0d2dcec6bf
  1. 2
      packages/nc-gui/components/cell/RichText.vue
  2. 17
      packages/nc-gui/components/cell/TextArea.vue

2
packages/nc-gui/components/cell/RichText.vue

@ -187,7 +187,7 @@ watch(editorDom, () => {
'max-w-[calc(100%_-_198px)] flex justify-end rounded-tr-2xl overflow-hidden': fullMode, 'max-w-[calc(100%_-_198px)] flex justify-end rounded-tr-2xl overflow-hidden': fullMode,
}" }"
> >
<div class="nc-scrollbar-x-md"> <div class="nc-longtext-scrollbar">
<CellRichTextSelectedBubbleMenu v-if="editor" :editor="editor" embed-mode /> <CellRichTextSelectedBubbleMenu v-if="editor" :editor="editor" embed-mode />
</div> </div>
</div> </div>

17
packages/nc-gui/components/cell/TextArea.vue

@ -173,7 +173,7 @@ const dragStart = (e: MouseEvent) => {
} }
watch(editEnabled, () => { watch(editEnabled, () => {
if (editEnabled.value) { if (editEnabled.value && isRichMode.value) {
isVisible.value = true isVisible.value = true
} }
}) })
@ -227,7 +227,7 @@ watch(inputWrapperRef, () => {
:ref="focus" :ref="focus"
v-model="vModel" v-model="vModel"
:rows="isForm ? 5 : 4" :rows="isForm ? 5 : 4"
class="h-full w-full outline-none border-none nc-scrollbar-lg" class="h-full w-full outline-none border-none nc-longtext-scrollbar"
:class="{ :class="{
'p-2': editEnabled, 'p-2': editEnabled,
'py-1 h-full': isForm, 'py-1 h-full': isForm,
@ -270,8 +270,8 @@ watch(inputWrapperRef, () => {
<NcTooltip <NcTooltip
v-if="!isVisible" v-if="!isVisible"
placement="bottom" placement="bottom"
class="!absolute right-1 hidden nc-text-area-expand-btn group-hover:block z-3" class="!absolute top-1 hidden nc-text-area-expand-btn group-hover:block z-3"
:class="isExpandedFormOpen || isForm ? 'top-1' : 'bottom-1'" :class="isForm ? 'right-1' : 'right-0'"
> >
<template #title>{{ $t('title.expand') }}</template> <template #title>{{ $t('title.expand') }}</template>
<NcButton type="secondary" size="xsmall" data-testid="attachment-cell-file-picker-button" @click.stop="onExpand"> <NcButton type="secondary" size="xsmall" data-testid="attachment-cell-file-picker-button" @click.stop="onExpand">
@ -318,7 +318,7 @@ watch(inputWrapperRef, () => {
<a-textarea <a-textarea
ref="inputRef" ref="inputRef"
v-model:value="vModel" v-model:value="vModel"
class="nc-text-area-expanded !py-1 !px-3 !text-black !cursor-text !min-h-[210px] !rounded-lg focus:border-brand-500 disabled:!bg-gray-50" class="nc-text-area-expanded !py-1 !px-3 !text-black !cursor-text !min-h-[210px] !rounded-lg focus:border-brand-500 disabled:!bg-gray-50 nc-longtext-scrollbar"
:placeholder="$t('activity.enterText')" :placeholder="$t('activity.enterText')"
:style="{ resize: 'both' }" :style="{ resize: 'both' }"
:disabled="readOnly" :disabled="readOnly"
@ -347,6 +347,9 @@ textarea:focus {
@apply rounded-lg; @apply rounded-lg;
} }
} }
.nc-longtext-scrollbar {
@apply scrollbar-thin scrollbar-thumb-gray-200 hover:scrollbar-thumb-gray-300 scrollbar-track-transparent;
}
</style> </style>
<style lang="scss"> <style lang="scss">
@ -367,6 +370,10 @@ textarea:focus {
max-width: min(1280px, 100vw - 100px); max-width: min(1280px, 100vw - 100px);
max-height: min(864px, 100vh - 100px); max-height: min(864px, 100vh - 100px);
.nc-longtext-scrollbar {
@apply scrollbar-thin scrollbar-thumb-gray-200 hover:scrollbar-thumb-gray-300 scrollbar-track-transparent;
}
} }
} }
} }

Loading…
Cancel
Save