Skip to content

Commit 57afe3e

Browse files
btoprobtopro
committed
https://github.com/elmsln/issues/issues/1972
1 parent 7b10a9b commit 57afe3e

File tree

6 files changed

+83
-43
lines changed

6 files changed

+83
-43
lines changed

‎elements/grid-plate/grid-plate.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ class GridPlate extends LitElement {
391391
this.ready = true;
392392
}, 100);
393393
this.resize();
394-
window.dispatchEvent(
394+
globalThis.dispatchEvent(
395395
new CustomEvent("responsive-element", {
396396
detail: {
397397
element: this,
@@ -418,7 +418,11 @@ class GridPlate extends LitElement {
418418
return {
419419
type: "grid",
420420
canScale: true,
421-
421+
designSystem: {
422+
card: true,
423+
accent: true,
424+
primary: true,
425+
},
422426
canEditSource: true,
423427
contentEditable: false,
424428
gizmo: {
@@ -672,7 +676,7 @@ class GridPlate extends LitElement {
672676
});
673677
}
674678
resize() {
675-
window.dispatchEvent(new Event("resize"));
679+
globalThis.dispatchEvent(new Event("resize"));
676680
}
677681
/**
678682
* gets the column widths based on selected layout and current responsive width

‎elements/grid-plate/src/grid-plate.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ class GridPlate extends LitElement {
391391
this.ready = true;
392392
}, 100);
393393
this.resize();
394-
window.dispatchEvent(
394+
globalThis.dispatchEvent(
395395
new CustomEvent("responsive-element", {
396396
detail: {
397397
element: this,
@@ -418,7 +418,11 @@ class GridPlate extends LitElement {
418418
return {
419419
type: "grid",
420420
canScale: true,
421-
421+
designSystem: {
422+
card: true,
423+
accent: true,
424+
primary: true,
425+
},
422426
canEditSource: true,
423427
contentEditable: false,
424428
gizmo: {
@@ -672,7 +676,7 @@ class GridPlate extends LitElement {
672676
});
673677
}
674678
resize() {
675-
window.dispatchEvent(new Event("resize"));
679+
globalThis.dispatchEvent(new Event("resize"));
676680
}
677681
/**
678682
* gets the column widths based on selected layout and current responsive width

‎elements/hax-body/hax-body.js

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,6 +1965,28 @@ class HaxBody extends I18NMixin(UndoManagerBehaviors(SimpleColors)) {
19651965
if (node.tagName === "GRID-PLATE") {
19661966
if (add) {
19671967
switch (node.layout) {
1968+
case "2-1":
1969+
node.layout = "2-1-1";
1970+
changed = true;
1971+
break;
1972+
case "1-2":
1973+
node.layout = "1-2-1";
1974+
changed = true;
1975+
break;
1976+
case "3-1":
1977+
node.layout = "2-1-1";
1978+
changed = true;
1979+
break;
1980+
case "1-3":
1981+
node.layout = "1-1-2";
1982+
changed = true;
1983+
break;
1984+
case "2-1-1":
1985+
case "1-2-1":
1986+
case "1-1-2":
1987+
node.layout = "1-1-1-1";
1988+
changed = true;
1989+
break;
19681990
case "1":
19691991
node.layout = "1-1";
19701992
changed = true;
@@ -1977,17 +1999,13 @@ class HaxBody extends I18NMixin(UndoManagerBehaviors(SimpleColors)) {
19771999
node.layout = "1-1-1-1";
19782000
changed = true;
19792001
break;
1980-
case "1-1-1-1":
1981-
node.layout = "1-1-1-1-1";
1982-
changed = true;
1983-
break;
1984-
case "1-1-1-1-1":
1985-
node.layout = "1-1-1-1-1-1";
1986-
changed = true;
1987-
break;
19882002
}
19892003
} else {
19902004
switch (node.layout) {
2005+
case "2-1":
2006+
case "1-2":
2007+
case "1-3":
2008+
case "3-1":
19912009
case "1-1":
19922010
// implies we are removing the grid plate
19932011
let cloneEl;
@@ -2019,14 +2037,15 @@ class HaxBody extends I18NMixin(UndoManagerBehaviors(SimpleColors)) {
20192037
node.layout = "1-1-1";
20202038
changed = true;
20212039
break;
2022-
case "1-1-1-1-1":
2023-
node.layout = "1-1-1-1";
2040+
case "2-1-1":
2041+
node.layout = "2-1";
20242042
changed = true;
2025-
break;
2026-
case "1-1-1-1-1-1":
2027-
node.layout = "1-1-1-1-1";
2043+
break;
2044+
case "1-2-1":
2045+
case "1-1-2":
2046+
node.layout = "1-2";
20282047
changed = true;
2029-
break;
2048+
break;
20302049
}
20312050
}
20322051
// if left, nudge everything over 1, right simple
@@ -2036,7 +2055,7 @@ class HaxBody extends I18NMixin(UndoManagerBehaviors(SimpleColors)) {
20362055
this.contextMenus.plate.shadowRoot.querySelector("#rightremove");
20372056
right.disabled = false;
20382057
rightremove.disabled = false;
2039-
if (node.layout == "1-1-1-1-1-1") {
2058+
if (node.layout == "1-1-1-1") {
20402059
right.disabled = true;
20412060
}
20422061
if (side == "left") {

‎elements/hax-body/lib/hax-plate-context.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ class HaxPlateContext extends I18NMixin(HaxContextBehaviors(LitElement)) {
517517
right.disabled = false;
518518
rightremove.disabled = false;
519519
if (active && active.tagName == "GRID-PLATE") {
520-
if (active.layout == "1-1-1-1-1-1") {
520+
if (active.layout == "1-1-1-1") {
521521
right.disabled = true;
522522
}
523523
} else {

‎elements/hax-body/src/hax-body.js

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,6 +1965,28 @@ class HaxBody extends I18NMixin(UndoManagerBehaviors(SimpleColors)) {
19651965
if (node.tagName === "GRID-PLATE") {
19661966
if (add) {
19671967
switch (node.layout) {
1968+
case "2-1":
1969+
node.layout = "2-1-1";
1970+
changed = true;
1971+
break;
1972+
case "1-2":
1973+
node.layout = "1-2-1";
1974+
changed = true;
1975+
break;
1976+
case "3-1":
1977+
node.layout = "2-1-1";
1978+
changed = true;
1979+
break;
1980+
case "1-3":
1981+
node.layout = "1-1-2";
1982+
changed = true;
1983+
break;
1984+
case "2-1-1":
1985+
case "1-2-1":
1986+
case "1-1-2":
1987+
node.layout = "1-1-1-1";
1988+
changed = true;
1989+
break;
19681990
case "1":
19691991
node.layout = "1-1";
19701992
changed = true;
@@ -1977,17 +1999,13 @@ class HaxBody extends I18NMixin(UndoManagerBehaviors(SimpleColors)) {
19771999
node.layout = "1-1-1-1";
19782000
changed = true;
19792001
break;
1980-
case "1-1-1-1":
1981-
node.layout = "1-1-1-1-1";
1982-
changed = true;
1983-
break;
1984-
case "1-1-1-1-1":
1985-
node.layout = "1-1-1-1-1-1";
1986-
changed = true;
1987-
break;
19882002
}
19892003
} else {
19902004
switch (node.layout) {
2005+
case "2-1":
2006+
case "1-2":
2007+
case "1-3":
2008+
case "3-1":
19912009
case "1-1":
19922010
// implies we are removing the grid plate
19932011
let cloneEl;
@@ -2019,14 +2037,15 @@ class HaxBody extends I18NMixin(UndoManagerBehaviors(SimpleColors)) {
20192037
node.layout = "1-1-1";
20202038
changed = true;
20212039
break;
2022-
case "1-1-1-1-1":
2023-
node.layout = "1-1-1-1";
2040+
case "2-1-1":
2041+
node.layout = "2-1";
20242042
changed = true;
2025-
break;
2026-
case "1-1-1-1-1-1":
2027-
node.layout = "1-1-1-1-1";
2043+
break;
2044+
case "1-2-1":
2045+
case "1-1-2":
2046+
node.layout = "1-2";
20282047
changed = true;
2029-
break;
2048+
break;
20302049
}
20312050
}
20322051
// if left, nudge everything over 1, right simple
@@ -2036,7 +2055,7 @@ class HaxBody extends I18NMixin(UndoManagerBehaviors(SimpleColors)) {
20362055
this.contextMenus.plate.shadowRoot.querySelector("#rightremove");
20372056
right.disabled = false;
20382057
rightremove.disabled = false;
2039-
if (node.layout == "1-1-1-1-1-1") {
2058+
if (node.layout == "1-1-1-1") {
20402059
right.disabled = true;
20412060
}
20422061
if (side == "left") {

‎elements/product-card/lib/hax-element-card-list.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,6 @@ class HAXElementCardList extends LitElement {
325325
case 4:
326326
this._layout = "1-1-1-1";
327327
break;
328-
case 5:
329-
this._layout = "1-1-1-1-1";
330-
break;
331-
case 6:
332-
this._layout = "1-1-1-1-1-1";
333-
break;
334328
default:
335329
this._layout = "1-1";
336330
break;

0 commit comments

Comments
 (0)