Merge branch 'main' into pr-3003-fix-hero-and-update-bottom-banner

deriv-com · Mar 12, 2024 · b7ea4e7 · b7ea4e7
2 parents a472c2c + f187b37
commit b7ea4e7
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 5 deletions.
diff --git a/libs/blocks/CHANGELOG.md b/libs/blocks/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.112.0](https://github.com/deriv-com/deriv-com-v2/compare/blocks-0.111.0...blocks-0.112.0) (2024-03-11)
+
+
+### Bug Fixes
+
+* accordian updates ([aae9027](https://github.com/deriv-com/deriv-com-v2/commit/aae90273d84e9dab25762d7870f2fe174df6e0ce))
+
 ## [0.111.0](https://github.com/deriv-com/deriv-com-v2/compare/blocks-0.110.0...blocks-0.111.0) (2024-03-07)
 
 ## [0.110.0](https://github.com/deriv-com/deriv-com-v2/compare/blocks-0.109.0...blocks-0.110.0) (2024-03-06)

diff --git a/libs/blocks/package.json b/libs/blocks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deriv-com/blocks",
-  "version": "0.111.0",
+  "version": "0.112.0",
   "private": false,
   "main": "./index.js",
   "exports": {

diff --git a/libs/blocks/src/lib/accordion/index.tsx b/libs/blocks/src/lib/accordion/index.tsx
@@ -11,11 +11,11 @@ import {
   qtJoin,
   qtMerge,
 } from '@deriv/quill-design';
-import { useState } from 'react';
+import { ReactNode, useState } from 'react';
 import styles from './styles.module.scss';
 
 export interface AccordionBlockProps {
-  title?: string;
+  title?: ReactNode | string;
   tab?: {
     align?: 'center' | 'end';
     data: { id: number; title: string }[];

diff --git a/libs/blocks/src/lib/content-text/index.tsx b/libs/blocks/src/lib/content-text/index.tsx
@@ -22,7 +22,7 @@ export const ContentText = ({
       )}
     >
       <FluidContainer className="md:px-general-xl lg:max-w-[816px] lg:px-general-none">
-        <div className="flex flex-col gap-gap-xl">
+        <div className="flex flex-col gap-gap-lg">
           {title && <Heading.H2>{title}</Heading.H2>}
           {children}
         </div>

diff --git a/libs/components/CHANGELOG.md b/libs/components/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.57.0](https://github.com/deriv-com/deriv-com-v2/compare/components-0.56.0...components-0.57.0) (2024-03-11)
+
+
+### Bug Fixes
+
+* added target prop to link props ([8043e4a](https://github.com/deriv-com/deriv-com-v2/commit/8043e4ae91f765c4210aef1f5b8259583f07bc85))
+* passed target props in component ([deb46b5](https://github.com/deriv-com/deriv-com-v2/commit/deb46b57238eae256f6c7cb8fd943f62d0431301))
+
 ## [0.56.0](https://github.com/deriv-com/deriv-com-v2/compare/components-0.55.0...components-0.56.0) (2024-02-22)
 
 

diff --git a/libs/components/package.json b/libs/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deriv-com/components",
-  "version": "0.56.0",
+  "version": "0.57.0",
   "private": false,
   "main": "./index.js",
   "exports": {

diff --git a/libs/components/src/lib/card/base/index.tsx b/libs/components/src/lib/card/base/index.tsx
@@ -109,6 +109,7 @@ export const BaseCard: React.FC<BaseCardProps> = ({
             size="md"
             descriptiveText={link?.descriptiveText}
             hasIcon
+            target={link?.target || '_self'}
           >
             {link.content}
           </CustomLink>

diff --git a/libs/components/src/lib/card/types/index.ts b/libs/components/src/lib/card/types/index.ts
@@ -4,6 +4,7 @@ export type StatCardVariant = 'white' | 'dark' | 'coral';
 export type CardColorVariant = 'light' | 'gray';
 export type CardAlignVariant = 'start' | 'center';
 export type CardSizeVariant = 'xs' | 'sm' | 'md' | 'lg';
+export type CardLinkTargetVariant = '_blank' | '_self' | '_parent' | '_top';
 
 interface BaseCardContent {
   header?: ReactNode;
@@ -14,6 +15,7 @@ interface LinkProps {
   content: ReactNode;
   href: string;
   descriptiveText?: string;
+  target?: CardLinkTargetVariant;
 }
 
 export interface StatCardContent extends BaseCardContent {