From 344364fb6529d8bebdaefef6ed453f58202e2608 Mon Sep 17 00:00:00 2001 From: Andrew Simachev Date: Wed, 6 Mar 2024 18:29:22 +0100 Subject: [PATCH] JS-4107: read-only fixes --- src/ts/component/block/dataview/controls.tsx | 13 +++++++------ src/ts/component/menu/dataview/filter/values.tsx | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/ts/component/block/dataview/controls.tsx b/src/ts/component/block/dataview/controls.tsx index 6c4e94ff12..cf2fe6a6c1 100644 --- a/src/ts/component/block/dataview/controls.tsx +++ b/src/ts/component/block/dataview/controls.tsx @@ -368,9 +368,13 @@ const Controls = observer(class Controls extends React.Component { onViewContext (e: any, element: string, view: any) { e.stopPropagation(); - const { rootId, block } = this.props; + const { rootId, block, readonly } = this.props; + if (readonly) { + return; + }; - const contextParam = { + this.onViewSet(view); + UtilMenu.viewContextMenu({ rootId, blockId: block.id, view, @@ -382,10 +386,7 @@ const Controls = observer(class Controls extends React.Component { horizontal: I.MenuDirection.Center, noFlipY: true, } - }; - - this.onViewSet(view); - UtilMenu.viewContextMenu(contextParam); + }); }; onSortStart () { diff --git a/src/ts/component/menu/dataview/filter/values.tsx b/src/ts/component/menu/dataview/filter/values.tsx index 2877ed00f3..a49caf5131 100644 --- a/src/ts/component/menu/dataview/filter/values.tsx +++ b/src/ts/component/menu/dataview/filter/values.tsx @@ -591,6 +591,11 @@ const MenuDataviewFilterValues = observer(class MenuDataviewFilterValues extends }; onFocusDate (e: any) { + const isReadonly = this.isReadonly(); + if (isReadonly) { + return; + }; + const { param } = this.props; const { data } = param; const { getView, itemId } = data; @@ -630,6 +635,11 @@ const MenuDataviewFilterValues = observer(class MenuDataviewFilterValues extends }; onTag () { + const isReadonly = this.isReadonly(); + if (isReadonly) { + return; + }; + const { param, getId, getSize } = this.props; const { data } = param; const { rootId, blockId, getView, itemId } = data; @@ -657,6 +667,11 @@ const MenuDataviewFilterValues = observer(class MenuDataviewFilterValues extends }; onObject (e: any, item: any) { + const isReadonly = this.isReadonly(); + if (isReadonly) { + return; + }; + const { param, getId, getSize } = this.props; const { data } = param; const { rootId, blockId } = data;