Skip to content

Commit c56c383

Browse files
committed
Layer selection order matters.
1 parent 9981365 commit c56c383

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ export default class XPgInputPixelEditorBasic extends HTMLElement {
200200
select: {
201201
type: PgTableCellButtonIcon,
202202
icon: IconLayerEdit,
203-
value: 0,
203+
value: this.$layers.data.length,
204204
}
205205
})
206206
];
@@ -209,24 +209,23 @@ export default class XPgInputPixelEditorBasic extends HTMLElement {
209209
switch (key) {
210210
case 'select':
211211
const selectedLayers: number[] = [];
212-
getRows().forEach(({ getColumn }) => {
212+
getRows().forEach(({ getColumn, index: index2 }) => {
213213
if (getColumn('selected').value) {
214-
selectedLayers.push(getColumn('select').value);
214+
selectedLayers.push(index2);
215215
}
216216
});
217217
if (
218218
selectedLayers.length === 1
219-
&& selectedLayers[0] === getColumn('select').value
219+
&& selectedLayers[0] === index
220220
) {
221221
// ignore
222222
} else {
223-
const index = getColumn('select').value;
224223
const currentValue = getColumn('selected').value;
225224
getColumn('selected').value = !currentValue;
226225
if (currentValue) {
227-
selectedLayers.splice(selectedLayers.findIndex(x => x ))
226+
selectedLayers.splice(selectedLayers.findIndex(x => x === index), 1);
228227
} else {
229-
selectedLayers.push(getColumn('select').value);
228+
selectedLayers.push(index);
230229
}
231230
}
232231
console.log('selected', selectedLayers);

src/pg/tableRow/tableRow.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@ export default class PgTableRow extends HTMLElement {
5353
getRows: () => {
5454
if (!this.parentNode) { return; }
5555
const items = Array.from(this.parentNode.children) as PgTableRow[];
56-
return items.map((row) => {
56+
return items.map((row, index) => {
5757
return {
5858
getColumn: (key: string) => {
5959
return row.items.find(x => x.key === key);
6060
},
61+
index,
6162
};
6263
});
6364
},

0 commit comments

Comments
 (0)