Browse Source

sync @1446

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
pull/6227/head
Raju Udava 1 year ago
parent
commit
0179777a92
  1. 2
      packages/nc-gui/components/cell/TextArea.vue
  2. 3
      packages/nc-gui/composables/useMultiSelect/index.ts
  3. 1
      packages/nc-gui/utils/browserUtils.ts

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

@ -103,7 +103,7 @@ onClickOutside(inputWrapperRef, (e) => {
</NcButton> </NcButton>
</div> </div>
<template #overlay> <template #overlay>
<div ref="inputWrapperRef" class="flex flex-col min-w-120 min-h-70 py-3 pl-3 pr-1"> <div ref="inputWrapperRef" class="flex flex-col min-w-120 min-h-70 py-3 pl-3 pr-1 expanded-cell-input">
<div <div
v-if="column" v-if="column"
class="flex flex-row gap-x-1 items-center font-medium pb-2.5 mb-1 py-1 mr-3 ml-1 border-b-1 border-gray-100" class="flex flex-row gap-x-1 items-center font-medium pb-2.5 mb-1 py-1 mr-3 ml-1 border-b-1 border-gray-100"

3
packages/nc-gui/composables/useMultiSelect/index.ts

@ -14,6 +14,7 @@ import {
extractPkFromRow, extractPkFromRow,
extractSdkResponseErrorMsg, extractSdkResponseErrorMsg,
isDrawerOrModalExist, isDrawerOrModalExist,
isExpandedCellInputExist,
isMac, isMac,
isTypableInputColumn, isTypableInputColumn,
message, message,
@ -704,7 +705,7 @@ export function useMultiSelect(
const clearSelectedRange = selectedRange.clear.bind(selectedRange) const clearSelectedRange = selectedRange.clear.bind(selectedRange)
const handlePaste = async (e: ClipboardEvent) => { const handlePaste = async (e: ClipboardEvent) => {
if (isDrawerOrModalExist()) { if (isDrawerOrModalExist() || isExpandedCellInputExist()) {
return return
} }

1
packages/nc-gui/utils/browserUtils.ts

@ -2,4 +2,5 @@
export const isMac = () => /Mac/i.test(navigator.platform) export const isMac = () => /Mac/i.test(navigator.platform)
export const isDrawerExist = () => document.querySelector('.ant-drawer-open') export const isDrawerExist = () => document.querySelector('.ant-drawer-open')
export const isDrawerOrModalExist = () => document.querySelector('.ant-modal.active, .ant-drawer-open') export const isDrawerOrModalExist = () => document.querySelector('.ant-modal.active, .ant-drawer-open')
export const isExpandedCellInputExist = () => document.querySelector('.expanded-cell-input')
export const cmdKActive = () => document.querySelector('.cmdk-modal-active') export const cmdKActive = () => document.querySelector('.cmdk-modal-active')

Loading…
Cancel
Save