Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 SLASHED-for-WP/admin-app/.vendored-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"frameworkRepo": "https://github.com/codeslash-dev/SLASHED",
"configuratorSrc": "configurator/src/",
"source": "local",
"syncedAt": "2026-07-01T17:13:38.943Z"
"syncedAt": "2026-07-01T18:41:55.013Z"
},
"vendoredFiles": [
{
Expand Down
20 changes: 10 additions & 10 deletions SLASHED-for-WP/admin-app/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import DomainPanel from './components/DomainPanel.svelte';
import { fa } from './lib/codec';
import { loadInitialOverrides, injectLivePreview, saveOverrides, hasWpBoot } from './lib/persistence';
import { domainOf, DOMAIN_PATTERNS } from './lib/domains';
import { domainOf } from './lib/domains';
import tokensRaw from './data/api-index.generated.json';
import CommandPalette from './components/CommandPalette.svelte';

Expand Down Expand Up @@ -58,13 +58,15 @@
// Derived
let overridesCount = $derived(Object.keys(overrides).length);
let domainBadges = $derived(overridesByDomain(overrides));
// Token-name substrings that scope the active category, used to reset just
// that category's overrides (falls back to the raw domain key when no
// pattern list exists, e.g. for the non-token panels like home/themes).
let domainPatterns = $derived(DOMAIN_PATTERNS[domain] ?? [domain]);
let domainOverridesCount = $derived(
Object.keys(overrides).filter((k) => domainPatterns.some((p) => k.includes(p))).length
// Scope the active category's reset to exactly the keys domainOf() would
// badge under this domain — matching against the domain's own pattern list
// directly would over-match, since patterns overlap across domains (e.g.
// layout's "-bg-" also appears in color tokens like --sf-color-bg--active,
// which domainOf() resolves to "colors" by checking that domain first).
let domainOverrideKeys = $derived(
Object.keys(overrides).filter((k) => domainOf(k) === domain)
);
let domainOverridesCount = $derived(domainOverrideKeys.length);
let canUndo = $derived(past.length > 0);
let canRedo = $derived(future.length > 0);

Expand Down Expand Up @@ -153,9 +155,7 @@

function handleResetDomain() {
const patch: Record<string, null> = {};
for (const k of Object.keys(overrides)) {
if (domainPatterns.some((p) => k.includes(p))) patch[k] = null;
}
for (const k of domainOverrideKeys) patch[k] = null;
handleBulkChange(patch);
}

Expand Down
10 changes: 6 additions & 4 deletions SLASHED-for-WP/admin-app/src/components/DomainPanel.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { SlidersHorizontal, List } from 'lucide-svelte';
import type { SlashedToken } from '../types';
import { DOMAIN_PATTERNS } from '../lib/domains';
import { DOMAIN_PATTERNS, domainOf } from '../lib/domains';
import HomePanel from './panels/HomePanel.svelte';
import ColorsPanel from './panels/ColorsPanel.svelte';
import TypographyPanel from './panels/TypographyPanel.svelte';
Expand Down Expand Up @@ -46,10 +46,12 @@

let patterns = $derived(DOMAIN_PATTERNS[domain] ?? [domain]);

// Uses domainOf() rather than the raw patterns list so this badge always
// agrees with App.svelte's "Reset N" count — matching against a single
// domain's patterns in isolation over-counts where patterns overlap (e.g.
// layout's "-bg-" also appears in color tokens like --sf-color-bg--active).
let domainOverridesInTokenTab = $derived(
tokens.filter((t) =>
patterns.some((p) => t.name.includes(p)) && t.name in overrides
).length
tokens.filter((t) => domainOf(t.name) === domain && t.name in overrides).length
);
</script>

Expand Down
Loading