@neta-art/cohub 11.0.0 → 11.2.0

package/dist/board/render/renderers/image-card-renderer.js

@@ -1,20 +1,9 @@
+import { cardElevation, containRect, drawCardSurface, traceCardOutline } from "../surface.js";
 import { positionShell } from "./base-card-renderer.js";
 import { drawFarPlate } from "./far-plate.js";
 import { Container, Graphics, Rectangle, Sprite, Texture } from "pixi.js";
 //#region src/board/render/renderers/image-card-renderer.ts
 const partsByContainer = /* @__PURE__ */ new WeakMap();
-const RADIUS = 2;
-function layoutContain(sprite, width, height) {
-	const texture = sprite.texture;
-	const tw = texture.width;
-	const th = texture.height;
-	if (!tw || !th) return;
-	const scale = Math.min(width / tw, height / th);
-	sprite.width = tw * scale;
-	sprite.height = th * scale;
-	sprite.x = (width - sprite.width) / 2;
-	sprite.y = (height - sprite.height) / 2;
-}
 function cropRect(crop) {
 	if (!crop) return null;
 	const w = Math.min(crop.w, 1 - crop.x);
@@ -48,70 +37,85 @@ function showTexture(parts, texture, crop) {
 	if (parts.sprite.texture !== display) parts.sprite.texture = display;
 	if (previous && previous !== parts.cropped) previous.destroy(false);
 }
+const PRINT_MARGIN = 6;
 function sync(container, item, context) {
 	const parts = partsByContainer.get(container);
 	if (!parts) return;
 	positionShell(parts.root, item);
 	const { width, height } = item.frame;
-	const selected = context.selectedIds.has(item.id);
-	const hovered = context.hoveredId === item.id;
 	const key = context.assetKey(item);
 	const texture = key ? context.getTexture(key) : null;
 	const failed = Boolean(key && !texture && context.hasError(key));
-	const texId = texture ? `${texture.width}x${texture.height}` : "none";
+	const elevation = cardElevation(context, item.id);
 	const sig = [
 		key ?? "",
 		width,
 		height,
-		selected,
-		hovered,
-		texId,
+		texture ? `${texture.width}x${texture.height}` : "none",
 		JSON.stringify(item.props.crop ?? null),
 		failed,
-		context.colorScheme
+		elevation,
+		context.themeKey
 	].join("|");
 	if (sig === parts.sig) return;
 	parts.sig = sig;
 	showTexture(parts, texture, item.props.crop);
+	const display = parts.sprite.texture;
+	const framed = context.style.media === "framed";
+	const margin = framed ? Math.min(PRINT_MARGIN, width / 8, height / 8) : 0;
+	const area = {
+		x: margin,
+		y: margin,
+		width: width - margin * 2,
+		height: height - margin * 2
+	};
+	const fitted = texture ? containRect(area.width, area.height, display.width, display.height) : {
+		...area,
+		x: 0,
+		y: 0
+	};
+	const picture = {
+		x: area.x + fitted.x,
+		y: area.y + fitted.y,
+		width: fitted.width,
+		height: fitted.height
+	};
+	const card = framed ? {
+		x: picture.x - margin,
+		y: picture.y - margin,
+		width: picture.width + margin * 2,
+		height: picture.height + margin * 2
+	} : picture;
 	parts.sprite.visible = Boolean(texture);
-	if (texture) layoutContain(parts.sprite, width, height);
-	parts.placeholder.clear();
-	if (!texture) {
-		parts.placeholder.roundRect(0, 0, width, height, RADIUS).fill({
-			color: context.palette.surface,
-			alpha: .85
-		}).roundRect(0, 0, width, height, RADIUS).stroke({
-			color: failed ? context.palette.border : context.palette.hover,
-			width: 1,
-			alpha: .9
-		});
-		const cx = width / 2;
-		const cy = height / 2;
-		if (failed) parts.placeholder.moveTo(cx - 10, cy - 10).lineTo(cx + 10, cy + 10).moveTo(cx + 10, cy - 10).lineTo(cx - 10, cy + 10).stroke({
-			color: context.palette.muted,
-			width: 1.5,
-			alpha: .8
-		});
-		else parts.placeholder.circle(cx, cy, 6).stroke({
-			color: context.palette.muted,
-			width: 1.25,
-			alpha: .55
-		});
-	}
-	parts.placeholder.visible = !texture;
-	if (selected || hovered) {
-		const hasPixels = Boolean(texture) && parts.sprite.width > 0;
-		const ox = hasPixels ? parts.sprite.x : 0;
-		const oy = hasPixels ? parts.sprite.y : 0;
-		const ow = hasPixels ? parts.sprite.width : width;
-		const oh = hasPixels ? parts.sprite.height : height;
-		parts.placeholder.visible = true;
-		parts.placeholder.roundRect(ox, oy, ow, oh, RADIUS).stroke({
-			color: selected ? context.palette.brand : context.palette.muted,
-			width: selected ? 2 : 1,
-			alpha: selected ? .95 : .7
-		});
+	if (texture) {
+		parts.sprite.position.set(picture.x, picture.y);
+		parts.sprite.width = picture.width;
+		parts.sprite.height = picture.height;
 	}
+	traceCardOutline(parts.mask.clear(), picture, framed ? {
+		corner: "round",
+		radius: 0
+	} : context.style).fill({ color: 16777215 });
+	parts.placeholder.clear();
+	if (texture && !framed) return;
+	drawCardSurface(parts.placeholder, card, context.style, {
+		fill: context.palette.surface,
+		border: texture ? null : failed ? context.palette.border : context.palette.hover,
+		elevation
+	});
+	if (texture) return;
+	const cx = width / 2;
+	const cy = height / 2;
+	if (failed) parts.placeholder.moveTo(cx - 10, cy - 10).lineTo(cx + 10, cy + 10).moveTo(cx + 10, cy - 10).lineTo(cx - 10, cy + 10).stroke({
+		color: context.palette.muted,
+		width: 1.5,
+		alpha: .8
+	});
+	else parts.placeholder.circle(cx, cy, 6).stroke({
+		color: context.palette.muted,
+		width: 1.25,
+		alpha: .55
+	});
 }
 const imageCardRenderer = {
 	id: "image-card",
@@ -121,17 +125,13 @@ const imageCardRenderer = {
 		const sprite = new Sprite(Texture.EMPTY);
 		const placeholder = new Graphics();
 		const mask = new Graphics();
-		const maskBox = () => {
-			mask.clear();
-			if (item.type === "image") mask.roundRect(0, 0, item.frame.width, item.frame.height, RADIUS).fill({ color: 16777215 });
-		};
-		maskBox();
 		root.addChild(placeholder, sprite, mask);
 		sprite.mask = mask;
 		partsByContainer.set(root, {
 			root,
 			sprite,
 			placeholder,
+			mask,
 			sig: "",
 			cropped: null,
 			cropSource: null,
@@ -141,12 +141,7 @@ const imageCardRenderer = {
 		return root;
 	},
 	update: (container, item, context) => {
-		if (item.type !== "image") return;
-		const parts = partsByContainer.get(container);
-		if (!parts) return;
-		const mask = parts.root.children.find((child) => child !== parts.sprite && child !== parts.placeholder);
-		if (mask) mask.clear().roundRect(0, 0, item.frame.width, item.frame.height, RADIUS).fill({ color: 16777215 });
-		sync(container, item, context);
+		if (item.type === "image") sync(container, item, context);
 	},
 	renderFar: (graphics, item, context) => {
 		drawFarPlate(graphics, item.frame, {

package/dist/board/render/renderers/media-key.d.ts

@@ -0,0 +1,6 @@
+import { BoardRenderContext } from "./board-renderer-registry.js";
+import { Graphics } from "pixi.js";
+//#region src/board/render/renderers/media-key.d.ts
+declare function drawMediaPlayKey(graphics: Graphics, cx: number, cy: number, radius: number, context: BoardRenderContext, solid?: boolean): void;
+//#endregion
+export { drawMediaPlayKey };

package/dist/board/render/renderers/media-key.js

@@ -0,0 +1,39 @@
+import { tracePixelRect } from "../surface.js";
+//#region src/board/render/renderers/media-key.ts
+const MEDIA_SCRIM = 0;
+const MEDIA_INK = 16777215;
+function drawMediaPlayKey(graphics, cx, cy, radius, context, solid = false) {
+	const face = solid ? context.palette.text : MEDIA_SCRIM;
+	const ink = solid ? context.palette.surface : MEDIA_INK;
+	if (context.style.corner === "pixel") {
+		const size = Math.round(radius * 1.6);
+		tracePixelRect(graphics, Math.round(cx - size / 2), Math.round(cy - size / 2), size, size, 2).fill({
+			color: face,
+			alpha: solid ? 1 : .62
+		});
+		const cell = Math.max(1, Math.round(size / 14));
+		const x = Math.round(cx - cell * 1.5);
+		const y = Math.round(cy - cell * 3.5);
+		for (let row = 0; row < 7; row += 1) graphics.rect(x, y + row * cell, (4 - Math.abs(row - 3)) * cell, cell);
+		graphics.fill({ color: ink });
+		return;
+	}
+	graphics.circle(cx, cy, radius).fill({
+		color: face,
+		alpha: solid ? 1 : .45
+	});
+	const size = radius * .5;
+	graphics.poly([
+		cx - size * .45,
+		cy - size * .75,
+		cx + size * .8,
+		cy,
+		cx - size * .45,
+		cy + size * .75
+	]).fill({
+		color: ink,
+		alpha: .96
+	});
+}
+//#endregion
+export { drawMediaPlayKey };

package/dist/board/render/renderers/shape-card-renderer.js

@@ -2,9 +2,9 @@ import { BOARD_FONT_STACK } from "../../../protocol/dist/board-constants.js";
 import { worldPoint } from "../../model/geometry.js";
 import { itemAlpha, itemColor } from "../palette.js";
 import { syncTextResolution, syncTextWrapWidth, textResolutionForZoom } from "../text-resolution.js";
+import { dashPattern, roundRectPoints, tracePolyline, trimPolyline } from "../stroke.js";
 import { positionShell } from "./base-card-renderer.js";
 import { drawFarPlate } from "./far-plate.js";
-import { dashPattern, roundRectPoints, tracePolyline, trimPolyline } from "../stroke.js";
 import { Container, Graphics, GraphicsPath, Matrix, Text } from "pixi.js";
 //#region src/board/render/renderers/shape-card-renderer.ts
 const DEFAULT_ROUNDED_RADIUS = 8;
@@ -95,8 +95,6 @@ function sync(container, item, context) {
 	positionShell(parts.root, item);
 	const { width, height } = item.frame;
 	const { props, style } = item;
-	const selected = context.selectedIds.has(item.id);
-	const hovered = context.hoveredId === item.id;
 	const stroke = itemColor(context, style.stroke ?? style.fill, "brand");
 	const fill = itemColor(context, style.fill ?? style.stroke, "brand", "fill");
 	const fillOpacity = (style.fillOpacity ?? (style.fill ? 1 : 0)) * itemAlpha(context, style.fill ?? style.stroke);
@@ -106,8 +104,6 @@ function sync(container, item, context) {
 	const visualSig = [
 		width,
 		height,
-		selected,
-		hovered,
 		props.geometry,
 		props.path,
 		fill,
@@ -117,8 +113,7 @@ function sync(container, item, context) {
 		strokeWidth,
 		style.dash,
 		style.radius,
-		style.trim,
-		context.palette.muted
+		style.trim
 	].join("|");
 	if (visualSig !== parts.visualSig) {
 		parts.visualSig = visualSig;
@@ -130,8 +125,7 @@ function sync(container, item, context) {
 				alpha: fillOpacity
 			});
 		}
-		const lineWidth = selected ? Math.max(2.5, strokeWidth) : strokeWidth;
-		const pattern = dashPattern(style.dash, lineWidth);
+		const pattern = dashPattern(style.dash, strokeWidth);
 		const partial = style.trim !== void 0 && style.trim < 1;
 		if (strokeWidth > 0 && (!partial || style.trim)) {
 			if ((pattern || partial) && props.geometry !== "path") {
@@ -139,9 +133,9 @@ function sync(container, item, context) {
 				tracePolyline(parts.shape, trimPolyline(outlinePoints(props.geometry, width, height, radius), style.trim), pattern);
 			} else traceShapeOutline(parts.shape, props, width, height, style.radius);
 			parts.shape.stroke({
-				color: hovered && !selected ? context.palette.muted : stroke,
-				width: lineWidth,
-				alpha: (selected ? 1 : hovered ? .95 : .85) * strokeAlpha,
+				color: stroke,
+				width: strokeWidth,
+				alpha: .85 * strokeAlpha,
 				cap: partial || pattern ? "round" : "butt",
 				join: "round"
 			});

package/dist/board/render/renderers/task-card-renderer.d.ts

@@ -1,12 +1,5 @@
 import { BoardCardRenderer } from "./board-renderer-registry.js";
 //#region src/board/render/renderers/task-card-renderer.d.ts
-declare const TASK_CARD_FULL_DETAIL_ZOOM = 0.55;
-declare function containTaskPreviewRect(width: number, height: number, imageWidth: number, imageHeight: number): {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-};
 declare const taskCardRenderer: BoardCardRenderer;
 //#endregion
-export { TASK_CARD_FULL_DETAIL_ZOOM, containTaskPreviewRect, taskCardRenderer };
+export { taskCardRenderer };