Skip to content

Commit 92e23be

Browse files
committed
more bug fixes
1 parent 9c58eca commit 92e23be

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

src/pg/overlayContextMenu/__examples__/basic/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="example">
22
<div part="area" tabindex="0">
3-
Right Click Here
3+
Right Click or Context Menu Key
44
</div>
55
<p>Result: <code part="result"></code></p></p>
66
<p>input: <code part="input"></code></p></p>

src/pg/overlayContextMenu/__examples__/basic/basic.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export default class XPgOverlayContextMenuBasic extends HTMLElement {
2727
#value = null;
2828

2929
async #handleContextMenu(e: MouseEvent) {
30+
console.log('context');
3031
e.preventDefault();
3132
const items = [{
3233
label: 'Add File',
@@ -54,10 +55,7 @@ export default class XPgOverlayContextMenuBasic extends HTMLElement {
5455
x: e.clientX,
5556
y: e.clientY,
5657
value: this.#value,
57-
items,
58-
oninput: (value) => {
59-
this.$input.textContent = value;
60-
}
58+
items
6159
});
6260
if (result !== undefined) {
6361
this.#value = result;

src/pg/overlayContextMenu/overlayContextMenu.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import style from './overlayContextMenu.css';
88

99
// Only allow a single open context menu
1010
const stack: PgOverlayContextMenu[] = [];
11+
const stack2: PgOverlayContextMenu[] = [];
1112

1213
@Component({
1314
selector: 'pg-overlay-context-menu',
@@ -36,8 +37,10 @@ export default class PgOverlayContextMenu extends PgOverlay {
3637
}
3738

3839
connectedCallback() {
40+
console.log('connected');
3941
stack.pop()?.close();
4042
stack.push(this);
43+
stack2.push(this);
4144
this.$menu.addEventListener('select', this.#handleSelect.bind(this));
4245
this.$overlay.popover = 'auto';
4346
if (this.source !== null) {
@@ -61,12 +64,16 @@ export default class PgOverlayContextMenu extends PgOverlay {
6164
#toggle(e: ToggleEvent) {
6265
if (e.newState === 'closed') {
6366
this.close();
64-
this.source?.focus();
67+
console.log('open', stack2.length);
68+
if (stack2.length === 0) {
69+
this.source?.focus();
70+
}
6571
}
6672
}
6773

6874
disconnectedCallback() {
69-
75+
console.log('disconnected');
76+
stack2.pop();
7077
}
7178

7279
#handleSelect(e: any) {

0 commit comments

Comments
 (0)