Skip to content

Commit 4762c8c

Browse files
committed
More fixes
1 parent d2cdbe4 commit 4762c8c

File tree

6 files changed

+26
-15
lines changed

6 files changed

+26
-15
lines changed

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"remarkable": "^2.0.1"
2626
},
2727
"devDependencies": {
28-
"@pictogrammers/element": "0.0.58",
28+
"@pictogrammers/element": "0.0.59",
2929
"@pictogrammers/element-jest": "^0.1.8",
30-
"@pictogrammers/element-webpack": "^0.1.48",
30+
"@pictogrammers/element-webpack": "^0.1.49",
3131
"cross-env": "^7.0.3",
3232
"npm-run-all": "^4.1.5",
3333
"raw-loader": "^4.0.2",

src/pg/button/button.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
right: -1px;
4242
bottom: -1px;
4343
left: -1px;
44-
border-radius: 0.25rem;
44+
border-radius: var(--pg-button-border-radius, 0.25rem);
4545
box-shadow: 0 0 0 3px var(--pg-focus-color, rgb(79, 143, 249, 0.6));
4646
}
4747
[part="button"]:focus::before {
@@ -52,7 +52,7 @@
5252
right: -1px;
5353
bottom: -1px;
5454
left: -1px;
55-
border-radius: 0.25rem;
55+
border-radius: var(--pg-button-border-radius, 0.25rem);
5656
box-shadow: 0 0 0 3px var(--pg-focus-color, rgb(79, 143, 249, 0.5));
5757
}
5858

src/pg/menu/__examples__/basic/basic.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ export default class XPgMenuBasic extends HTMLElement {
1414
connectedCallback() {
1515
this.$menu.items = [{
1616
label: 'Item 1',
17-
value: 'item1',
18-
checked: true
17+
value: 'item1'
1918
},
2019
{
2120
label: 'Item 2',

src/pg/menu/menu.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,26 @@ export default class PgMenu extends HTMLElement {
1717

1818
@Part() $items: HTMLDivElement;
1919

20+
previousIndex = -1;
21+
2022
connectedCallback() {
2123
forEach({
2224
container: this.$items,
2325
items: this.items,
2426
type: (item) => {
2527
return item.type ?? PgMenuItem;
2628
},
27-
create: ($item, item) => {
29+
create: ($item: any, item) => {
2830
$item.addEventListener('select', (e: any) => {
2931
const { index } = e.detail;
3032
this.dispatchEvent(new CustomEvent('select', {
3133
detail: { index, item }
3234
}));
35+
if (this.previousIndex !== -1) {
36+
this.items[this.previousIndex].checked = false;
37+
}
38+
$item.checked = true;
39+
this.previousIndex = index;
3340
});
3441
$item.addEventListener('up', (e: any) => {
3542
const { index } = e.detail;
@@ -49,6 +56,9 @@ export default class PgMenu extends HTMLElement {
4956
this.focus(index + 1);
5057
}
5158
});
59+
if (item.checked) {
60+
this.previousIndex = $item.index;
61+
}
5262
}
5363
});
5464
}

src/pg/menuItem/menuItem.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
color: var(--pg-menu-item-color, #453C4F);
2121
}
2222

23+
[part=label]:not(:disabled):active,
2324
[part=label]:not(:disabled):hover {
2425
background: var(--pg-menu-item-selected-background, #453C4F);
2526
color: #FFFFFF;
@@ -41,6 +42,7 @@
4142
height: 1.5rem;
4243
}
4344

45+
[part=label].checked:active::before,
4446
[part=label].checked:hover::before {
4547
content: var(--pg-menu-item-hover-check, url("data:image/svg+xml; utf8, <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M 17.5,10.2501L 10.5,17.25L 6.5,13.25L 7.9,11.8L 10.5,14.4L 16.0857,8.8L 17.5,10.25Z' fill='white' /></svg>"));
4648
}

0 commit comments

Comments
 (0)