Skip to content

Commit 048308a

Browse files
committed
Bumping element and bug fixes.
1 parent 4af19f7 commit 048308a

File tree

14 files changed

+100
-18
lines changed

14 files changed

+100
-18
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"remarkable": "^2.0.1"
2626
},
2727
"devDependencies": {
28-
"@pictogrammers/element": "0.0.70",
28+
"@pictogrammers/element": "0.0.71",
2929
"@pictogrammers/element-jest": "^0.1.10",
3030
"@pictogrammers/element-webpack": "^0.1.56",
3131
"cross-env": "^7.0.3",

src/pg/inputPixelEditor/__examples__/basic/basic.ts

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import { Component, Part } from '@pictogrammers/element';
22
import PgInputPixelEditor from '../../inputPixelEditor';
3+
import PgTable, { createTableItem } from '../../../table/table';
4+
import PgTableCellButtonIcon from '../../../tableCellButtonIcon/tableCellButtonIcon';
35
import { maskToBitmap } from '../../utils/maskToBitmap';
46
import { patterns } from './constants';
57

68
import template from './basic.html';
79
import style from './basic.css';
8-
import PgTable from 'pg/table/table';
10+
11+
const IconTrash = 'M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z';
912

1013
@Component({
1114
selector: 'x-pg-input-pixel-editor-basic',
@@ -45,6 +48,7 @@ export default class XPgInputPixelEditorBasic extends HTMLElement {
4548
@Part() $savePng: HTMLInputElement;
4649

4750
@Part() $addLayer: HTMLButtonElement;
51+
@Part() $addColor: HTMLButtonElement;
4852

4953
@Part() $colors: PgTable;
5054
@Part() $layers: PgTable;
@@ -154,10 +158,12 @@ export default class XPgInputPixelEditorBasic extends HTMLElement {
154158
}, {
155159
label: 'Selected',
156160
key: 'selected',
161+
hideLabel: true,
157162
}];
158163
this.$addLayer.addEventListener('click', () => {
159164
// number[][][]
160165
// this.$input.addLayer();
166+
161167
});
162168
// Colors
163169
this.$colors.columns = [{
@@ -172,7 +178,23 @@ export default class XPgInputPixelEditorBasic extends HTMLElement {
172178
}, {
173179
label: 'Alpha',
174180
key: 'a',
181+
}, {
182+
label: 'Delete',
183+
key: 'delete',
184+
hideLabel: true,
175185
}];
186+
this.$addColor.addEventListener('click', () => {
187+
this.$colors.data.push(createTableItem({
188+
r: 5,
189+
g: 5,
190+
b: 5,
191+
a: 1,
192+
delete: {
193+
type: PgTableCellButtonIcon,
194+
icon: IconTrash
195+
}
196+
}));
197+
});
176198
}
177199

178200
handleFile(e) {

src/pg/menu/menu.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ export default class PgMenu extends HTMLElement {
116116
return ele.getHeight();
117117
}
118118

119-
}
119+
}

src/pg/menuItemIcon/__examples__/basic/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="example">
1+
<div class="example" part="example">
22
<pg-menu-item-icon part="item"></pg-menu-item-icon>
33
</div>
44
<div>

src/pg/menuItemIcon/__examples__/basic/basic.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export default class XPgMenuItemIconBasic extends HTMLElement {
1919
@Part() $iconFolder: HTMLButtonElement;
2020
@Part() $checkedValue: HTMLDivElement;
2121
@Part() $disabledValue: HTMLDivElement;
22+
@Part() $example: HTMLDivElement;
2223

2324
connectedCallback() {
2425
this.$item.icon = IconFile;
@@ -45,6 +46,12 @@ export default class XPgMenuItemIconBasic extends HTMLElement {
4546
this.$checkedToggle.addEventListener('change', (e: any) => {
4647
this.$item.checked = e.target.checked;
4748
this.$checkedValue.textContent = `${this.$item.checked}`;
49+
// simulate check column
50+
if (e.target.checked) {
51+
this.$example.style.setProperty('--pg-menu-_has-check', 'true');
52+
} else {
53+
this.$example.style.removeProperty('--pg-menu-_has-check');
54+
}
4855
});
4956

5057
this.$disabledToggle.addEventListener('change', (e: any) => {
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[part=table] {
2-
--pg-button-padding: 0;
3-
--pg-button-border-width: 0;
4-
}

src/pg/tableCellButtonIcon/tableCellButtonIcon.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@
1111
vertical-align: middle;
1212
justify-items: center;
1313
--pg-button-background-color: transparent;
14+
--pg-button-padding: 0;
15+
--pg-button-border-width: 0;
1416
}

src/pg/tableCellCheck/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# `PgTableCellCheck`
2+
3+
See `PgTable`. Default cell render for `string` type.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
:host {
2+
display: contents;
3+
}
4+
5+
[part=label] {
6+
display: table-cell;
7+
padding: 0.125rem 0.5rem;
8+
background-color: var(--pg-table-row-background-color);
9+
border-top: 0;
10+
border-radius: 0.125rem;
11+
vertical-align: middle;
12+
}

0 commit comments

Comments
 (0)