Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't drag for ephemeral blocks (#1288)

Browse Source
This commit is contained in:
Evan Simkowitz 2024-11-14 10:16:08 -08:00 committed by GitHub
parent ced3d73111
commit eb00716e00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/app/block/blockframe.tsx
View File

@ -180,7 +180,6 @@ const BlockFrame_Header = ({
const preIconButton = util.useAtomValueSafe(viewModel?.preIconButton); const preIconButton = util.useAtomValueSafe(viewModel?.preIconButton);
let headerTextUnion = util.useAtomValueSafe(viewModel?.viewText); let headerTextUnion = util.useAtomValueSafe(viewModel?.viewText);
const magnified = jotai.useAtomValue(nodeModel.isMagnified); const magnified = jotai.useAtomValue(nodeModel.isMagnified);
const ephemeral = jotai.useAtomValue(nodeModel.isEphemeral);
const manageConnection = util.useAtomValueSafe(viewModel?.manageConnection); const manageConnection = util.useAtomValueSafe(viewModel?.manageConnection);
const dragHandleRef = preview ? null : nodeModel.dragHandleRef; const dragHandleRef = preview ? null : nodeModel.dragHandleRef;
@ -236,12 +235,7 @@ const BlockFrame_Header = ({
} }
return ( return (
<div <div className="block-frame-default-header" ref={dragHandleRef} onContextMenu={onContextMenu}>
className="block-frame-default-header"
ref={dragHandleRef}
onContextMenu={onContextMenu}
draggable={!(preview || magnified || ephemeral)}
>
{preIconButtonElem} {preIconButtonElem}
<div className="block-frame-default-header-iconview"> <div className="block-frame-default-header-iconview">
{viewIconElem} {viewIconElem}

5
frontend/layout/lib/TileLayout.tsx
View File

@ -219,16 +219,19 @@ const DisplayNode = ({ layoutModel, node }: DisplayNodeProps) => {
const previewRef = useRef<HTMLDivElement>(null); const previewRef = useRef<HTMLDivElement>(null);
const addlProps = useAtomValue(nodeModel.additionalProps); const addlProps = useAtomValue(nodeModel.additionalProps);
const devicePixelRatio = useDevicePixelRatio(); const devicePixelRatio = useDevicePixelRatio();
const isEphemeral = useAtomValue(nodeModel.isEphemeral);
const isMagnified = useAtomValue(nodeModel.isMagnified);
const [{ isDragging }, drag, dragPreview] = useDrag( const [{ isDragging }, drag, dragPreview] = useDrag(
() => ({ () => ({
type: dragItemType, type: dragItemType,
canDrag: () => !(isEphemeral || isMagnified),
item: () => node, item: () => node,
collect: (monitor) => ({ collect: (monitor) => ({
isDragging: monitor.isDragging(), isDragging: monitor.isDragging(),
}), }),
}), }),
[node, addlProps] [node, addlProps, isEphemeral, isMagnified]
); );
const [previewElementGeneration, setPreviewElementGeneration] = useState(0); const [previewElementGeneration, setPreviewElementGeneration] = useState(0);