@designcrowd/library.brand-page 6.0.6-json-prereq-7 → 6.0.6-undo-2

package/src/brand-page/utils/logo.util.test.ts

@@ -12,7 +12,12 @@ import {
   PageHeaderMobile,
   PageStyles,
 } from '../models';
-import type { BrandPageModel, LogoContent, PageModel } from '../models';
+import type {
+  BrandPageModel,
+  BrandPageType,
+  LogoContent,
+  PageModel,
+} from '../models';
 import * as logoUtil from './logo.util';
 
 interface GetLogoVariationIndexFromLogoImageUrlTestCase {
@@ -212,4 +217,52 @@ describe('logo-util', () => {
       logoImage.logoDraftToken,
     );
   });
+
+  describe('getLogoImageFromModel', () => {
+    // Distinct tokens in the content block vs the header so each assertion
+    // proves which location the helper read from.
+    const buildModel = (brandPageType: BrandPageType): BrandPageModel => {
+      const model = createTestBrandPageModel();
+
+      model.brandPageType = brandPageType;
+      (model.pages[0].contents[0] as LogoContent).logoImage = {
+        logoDraftToken: 'content-token',
+        logoVariation: 0,
+        logoLastUpdate: undefined,
+      };
+      model.pageHeaderDesktop.logoImage = {
+        logoDraftToken: 'header-token',
+        logoVariation: 0,
+        logoLastUpdate: undefined,
+      };
+
+      return model;
+    };
+
+    test('reads the header logo for brand-site', () => {
+      const model = buildModel(BRAND_PAGE_TYPES.brandSite);
+
+      expect(logoUtil.getLogoImageFromModel(model)?.logoDraftToken).toBe(
+        'header-token',
+      );
+    });
+
+    test('reads the content-block logo for brand-page', () => {
+      const model = buildModel(BRAND_PAGE_TYPES.default);
+
+      expect(logoUtil.getLogoImageFromModel(model)?.logoDraftToken).toBe(
+        'content-token',
+      );
+    });
+
+    // Regression guard: brand-contact previously fell through to the header
+    // branch (the `=== brandPage` check) and read a stale header logo on undo.
+    test('reads the content-block logo for brand-contact', () => {
+      const model = buildModel(BRAND_PAGE_TYPES.brandContact);
+
+      expect(logoUtil.getLogoImageFromModel(model)?.logoDraftToken).toBe(
+        'content-token',
+      );
+    });
+  });
 });

package/src/brand-page/utils/logo.util.ts

@@ -394,6 +394,29 @@ export const calculateOptimizedLogoDimensions = (
   return { width: currentWidth, height: currentHeight };
 };
 
+/**
+ * Resolves the "current" logo image from a brand-page MODEL (the raw,
+ * deserialized shape — not the live stores, whose contents are wrapped in
+ * `settings.content`).
+ *
+ * Brand-site keeps its logo in the page header; brand-page and brand-contact
+ * keep it as a logo CONTENT block on the home page — the same `isBrandSite ?
+ * header : content` split the logo-settings store getters/setter use. This is
+ * the single source of truth for model-level logo reads: initial load and
+ * history-restore both call it so the two paths can't drift. They previously
+ * hard-coded `=== brandPage`, which silently excluded brand-contact and read a
+ * stale header logo on undo.
+ */
+export const getLogoImageFromModel = (
+  model: BrandPageModel,
+): LogoImageModel | undefined => {
+  if (model.brandPageType === BRAND_PAGE_TYPES.brandSite) {
+    return model.pageHeaderDesktop?.logoImage;
+  }
+
+  return model.pages?.[0]?.contents?.find(isLogoContent)?.logoImage;
+};
+
 export const recalculateLogoContentDimensions = async (
   pageData: any,
   editableLogoVariations: {

package/src/brand-page/utils/migration.util.ts

@@ -20,7 +20,6 @@ import { migration14 } from './migration/migration-14';
 import { migration15 } from './migration/migration-15';
 import { migration16 } from './migration/migration-16';
 import { migration17 } from './migration/migration-17';
-import { migration18 } from './migration/migration-18';
 
 export interface MigrationData {
   brandPageModel: BrandPageModel;
@@ -161,17 +160,6 @@ const MIGRATION_TABLE = [
     description:
       'Padding Control backfill (BP-5699 Tier 2 + BP-5700 Store): backfill existing top/bottom spacing as explicit padding for text (12px), images/social links/shapes/booking (32px), store (16px), contact form (per layout), banner and about (per display style)',
   },
-  {
-    version: 18,
-    migrateFn: migration18,
-    // runAlways: normalise RTE to JSON on every load. Idempotent (only HTML
-    // strings are converted; JSON is skipped), so it also catches content the
-    // AI section builders still emit as HTML — converting it on the next read
-    // without a new migration or changes to those builders.
-    runAlways: true,
-    description:
-      'BP-5787: convert inline-HTML RTE content to Tiptap JSON on load (lazy migrate-on-read for web-renderer; persisted on next maker save; also normalises AI-built HTML)',
-  },
 ] as MigrationTableItem[];
 
 export const GetLatestModelVersion = () =>

package/src/brand-page/utils/style.util.test.ts

@@ -87,57 +87,6 @@ describe('style.util', () => {
     );
   });
 
-  test('applyLogoThemeToBrandPageModel preserves var() token refs in JSON RTE content (BP-5787)', () => {
-    // Arrange — title stored as Tiptap JSON with a theme-token colour mark.
-    const logoTheme = logoWithFlatColorsTheme;
-    const titleDoc = {
-      type: 'doc',
-      content: [
-        {
-          type: 'heading',
-          attrs: { level: 2, textAlign: 'center' },
-          content: [
-            {
-              type: 'text',
-              marks: [
-                {
-                  type: 'textStyle',
-                  attrs: { color: `var(--${STYLE_THEME_KEYS.LogoTextColor})` },
-                },
-              ],
-              text: 'Themed',
-            },
-          ],
-        },
-      ],
-    };
-    const brandPageModel = new BrandPageModel({
-      ...BRAND_SITE,
-      pages: [
-        {
-          title: '1',
-          slug: '1',
-          contents: [
-            {
-              ...createInitialBannerSectionContent(),
-              title: titleDoc,
-            } as any,
-          ],
-        },
-      ],
-    });
-
-    // Act
-    const { model } = applyLogoThemeToBrandPageModel(logoTheme, brandPageModel);
-
-    // Assert — JSON RTE content is an object, so the var() token is NOT
-    // flattened to rgb(); it survives so a new theme can still propagate.
-    const title = JSON.stringify((model.pages[0].contents[0] as any).title);
-
-    expect(title).toContain(`var(--${STYLE_THEME_KEYS.LogoTextColor})`);
-    expect(title).not.toContain(logoTheme.logoTextColor.rgb);
-  });
-
   test('applyLogoThemeToBrandPageModel should apply logo theme color to content color when content color has a color matched theme key', () => {
     // Arrange
     const logoTheme = logoWithFlatColorsTheme;

package/src/brand-page/utils/text.util.ts

@@ -1,56 +1,17 @@
 import { ESCAPED_NEWLINE_CHARACTER } from '../../constants/ui';
 
-/**
- * BP-5787 — a Tiptap JSON document is an object with `type: 'doc'`.
- * Inlined here (rather than importing from brand-page-maker) to avoid a
- * circular import: rich-text-editor.util imports getRenderText from this file.
- */
-const isTiptapDoc = (value: unknown): value is { type: 'doc' } =>
-  typeof value === 'object' &&
-  value !== null &&
-  (value as { type?: string }).type === 'doc';
-
-const jsonDocPlainText = (doc: unknown): string => {
-  const parts: string[] = [];
-
-  const walk = (node: any): void => {
-    if (typeof node?.text === 'string') parts.push(node.text);
-
-    node?.content?.forEach(walk);
-  };
-
-  walk(doc);
-
-  return parts.join(' ').replace(/\s+/g, ' ').trim();
-};
-
 export const getRenderText = (text: string): string => {
-  // BP-5787: RTE fields may now be Tiptap JSON objects. Non-strings pass
-  // through untouched so the renderer (TextWrapper) handles them via its
-  // JSON-aware path, instead of throwing on `.replace`.
-  if (typeof text !== 'string') {
-    return text as unknown as string;
-  }
-
   return text.replace(
     new RegExp(`(${ESCAPED_NEWLINE_CHARACTER}|\\n)`, 'g'),
     '<br/>',
   );
 };
 
-// Accepts a legacy inline-HTML string or a Tiptap JSON document (BP-5787):
-// for JSON it returns the concatenated visible text; for HTML it strips tags.
-export const escapeContentText = (text: unknown): string | undefined => {
+export const escapeContentText = (
+  text: string | undefined,
+): string | undefined => {
   if (!text) {
-    return text as undefined;
-  }
-
-  if (isTiptapDoc(text)) {
-    return jsonDocPlainText(text);
-  }
-
-  if (typeof text !== 'string') {
-    return undefined;
+    return text;
   }
 
   return text

package/src/brand-page/utils/vcard.util.ts

@@ -235,11 +235,9 @@ const addProfileInfo = (
   profile: ProfileViewModel,
   vcardLines: string[],
 ): void => {
-  const name = sanitizeForVCard(getPlainTextFromRTE(profile.name) || '');
-  const title = sanitizeForVCard(getPlainTextFromRTE(profile.title) || '');
-  const description = sanitizeForVCard(
-    getPlainTextFromRTE(profile.description) || '',
-  );
+  const name = sanitizeForVCard(profile.name || '');
+  const title = sanitizeForVCard(profile.title || '');
+  const description = sanitizeForVCard(profile.description || '');
 
   if (name) {
     const nameParts = name.trim().split(/\s+/);
@@ -318,7 +316,7 @@ export const saveContact = (brandPageData: {
 }): void => {
   const vcard = generateVCard(brandPageData);
   const profile = findProfileContent(brandPageData);
-  const filename = generateVCardFilename(getPlainTextFromRTE(profile?.name));
+  const filename = generateVCardFilename(profile?.name);
 
   downloadVCard(vcard, filename);
 };

package/src/brand-page/utils/view-model.util.ts

@@ -119,7 +119,7 @@ import {
   getRouteNameByPageIndex,
   getRouteParamsByPage,
 } from './route.util';
-import { hasRTEContent, isTiptapDocument } from '../../brand-page-maker/utils';
+import { hasRTEContent } from '../../brand-page-maker/utils';
 import {
   getPageIdFromHref,
   isHrefPageId,
@@ -1518,86 +1518,6 @@ const mapPageIdReferencesToRelativePaths = (
   });
 };
 
-// Resolve a `pageid:<id>` internal-link href to the published relative path.
-// Returns the resolved href, or null when `href` is not an internal pageid link
-// (external/absolute links are left untouched). Falls back to the site root when
-// the pageid can't be matched to a nav route.
-const resolvePageIdHref = (
-  href: string,
-  nav: NavViewModel,
-  options: ViewModelMappingOptions,
-): string | null => {
-  // Only process internal links (no protocol, doesn't start with /)
-  if (!href || href.match(/^(https?:\/\/|\/)/) || !isHrefPageId(href)) {
-    return null;
-  }
-
-  const pageId = getPageIdFromHref(href);
-  const route = findNavItemByPageId(nav.navItems, pageId);
-  const brandPageSlugRoute = options.brandPageSlug
-    ? `/${options.brandPageSlug}`
-    : '/';
-
-  if (route) {
-    if (route.isRoot) {
-      return brandPageSlugRoute;
-    }
-
-    return `${brandPageSlugRoute}${brandPageSlugRoute === '/' ? '' : '/'}${route.relativePath}`;
-  }
-
-  // fallback to root if pageid cannot be resolved.
-  return brandPageSlugRoute;
-};
-
-// BP-5847: walk a Tiptap JSON doc and rewrite every link mark whose href is a
-// `pageid:` reference into its published relative path. Returns a NEW doc when
-// something changed (so the shared model doc is never mutated), else the same
-// reference.
-export const resolvePageIdsInRteJson = (
-  doc: unknown,
-  nav: NavViewModel,
-  options: ViewModelMappingOptions,
-): unknown => {
-  let changed = false;
-
-  const walk = (node: any): any => {
-    if (!node || typeof node !== 'object') {
-      return node;
-    }
-
-    let next = node;
-
-    if (Array.isArray(node.marks)) {
-      const marks = node.marks.map((mark: any) => {
-        if (mark?.type === 'link' && typeof mark.attrs?.href === 'string') {
-          const resolved = resolvePageIdHref(mark.attrs.href, nav, options);
-
-          if (resolved !== null) {
-            changed = true;
-
-            return { ...mark, attrs: { ...mark.attrs, href: resolved } };
-          }
-        }
-
-        return mark;
-      });
-
-      next = { ...next, marks };
-    }
-
-    if (Array.isArray(node.content)) {
-      next = { ...next, content: node.content.map(walk) };
-    }
-
-    return next;
-  };
-
-  const result = walk(doc);
-
-  return changed ? result : doc;
-};
-
 const dynamicallyMapPageIdInHyperlinksToRelativePaths = (
   content: any,
   nav: NavViewModel,
@@ -1610,15 +1530,7 @@ const dynamicallyMapPageIdInHyperlinksToRelativePaths = (
       return;
     }
 
-    if (isTiptapDocument(value)) {
-      // BP-5847: RTE fields may now be Tiptap JSON. Resolve pageid link marks
-      // here too, or internal links render as raw `pageid:` and don't navigate.
-      (content as unknown as Record<string, unknown>)[key] =
-        resolvePageIdsInRteJson(value, nav, options);
-    } else if (
-      typeof value === 'object' &&
-      (key === 'items' || key === 'textItems')
-    ) {
+    if (typeof value === 'object' && (key === 'items' || key === 'textItems')) {
       if (Array.isArray(value)) {
         value.forEach((item) => {
           dynamicallyMapPageIdInHyperlinksToRelativePaths(item, nav, options);
@@ -1630,11 +1542,31 @@ const dynamicallyMapPageIdInHyperlinksToRelativePaths = (
       (content as unknown as Record<string, unknown>)[key] = value.replace(
         /<a\s+([^>]*?)href="([^"]*?)"([^>]*?)>/gi,
         (match, existingAttrsStart, href, existingAttrsEnd) => {
-          const resolved = resolvePageIdHref(href, nav, options);
+          // Only process internal links (no protocol, doesn't start with /)
+          if (href && !href.match(/^(https?:\/\/|\/)/) && isHrefPageId(href)) {
+            const pageId = getPageIdFromHref(href);
+
+            const route = findNavItemByPageId(nav.navItems, pageId);
+
+            const brandPageSlugRoute = options.brandPageSlug
+              ? `/${options.brandPageSlug}`
+              : '/';
+
+            if (route) {
+              let href = `${brandPageSlugRoute}`;
+
+              if (!route.isRoot) {
+                href = `${brandPageSlugRoute}${brandPageSlugRoute === '/' ? '' : '/'}${route.relativePath}`;
+              }
+
+              return `<a ${existingAttrsStart}href="${href}"${existingAttrsEnd}>`;
+            }
+
+            // fallback to root if pageid cannot be resolved.
+            return `<a ${existingAttrsStart}href="${brandPageSlugRoute}"${existingAttrsEnd}>`;
+          }
 
-          return resolved === null
-            ? match
-            : `<a ${existingAttrsStart}href="${resolved}"${existingAttrsEnd}>`;
+          return match;
         },
       );
     }

package/src/brand-page/view-models.ts

@@ -41,7 +41,6 @@ import type {
   BackgroundShape,
   PersonalisationRole,
   SaveContactOptions,
-  RichTextValue,
 } from './models';
 import type { ImagesSectionContentDisplayStyle } from './constants';
 
@@ -197,8 +196,8 @@ export interface TextImageSectionViewModel {
   id: string;
   type: 'images-section';
   role: ContentType;
-  title: RichTextValue;
-  description: RichTextValue;
+  title: string;
+  description: string;
   displayStyle: ImagesSectionContentDisplayStyle;
   aspectRatio: AspectRatio;
   areImagesFullWidth: boolean;

package/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.ts

@@ -291,7 +291,7 @@ export default defineComponent({
 
     // Capture baseline for undo/redo when the feature is active for this
     // session — see useUndoRedoFlag.ts for the gate (LaunchDarkly flag +
-    // brand-site + non-admin maker).
+    // non-admin maker; all three brands).
     if (useUndoRedoFlag().value) {
       useHistoryStore().captureBaseline();
     }

package/src/brand-page-maker/composables/rich-text-editor/useRichTextEditor.ts

@@ -8,7 +8,18 @@ import {
   watch,
 } from 'vue';
 import { Editor } from '@tiptap/vue-3';
-import { getRteExtensions } from './getRteExtensions';
+import StarterKit from '@tiptap/starter-kit';
+import Underline from '@tiptap/extension-underline';
+import TextStyle from '@tiptap/extension-text-style';
+import TextAlign from '@tiptap/extension-text-align';
+import FontFamily from '@tiptap/extension-font-family';
+import ColorExtension from '@tiptap/extension-color';
+import { FontSize } from './extensions/FontSize';
+import { LetterSpacing } from './extensions/LetterSpacing';
+import { LineHeight } from './extensions/LineHeight';
+import Highlight from '@tiptap/extension-highlight';
+import Placeholder from '@tiptap/extension-placeholder';
+import Link from '@tiptap/extension-link';
 import type { StyleTextFontFamilyOption } from '@shared/style-settings/models';
 import { createFormattingActions } from './formatting';
 import { useTextAlign } from './textAlign';
@@ -20,7 +31,7 @@ import {
   emToPx,
   isStyleChanged,
   pxToEm,
-  sanitizeRteJson,
+  sanitiseClientSideRTE,
   skipStyleDetection,
 } from '@brand-page-maker/utils';
 import type { HyperlinkType, TextStyles } from '@brand-page';
@@ -38,7 +49,9 @@ import {
 import { useUiContentSettingsStore } from '@shared/content-settings/store';
 import { useHistoryStore } from '@brand-page-maker/stores/history/history-store';
 import { AllSelection } from 'prosemirror-state';
-import { useHyperlink } from './hyperlink';
+import { MaxLength } from './extensions/MaxLength';
+import { AutoLink } from './extensions/AutoLink';
+import { isHrefPageId, useHyperlink } from './hyperlink';
 import { useBubbleMenu } from './bubbleMenu';
 import {
   hasLogoColorVar,
@@ -116,7 +129,44 @@ export const useExternalRichTextEditor = (): {
 } => {
   const externalEditor = new Editor({
     editable: false,
-    extensions: getRteExtensions({ includeLinkRel: true }),
+    extensions: [
+      StarterKit,
+      Underline,
+      TextStyle.configure({ mergeNestedSpanStyles: true }),
+      TextAlign.configure({
+        types: ['heading', 'paragraph'],
+      }),
+      FontFamily.configure({
+        types: ['textStyle'],
+      }),
+      FontSize,
+      LetterSpacing,
+      LineHeight,
+      ColorExtension.configure({
+        types: ['textStyle'],
+      }),
+      Highlight.configure({
+        multicolor: true,
+      }),
+      Link.configure({
+        openOnClick: false,
+        defaultProtocol: 'https',
+        autolink: true,
+        HTMLAttributes: (attrs) => {
+          const href = attrs.href;
+          const isExternal =
+            href && (href.startsWith('http://') || href.startsWith('https://'));
+
+          return {
+            rel: 'noopener noreferrer',
+            target: isExternal ? '_blank' : null,
+          };
+        },
+        isAllowedUri: (url, ctx) =>
+          ctx.defaultValidate(url) || isHrefPageId(url),
+      }),
+      AutoLink,
+    ],
   });
 
   return {
@@ -168,13 +218,54 @@ export const useRichTextEditor = (
   const editor = new Editor({
     content: model.value ?? '',
     editable: !props.readOnly,
-    extensions: getRteExtensions({
-      restrictStarterKit: true,
-      editing: {
+    extensions: [
+      StarterKit.configure({
+        bulletList: false,
+        orderedList: false,
+        listItem: false,
+        horizontalRule: false,
+        codeBlock: false,
+        code: false,
+      }),
+      Underline,
+      TextStyle.configure({ mergeNestedSpanStyles: true }),
+      TextAlign.configure({
+        types: ['heading', 'paragraph'],
+      }),
+      FontFamily.configure({
+        types: ['textStyle'],
+      }),
+      FontSize,
+      LetterSpacing,
+      LineHeight,
+      ColorExtension.configure({
+        types: ['textStyle'],
+      }),
+      Highlight.configure({
+        multicolor: true,
+      }),
+      Placeholder.configure({
         placeholder: props.placeholder,
-        maxLength: props.maxLength,
-      },
-    }),
+      }),
+      MaxLength.configure({ maxLength: props.maxLength }),
+      Link.configure({
+        openOnClick: false,
+        defaultProtocol: 'https',
+        autolink: true,
+        HTMLAttributes: (attrs) => {
+          const href = attrs.href;
+          const isExternal =
+            href && (href.startsWith('http://') || href.startsWith('https://'));
+
+          return {
+            target: isExternal ? '_blank' : null,
+          };
+        },
+        isAllowedUri: (url, ctx) =>
+          ctx.defaultValidate(url) || isHrefPageId(url),
+      }),
+      AutoLink,
+    ],
     editorProps: {
       handleDOMEvents: {
         drop(view, event: DragEvent) {
@@ -385,13 +476,7 @@ export const useRichTextEditor = (
 
       const isExternalMutation = updateRichTextEditor.value || appliedSinceLast;
 
-      // Compare in the stored (JSON) format so a JSON model value isn't always
-      // seen as "changed" against the editor's HTML (which would re-run
-      // setContent and reset the user's just-applied styles).
-      const hasChanged =
-        JSON.stringify(editor.getJSON()) !== JSON.stringify(newValue);
-
-      if (isExternalMutation && hasChanged) {
+      if (isExternalMutation && editor.getHTML() !== newValue) {
         editor.commands.setContent(newValue, false);
         updateRichTextEditor.value = false;
         //text style type is not switching when reordering
@@ -414,12 +499,28 @@ export const useRichTextEditor = (
     }
   });
 
-  // Update model when editor content changes. RTE content is stored as Tiptap
-  // JSON (BP-5787). getJSON() is already in hand (the editor holds the doc) and
-  // is sanitised natively — no getHTML(), no DOMPurify, no extra editor — so
-  // the per-keystroke path allocates nothing heavy.
+  // Update model when editor content changes
   editor.on('update', () => {
-    emit('update:modelValue', sanitizeRteJson(editor.getJSON()));
+    const sanitizedData = sanitiseClientSideRTE(editor.getHTML());
+
+    // An update fired while the editor is unfocused is TipTap rewriting the
+    // model back into its canonical HTML during mount rehydration or a
+    // programmatic setContent — not a user edit. Fold it into the current
+    // head so merely selecting a section doesn't push a phantom undo entry
+    // (BP-5810). The construction-time arm above lapses before this async
+    // write-back fires, so re-arm here. Genuine edits happen while focused and
+    // still push a new entry.
+    //
+    // Known limitation: a programmatic toolbar command run on an editor the
+    // user hasn't focused yet would also merge (losing that undo step). Today
+    // the RTE only mounts inside an already-open settings drawer and the user
+    // focuses it before formatting, so this doesn't occur — revisit if a
+    // consumer ever drives toolbar actions on an unfocused editor.
+    if (!editor.isFocused && !historyStore.isApplyingSnapshot) {
+      historyStore.mergeNextMutation();
+    }
+
+    emit('update:modelValue', sanitizedData.sanitizedHtml);
   });
 
   editor.on('selectionUpdate', () => {

package/src/brand-page-maker/composables/useUndoRedoFlag.ts

@@ -1,30 +1,24 @@
 import { computed, type ComputedRef } from 'vue';
 import { useBrandPageMakerUserStore } from '@brand-page-maker/stores/user';
-import { useBrandPageMakerStore } from '@brand-page-maker/stores/brandpage-maker/brandpage-maker-store';
 
 /**
- * Returns whether undo/redo is active for the current maker session. All
- * three conditions must hold:
+ * Returns whether undo/redo is active for the current maker session. Both
+ * conditions must hold:
  *
  *   1. `userStore.features.canUseUndoRedo` is true. The flag is populated by
  *      the consumer (BrandCrowd.Net / web-renderer) via the
  *      `WebsiteDesignUserFeatures.CanUseUndoRedo` boolean on the ViewModel —
- *      same precedent as RichTextEditor / GettyVideos / AITextGenerator.
- *   2. The maker is a brand-site (Website Maker). V1 scope is brand-site
- *      only; brand-page (single-page profile) and brand-contact (vCard) are
- *      out of scope.
- *   3. The session is NOT in admin-maker mode (`userStore.isAdmin`). The
+ *      same precedent as RichTextEditor / GettyVideos / AITextGenerator. The
+ *      one flag governs all three brands (brand-site, brand-page,
+ *      brand-contact) — there is no per-brand gating.
+ *   2. The session is NOT in admin-maker mode (`userStore.isAdmin`). The
  *      admin maker uses the same components but a different editing flow
  *      (template authoring) where undo/redo is out of scope.
  */
 export function useUndoRedoFlag(): ComputedRef<boolean> {
   const userStore = useBrandPageMakerUserStore();
-  const brandPageMakerStore = useBrandPageMakerStore();
 
   return computed(
-    () =>
-      userStore.features.canUseUndoRedo &&
-      brandPageMakerStore.isBrandSite &&
-      !userStore.isAdmin,
+    () => userStore.features.canUseUndoRedo && !userStore.isAdmin,
   );
 }