Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(colors): fix invisible default color canvas, cleanup bg-message (#6614)

Seamus1c1a443b8b25
diff --git a/apps/web/src/features/channel/Call/CallOverlay.tsx b/apps/web/src/features/channel/Call/CallOverlay.tsx
index 92fb5beed7..7c68435846 100644
--- a/apps/web/src/features/channel/Call/CallOverlay.tsx
+++ b/apps/web/src/features/channel/Call/CallOverlay.tsx
@@ -44,7 +44,7 @@ function ParticipantTileWrapper(props: {
return (
<div
class={cn(
- 'relative flex items-center justify-center rounded-lg overflow-hidden bg-message min-h-30 border border-edge-muted',
+ 'relative flex items-center justify-center rounded-lg overflow-hidden bg-panel min-h-30 border border-edge-muted',
props.isSpeaking && 'ring-inset ring-2 ring-accent',
props.isConnecting && 'animate-pulse',
props.class
@@ -211,7 +211,7 @@ function ScreenShareTile(props: { participant: RemoteParticipant }) {
};
return (
- <div class="relative size-full flex items-center justify-center rounded-lg overflow-hidden bg-message border border-edge-muted">
+ <div class="relative size-full flex items-center justify-center rounded-lg overflow-hidden bg-panel border border-edge-muted">
<TrackView track={screenTrack()} fit="contain" />
<VideoTag variant="truncated">{displayName()}'s screen</VideoTag>
diff --git a/apps/web/src/features/email-message/components/message-card.test.tsx b/apps/web/src/features/email-message/components/message-card.test.tsx
index 5577b5df9c..aa7aa5cf23 100644
--- a/apps/web/src/features/email-message/components/message-card.test.tsx
+++ b/apps/web/src/features/email-message/components/message-card.test.tsx
@@ -43,7 +43,7 @@ describe('MessageCard', () => {
'[data-message-body-id="message-1"]'
)!;
expect(card.classList.contains('bg-composer')).toBe(!touch);
- expect(card.classList.contains('bg-message')).toBe(touch);
+ expect(card.classList.contains('bg-surface-1')).toBe(touch);
expect(
container.querySelector('[data-layer], [data-surface]')
).toBeNull();
diff --git a/apps/web/src/features/email-message/components/message-card.tsx b/apps/web/src/features/email-message/components/message-card.tsx
index a0307ce3d6..837f4e6bb3 100644
--- a/apps/web/src/features/email-message/components/message-card.tsx
+++ b/apps/web/src/features/email-message/components/message-card.tsx
@@ -36,7 +36,7 @@ export function MessageCard(props: MessageCardProps) {
as="div"
class={cn(
'relative p-4 outline-none',
- props.isTouch && 'rounded-lg bg-message border border-edge-muted',
+ props.isTouch && 'rounded-lg bg-surface-1 border border-edge-muted',
'mobile:rounded-none mobile:border-0 mobile:border-t mobile:bg-transparent mobile:px-4 mobile:ring-0 mobile:shadow-none mobile:focus-visible:bg-hover',
props.isTouch
? props.isSelected
diff --git a/apps/web/src/features/entity/extractors-search/search-content-hit-row.tsx b/apps/web/src/features/entity/extractors-search/search-content-hit-row.tsx
index dc4f7f57a4..fadf7b208a 100644
--- a/apps/web/src/features/entity/extractors-search/search-content-hit-row.tsx
+++ b/apps/web/src/features/entity/extractors-search/search-content-hit-row.tsx
@@ -29,7 +29,7 @@ export function SearchContentHitRow(props: SearchContentHitRowProps) {
return (
<div
class={cn(
- 'ph-no-capture flex p-2 pr-0 my-1 border-l-2 border-edge-muted bg-message gap-4 hover:bg-hover'
+ 'ph-no-capture flex p-2 pr-0 my-1 border-l-2 border-edge-muted bg-surface-1 gap-4 hover:bg-hover'
)}
onClick={handleClick}
role="button"
diff --git a/apps/web/src/lib/core/component/AI/component/debug/StaticMarkdownStream.tsx b/apps/web/src/lib/core/component/AI/component/debug/StaticMarkdownStream.tsx
index 75895ad3b7..0313807964 100644
--- a/apps/web/src/lib/core/component/AI/component/debug/StaticMarkdownStream.tsx
+++ b/apps/web/src/lib/core/component/AI/component/debug/StaticMarkdownStream.tsx
@@ -312,7 +312,7 @@ export default function StaticMarkdownStreamDebug() {
{progress()}%
</div>
</div>
- <div class="min-h-[420px] flex-1 overflow-auto rounded-sm border border-edge-muted bg-message p-4">
+ <div class="min-h-[420px] flex-1 overflow-auto rounded-sm border border-edge-muted bg-surface-1 p-4">
<Show
when={renderedText().length > 0}
fallback={
diff --git a/apps/web/src/lib/core/internal/DataDebug.tsx b/apps/web/src/lib/core/internal/DataDebug.tsx
index 2512123630..1951731556 100644
--- a/apps/web/src/lib/core/internal/DataDebug.tsx
+++ b/apps/web/src/lib/core/internal/DataDebug.tsx
@@ -61,7 +61,7 @@ function SignalDebugCard(props: SignalDebugCardProps) {
<Copy class="size-4" />
</button>
</Layer>
- <pre class="text-xs bg-message p-3 rounded overflow-auto max-h-80 border border-edge">
+ <pre class="text-xs p-3 rounded overflow-auto max-h-80 border border-edge">
{formatJson(props.data)}
</pre>
</div>
diff --git a/apps/web/src/lib/core/util/oklchToRgb.test.ts b/apps/web/src/lib/core/util/oklchToRgb.test.ts
new file mode 100644
index 0000000000..0a106061cd
--- /dev/null
+++ b/apps/web/src/lib/core/util/oklchToRgb.test.ts
@@ -0,0 +1,15 @@
+import { describe, expect, it } from 'vitest';
+import { oklchToHex } from './oklchToRgb';
+
+describe('oklchToHex', () => {
+ it('converts neutral colors with a missing hue to visible hex colors', () => {
+ expect(oklchToHex('oklch(97% 0 none)')).toBe('#f5f5f5');
+ expect(oklchToHex('oklch(37.1% 0 none)')).toBe('#404040');
+ });
+
+ it('preserves numeric hue conversion', () => {
+ expect(oklchToHex('oklch(100% 0 0)')).toBe('#ffffff');
+ expect(oklchToHex('oklch(0% 0 0)')).toBe('#000000');
+ expect(oklchToHex('oklch(50.5% 0.213 27.518)')).toBe('#c10007');
+ });
+});
diff --git a/apps/web/src/lib/core/util/oklchToRgb.ts b/apps/web/src/lib/core/util/oklchToRgb.ts
index e8e240732a..e01ca0a318 100644
--- a/apps/web/src/lib/core/util/oklchToRgb.ts
+++ b/apps/web/src/lib/core/util/oklchToRgb.ts
@@ -26,6 +26,7 @@ export function oklchToRgb(
.match(/oklch\(([^)]+)\)/)?.[1]
.split(/\s+/)
.map((val) => {
+ if (val === 'none') return 0;
let isPercentage = val.includes('%');
let num = parseFloat(val);
return isPercentage ? num / 100 : num;
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index f0490c16a6..ffa1da5bd1 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -1,5 +1,13 @@
# Other Surfaces
+## Canvas colors
+
+To check the default canvas color, create a rectangle and a text box without
+changing the swatch. The rectangle should have a light neutral fill and a dark
+outline; the text should be dark and visible. Also check the neutral swatch after
+selecting another color. Neutral colors use an OKLCH `none` hue, which must render
+as gray rather than transparent.
+
## Live updates in flat Soup lists
With browser or native Tauri GraphQL caching enabled, locally supported flat lists reconcile their