Skip to content

Fix DOM Inspector flex-box support #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elsassph wants to merge 1 commit into
base: feature/rtl
Choose a base branch
from
Open

Fix DOM Inspector flex-box support #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions devtools/lightning-inspect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ window.attachInspector = function({Application, Element, ElementCore, Stage, Com
if (!f[3]) c["colorBr"] = pv;
break;
default:
c[rn] = pv;
if (c[rn] !== pv) { // prevent infinite update loop
c[rn] = pv;
}
}

// Set final value, not the transitioned value.
Expand Down Expand Up @@ -352,7 +354,11 @@ window.attachInspector = function({Application, Element, ElementCore, Stage, Com
},
set: function(v) {
if (this.$x !== v) {
val(this, 'x', v, 0);
if (this.hasFlexLayout()) {
val(this, 'x', this.layout.originalX, 0); // show non computed value
} else {
val(this, 'x', v, 0);
}
this.$x = v;
this.updateLeft();
}
Expand All @@ -366,7 +372,11 @@ window.attachInspector = function({Application, Element, ElementCore, Stage, Com
},
set: function(v) {
if (this.$y !== v) {
val(this, 'y', v, 0);
if (this.hasFlexLayout()) {
val(this, 'y', this.layout.originalY, 0); // show non computed value
} else {
val(this, 'y', v, 0);
}
this.$y = v;
this.updateTop();
}
Expand Down
6 changes: 4 additions & 2 deletions src/tree/core/ElementCore.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,9 @@ export default class ElementCore {
} else {
this._disableFuncX();
if (this.hasFlexLayout()) {
this.x += (v - this._layout.originalX);
const dx = v - this._layout.originalX;
this._layout.setOriginalXWithoutUpdatingLayout(v);
this.x += dx;
} else {
this.x = v;
}
Expand Down Expand Up @@ -261,8 +262,9 @@ export default class ElementCore {
} else {
this._disableFuncY();
if (this.hasFlexLayout()) {
this.y += (v - this._layout.originalY);
const dy = v - this._layout.originalY;
this._layout.setOriginalYWithoutUpdatingLayout(v);
this.y += dy;
} else {
this.y = v;
}
Expand Down