From feeedb0bf31314b182e7bbc135182f6e0bc859b2 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Mon, 26 Oct 2026 15:45:33 +0100 Subject: update zilch --- src/app/components/gallery/index.css | 33 ++++++++++++++++++- src/app/components/gallery/index.html | 14 +++++++- src/app/components/gallery/root.zig | 60 +++++++++++++++++++++++++++++++---- src/app/components/image/index.css | 24 ++++++++++++-- src/app/components/image/index.html | 1 + src/app/components/image/root.zig | 16 +++++++++- src/app/theme.css | 1 - 7 files changed, 136 insertions(+), 13 deletions(-) (limited to 'src/app') diff --git a/src/app/components/gallery/index.css b/src/app/components/gallery/index.css index c6a5817..35cab60 100644 --- a/src/app/components/gallery/index.css +++ b/src/app/components/gallery/index.css @@ -1,3 +1,34 @@ :host { - background: gray; + background: black; + --gallery-splits: 5; + display: flex; + flex-wrap: wrap; + overflow: auto; +} + +#control { + position: absolute; + bottom: 10px; + right: 70px; + width: 100px; + height: 50px; + background: var(--primary); + border-radius: 50px; + display: grid; + grid-template-columns: 1fr 1fr; + cursor: pointer; + user-select: none; + + div { + user-select: none; + color: var(--color); + width: 50px; + height: 50px; + text-align: center; + align-content: center; + } +} + +app-image { + width: calc(100% / var(--gallery-splits)); } diff --git a/src/app/components/gallery/index.html b/src/app/components/gallery/index.html index 8b13789..efa58a3 100644 --- a/src/app/components/gallery/index.html +++ b/src/app/components/gallery/index.html @@ -1 +1,13 @@ - +
+
+ + + + +
+
+ + + +
+
diff --git a/src/app/components/gallery/root.zig b/src/app/components/gallery/root.zig index 7a06d5f..1eef707 100644 --- a/src/app/components/gallery/root.zig +++ b/src/app/components/gallery/root.zig @@ -1,4 +1,6 @@ const std = @import("std"); +const gpa = std.heap.wasm_allocator; + const zilch = @import("zilch"); const Object = zilch.Object; const components = @import("../root.zig"); @@ -16,23 +18,69 @@ pub const component: zilch.Component = .build(.{ const Self = @This(); element: *Object, -image: *Image, body: *Object, +pool: std.heap.MemoryPool(Image), +images: std.ArrayList(*Image), +style: *zilch.Object, +splits: usize, pub fn init(self: *Self, element: *Object) !void { var env: zilch.Env = .default; defer env.deinit(); self.element = element; + self.style = blk: { + var style = self.element.get(&env, "style"); + break :blk try style.await(&env, *zilch.Object); + }; + self.pool = .empty; + self.images = .empty; + self.splits = 5; + + const number_of_boxes: u32 = 1000; - self.image = try std.heap.wasm_allocator.create(Image); - var el = Image.component.new(self.image, &env); - try self.image.init(try el.await(&env)); + { + var elements: []zilch.Env.Future(*Object) = try gpa.alloc(zilch.Env.Future(*Object), number_of_boxes); + defer gpa.free(elements); + for (0..number_of_boxes) |index| { + const image = try self.pool.create(gpa); + elements[index] = Image.component.new(image, &env); + try self.images.append(gpa, image); + } + + for (elements[0..], self.images.items) |*el, image| { + try image.init(try el.await(&env)); + var future = image.setUrl(&env, "image/1"); + future.ignore(&env); + } + } var body = self.element.get(&env, "shadowRoot"); - var append_call = Object.call(body, &env, "append", .{self.image.element}); - append_call.ignore(&env); + for (self.images.items) |image| { + var append_call = Object.call(body, &env, "append", .{image.element}); + append_call.ignore(&env); + } self.body = try body.await(&env, *Object); } + +pub fn zoomIn(self: *Self) !void { + var env: zilch.Env = .default; + defer env.deinit(); + + self.splits = @max(1, self.splits - 1); + + var future = self.style.call(&env, "setProperty", .{ "--gallery-splits", self.splits }); + future.ignore(&env); +} + +pub fn zoomOut(self: *Self) !void { + var env: zilch.Env = .default; + defer env.deinit(); + + self.splits = @min(10, self.splits + 1); + + var future = self.style.call(&env, "setProperty", .{ "--gallery-splits", self.splits }); + future.ignore(&env); +} diff --git a/src/app/components/image/index.css b/src/app/components/image/index.css index 034a509..d9a9ff5 100644 --- a/src/app/components/image/index.css +++ b/src/app/components/image/index.css @@ -1,8 +1,26 @@ .image { - width: calc(100% / var(--gallery-splits)); - padding-bottom: calc(100% / var(--gallery-splits)); + width: 100%; + padding-bottom: 100%; height: 0; - background: red; + background: var(--image); background-size: cover; background-position: center; } + +img { + content: var(--image); + width: 100%; + display: none; + visibility: hidden; +} + +@container style(--gallery-splits: 1) { + .image { + padding-bottom: 0px; + height: unset; + } + + img { + display: unset; + } +} diff --git a/src/app/components/image/index.html b/src/app/components/image/index.html index bd124ad..2b135dc 100644 --- a/src/app/components/image/index.html +++ b/src/app/components/image/index.html @@ -1,2 +1,3 @@
+
diff --git a/src/app/components/image/root.zig b/src/app/components/image/root.zig index c9aeef4..1d46d30 100644 --- a/src/app/components/image/root.zig +++ b/src/app/components/image/root.zig @@ -1,3 +1,4 @@ +const std = @import("std"); const zilch = @import("zilch"); pub const component: zilch.Component = .build(.{ @@ -10,9 +11,22 @@ pub const component: zilch.Component = .build(.{ const Self = @This(); element: *zilch.Object, +style: *zilch.Object, pub fn init(self: *Self, element: *zilch.Object) !void { + var env: zilch.Env = .default; + defer env.deinit(); + self.element = element; + self.style = blk: { + var style = self.element.get(&env, "style"); + break :blk try style.await(&env, *zilch.Object); + }; } -pub const connect = component.connect; +pub fn setUrl(self: *Self, env: *zilch.Env, url: []const u8) zilch.Env.Future(void) { + var buffer: [1024]u8 = undefined; + var writer: std.Io.Writer = .fixed(&buffer); + writer.print("url({s})", .{url}) catch unreachable; + return .fromAny(self.style.call(env, "setProperty", .{"--image", writer.buffered()})); +} diff --git a/src/app/theme.css b/src/app/theme.css index 1973c82..1034db2 100644 --- a/src/app/theme.css +++ b/src/app/theme.css @@ -16,5 +16,4 @@ body { app-gallery { width: 100%; height: 100%; - display: block; } -- cgit v1.2.3-70-g09d2