Skip to content

WIP: core: switch to yoga ffi bindings #631

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
simonklee wants to merge 2 commits into
base: main
Choose a base branch
from
Open

WIP: core: switch to yoga ffi bindings #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07bcd6e
core: switch to yoga ffi bindings
simonklee Feb 5, 2026
b3790d0
Merge branch 'main' into yoga-ffi
simonklee Feb 6, 2026
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
18 changes: 15 additions & 3 deletions bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
"web-tree-sitter": "0.25.10"
},
"dependencies": {
"@simonklee/yoga": "0.2.30",
"bun-ffi-structs": "0.1.2",
"diff": "8.0.2",
"jimp": "1.6.0",
"marked": "17.0.1",
"yoga-layout": "3.2.1"
"marked": "17.0.1"
},
"peerDependencies": {
"web-tree-sitter": "0.25.10"
Expand Down
1 change: 1 addition & 0 deletions packages/core/scripts/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ if (buildLib) {
mkdirSync(distDir, { recursive: true })

const externalDeps: string[] = [
...Object.keys(packageJson.dependencies || {}),
...Object.keys(packageJson.optionalDependencies || {}),
...Object.keys(packageJson.peerDependencies || {}),
]
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Renderable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventEmitter } from "events"
import Yoga, { Direction, Display, Edge, FlexDirection, type Config, type Node as YogaNode } from "yoga-layout"
import Yoga, { Direction, Display, Edge, FlexDirection, type Config, type Node as YogaNode } from "@simonklee/yoga"
import { OptimizedBuffer } from "./buffer"
import type { KeyEvent, PasteEvent } from "./lib/KeyHandler"
import type { MouseEventType } from "./lib/parse.mouse"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ export * from "./renderer"
export * from "./renderables"
export * from "./zig"
export * from "./console"
export * as Yoga from "yoga-layout"
export * as Yoga from "@simonklee/yoga"
2 changes: 1 addition & 1 deletion packages/core/src/lib/yoga.options.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
PositionType,
Unit,
Wrap,
} from "yoga-layout"
} from "@simonklee/yoga"

describe("parseBoxSizing", () => {
test("parses border-box", () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/lib/yoga.options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
PositionType,
Unit,
Wrap,
} from "yoga-layout"
} from "@simonklee/yoga"

export type AlignString =
| "auto"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/renderables/Box.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Edge, Gutter } from "yoga-layout"
import { Edge, Gutter } from "@simonklee/yoga"
import { type RenderableOptions, Renderable } from "../Renderable"
import type { OptimizedBuffer } from "../buffer"
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/renderables/EditBufferRenderable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { EditorView, type VisualCursor } from "../editor-view"
import { RGBA, parseColor } from "../lib/RGBA"
import type { RenderContext, Highlight, CursorStyleOptions, LineInfoProvider, LineInfo } from "../types"
import type { OptimizedBuffer } from "../buffer"
import { MeasureMode } from "yoga-layout"
import { MeasureMode } from "@simonklee/yoga"
import type { SyntaxStyle } from "../syntax-style"

export interface CursorChangeEvent {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/renderables/LineNumberRenderable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Renderable, type RenderableOptions } from "../Renderable"
import { OptimizedBuffer } from "../buffer"
import type { RenderContext, LineInfoProvider } from "../types"
import { RGBA, parseColor } from "../lib/RGBA"
import { MeasureMode } from "yoga-layout"
import { MeasureMode } from "@simonklee/yoga"

export interface LineSign {
before?: string
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/renderables/TextBufferRenderable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TextBufferView } from "../text-buffer-view"
import { RGBA, parseColor } from "../lib/RGBA"
import { type RenderContext, type LineInfoProvider } from "../types"
import type { OptimizedBuffer } from "../buffer"
import { MeasureMode } from "yoga-layout"
import { MeasureMode } from "@simonklee/yoga"
import type { LineInfo } from "../zig"
import { SyntaxStyle } from "../syntax-style"

Expand Down
Loading