Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/CodeSnippetDisplay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import React from 'react';
import { CodeSnippetService, ICodeSnippet } from './CodeSnippetService';
import { FilterTools } from './FilterTools';
import { showPreview } from './PreviewSnippet';
import { showMoreOptions } from './MoreOptions';
import { showMoreOptions } from './CodeSnippetMenu';
// import {
// ICodeSnippet,
// CodeSnippetContentsService
Expand Down Expand Up @@ -627,10 +627,11 @@ export class CodeSnippetDisplay extends React.Component<

//Set the position of the option to be under to the three dots on snippet.
private _setOptionsPosition(
event: React.MouseEvent<HTMLButtonElement, MouseEvent>
event: React.MouseEvent<HTMLElement, MouseEvent>
): void {
const target = event.target as HTMLElement;
let top: number;
console.log(target.tagName);
if (target.tagName === 'path') {
top = target.getBoundingClientRect().top + 10;
} else {
Expand All @@ -640,8 +641,10 @@ export class CodeSnippetDisplay extends React.Component<
top -= 120;
}
const leftAsString =
target.getBoundingClientRect().left.toString(10) + 'px';
(target.parentElement.style.left + event.pageX).toString() + 'px';

const topAsString = top.toString(10) + 'px';

document.documentElement.style.setProperty(
'--more-options-top',
topAsString
Expand Down Expand Up @@ -1151,9 +1154,7 @@ export class CodeSnippetDisplay extends React.Component<
{
title: 'Insert, copy, edit, and delete',
icon: moreOptionsIcon,
onClick: (
event: React.MouseEvent<HTMLButtonElement, MouseEvent>
): void => {
onClick: (event: React.MouseEvent<HTMLElement, MouseEvent>): void => {
showMoreOptions({ body: new OptionsHandler(this, codeSnippet) });
this._setOptionsPosition(event);
},
Expand All @@ -1164,12 +1165,20 @@ export class CodeSnippetDisplay extends React.Component<
key={codeSnippet.name}
className={CODE_SNIPPET_ITEM}
id={id.toString()}
title={'Right click for more options'}
onMouseOver={(): void => {
this.dragHoverStyle(id);
}}
onMouseOut={(): void => {
this.dragHoverStyleRemove(id);
}}
onContextMenu={(
event: React.MouseEvent<HTMLElement, MouseEvent>
): void => {
event.preventDefault();
showMoreOptions({ body: new OptionsHandler(this, codeSnippet) });
this._setOptionsPosition(event);
}}
>
<div
className={CODE_SNIPPET_DRAG_HOVER}
Expand Down
12 changes: 11 additions & 1 deletion src/MoreOptions.ts → src/CodeSnippetMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,19 @@ export class OptionsMessage<T> extends Widget {
* not be called directly by user code.
*/
handleEvent(event: Event): void {
// if (event.type == 'click') {
// console.log('click');
// } else {
// console.log('default');
// console.log(event.type);
// }
switch (event.type) {
case 'click':
this._evtClick(event as MouseEvent);
break;
case 'contextmenu':
this._evtClick(event as MouseEvent);
break;
default:
break;
}
Expand All @@ -107,7 +116,6 @@ export class OptionsMessage<T> extends Widget {
event.stopPropagation();
event.preventDefault();
this.reject();
return;
}
}

Expand Down Expand Up @@ -159,6 +167,7 @@ export class OptionsMessage<T> extends Widget {
protected onAfterAttach(msg: Message): void {
const node = this.node;
node.addEventListener('click', this, true);
node.addEventListener('contextmenu', this, true);
}

/**
Expand All @@ -167,6 +176,7 @@ export class OptionsMessage<T> extends Widget {
protected onAfterDetach(msg: Message): void {
const node = this.node;
node.removeEventListener('click', this, true);
node.removeEventListener('contextmenu', this, true);
}

private _promise: PromiseDelegate<void> | null;
Expand Down
1 change: 1 addition & 0 deletions style/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
margin: 0;
padding: 0;
height: fit-content;
cursor: context-menu;
}

.jp-codeSnippet-item:hover {
Expand Down