Skip to content

fix: border sizing when using different box-sizing settings #114

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

Merged
Zyie merged 4 commits into from
Sep 18, 2025
Merged

fix: border sizing when using different box-sizing settings #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce9daba
fix: mixing layout and non layout children
Zyie Sep 1, 2025
ce9827c
better sort-child implementation
Zyie Sep 2, 2025
0f02cef
fix: borderSizing crashing with scroll enabled
Zyie Sep 12, 2025
c380166
Merge branch 'main' into fix/box-sizing
Zyie Sep 18, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"pretest:unit": "tsx tests/scripts/generate-story-imports.ts",
"test:unit": "vitest run",
"test:unit:watch": "vitest --browser.headless=false",
"watch": "xs watch",
"watch": "vite build --watch",
"prepare": "husky"
},
"lint-staged": {
Expand Down
6 changes: 5 additions & 1 deletion src/components/LayoutContainer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,11 @@ export class LayoutContainer extends Container {
* @protected
*/
protected _drawBackground(computedLayout: ComputedLayout) {
const borderWidth = this.layout!.yoga.getBorder(Edge.All);
let borderWidth = this.layout!.yoga.getBorder(Edge.All);

if (isNaN(borderWidth) || borderWidth < 0) {
borderWidth = 0;
}
const boxSizing = this.layout!.yoga.getBoxSizing();
const alignment = boxSizing === BoxSizing.BorderBox ? 1 : 0;

Expand Down
Loading