fix(vital-layout): Move Disclaimer

johnsonandjohnson · Apr 19, 2023 · 5954679 · 5954679
1 parent d228884
commit 5954679
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/packages/vital-layout/src/components/Footer/CopyrightRow/CopyrightRowClean.tsx b/packages/vital-layout/src/components/Footer/CopyrightRow/CopyrightRowClean.tsx
@@ -13,7 +13,7 @@
  */
 
 import React, { FC } from 'react';
-import { Div, designable } from '@bodiless/fclasses';
+import { Div, designable, Fragment } from '@bodiless/fclasses';
 import { RichTextClean } from '@bodiless/vital-editors';
 import { asVitalTokenSpec } from '@bodiless/vital-elements';
 import { withoutHydration } from '@bodiless/hydration';
@@ -23,6 +23,7 @@ import type { CopyrightRowComponents, CopyrightRowProps } from './types';
 const copyrightRowComponents: CopyrightRowComponents = {
   Wrapper: Div,
   CopyrightWrapper: Div,
+  DisclaimerWrapper: Fragment,
   Disclaimer: RichTextClean,
   Copyright: RichTextClean,
   SocialLinksWrapper: Div,
@@ -32,12 +33,14 @@ const copyrightRowComponents: CopyrightRowComponents = {
 const CopyrightRowCleanBase: FC<CopyrightRowProps> = ({ components: C, ...rest }) => (
   <C.Wrapper {...rest}>
     <C.CopyrightWrapper>
-      <C.Disclaimer />
       <C.Copyright />
     </C.CopyrightWrapper>
     <C.SocialLinksWrapper>
       <C.SocialLinks />
     </C.SocialLinksWrapper>
+    <C.DisclaimerWrapper>
+      <C.Disclaimer />
+    </C.DisclaimerWrapper>
   </C.Wrapper>
 );
 

diff --git a/packages/vital-layout/src/components/Footer/CopyrightRow/types.ts b/packages/vital-layout/src/components/Footer/CopyrightRow/types.ts
@@ -42,6 +42,14 @@ interface CopyrightRowComponents extends DesignableComponents {
    * Used for the social links
    */
   SocialLinks: ComponentOrTag<any>,
+  /**
+   * Wrapper for the Disclaimer
+   */
+  DisclaimerWrapper: ComponentOrTag<any>,
+  /**
+   * Used for the Disclaimer
+   */
+  Disclaimer: ComponentOrTag<any>,
 }
 
 type CopyrightRowProps = DesignableComponentsProps<CopyrightRowComponents>;