From 06552a1120ff6fa03b1c97f6a7247d5037982731 Mon Sep 17 00:00:00 2001 From: CatsJuice Date: Thu, 5 Sep 2024 02:18:28 +0000 Subject: [PATCH] fix(mobile): explorer node touch optimization (#8101) close AF-1338 --- .../app-sidebar/category-divider/index.css.ts | 5 +- .../app-sidebar/category-divider/index.tsx | 8 ++- .../views/layouts/collapsible-section.tsx | 2 +- .../modules/explorer/views/tree/node.css.ts | 2 +- .../src/modules/explorer/views/tree/node.tsx | 60 ++++++++++--------- 5 files changed, 40 insertions(+), 37 deletions(-) diff --git a/packages/frontend/core/src/components/app-sidebar/category-divider/index.css.ts b/packages/frontend/core/src/components/app-sidebar/category-divider/index.css.ts index 699a95c55e..17a1fb3875 100644 --- a/packages/frontend/core/src/components/app-sidebar/category-divider/index.css.ts +++ b/packages/frontend/core/src/components/app-sidebar/category-divider/index.css.ts @@ -73,10 +73,7 @@ export const mobileRoot = style([ padding: '0 16px', selectors: { '&[data-collapsible="true"]:hover': { - backgroundColor: 'transparent', - }, - '&[data-collapsible="true"]:active': { - backgroundColor: cssVarV2('layer/background/hoverOverlay'), + backgroundColor: 'none', }, }, }, diff --git a/packages/frontend/core/src/components/app-sidebar/category-divider/index.tsx b/packages/frontend/core/src/components/app-sidebar/category-divider/index.tsx index 286dcc0205..177fbcd17c 100644 --- a/packages/frontend/core/src/components/app-sidebar/category-divider/index.tsx +++ b/packages/frontend/core/src/components/app-sidebar/category-divider/index.tsx @@ -53,9 +53,11 @@ export const CategoryDivider = forwardRef( /> ) : null} -
e.stopPropagation()}> - {children} -
+ {mobile ? null : ( +
e.stopPropagation()}> + {children} +
+ )} ); } diff --git a/packages/frontend/core/src/modules/explorer/views/layouts/collapsible-section.tsx b/packages/frontend/core/src/modules/explorer/views/layouts/collapsible-section.tsx index 3cd658798e..4ad7fedbb7 100644 --- a/packages/frontend/core/src/modules/explorer/views/layouts/collapsible-section.tsx +++ b/packages/frontend/core/src/modules/explorer/views/layouts/collapsible-section.tsx @@ -78,7 +78,7 @@ export const CollapsibleSection = ({ ref={headerRef} className={clsx(header, headerClassName)} > - {mobile ? null : actions} + {actions} ( () => ({ + canDrag: () => !mobile, data: { ...dndData?.draggable, __cid: cid }, dragPreviewPosition: 'pointer-outside', }), - [cid, dndData] + [cid, dndData, mobile] ); const handleCanDrop = useMemo['canDrop']>( () => args => { + if (mobile) return false; if (!reorderable && args.treeInstruction?.type !== 'make-child') { return false; } return (typeof canDrop === 'function' ? canDrop(args) : canDrop) ?? true; }, - [canDrop, reorderable] + [canDrop, mobile, reorderable] ); const { dropTargetRef, @@ -347,33 +349,35 @@ export const ExplorerTreeNode = ({ {postfix} -
{ - // prevent jump to page - e.stopPropagation(); - e.preventDefault(); - }} - > - {inlineOperations.map(({ view }, index) => ( - {view} - ))} - {menuOperations.length > 0 && ( - ( - {view} - ))} - > - { + // prevent jump to page + e.stopPropagation(); + e.preventDefault(); + }} + > + {inlineOperations.map(({ view }, index) => ( + {view} + ))} + {menuOperations.length > 0 && ( + ( + {view} + ))} > - - - - )} -
+ + + + + )} + + )} {renameable && (