diff --git a/packages/drupal/gutenberg_blocks/css/edit.css b/packages/drupal/gutenberg_blocks/css/edit.css
index 8e8d0594e..58aefe52d 100644
--- a/packages/drupal/gutenberg_blocks/css/edit.css
+++ b/packages/drupal/gutenberg_blocks/css/edit.css
@@ -41,3 +41,18 @@
transform-origin: 0 0;
transform: rotate(90deg);
}
+
+.gutenberg__editor .custom-block-accordion-item-text.questionmark h3::before {
+ margin-right: 7px;
+ content: url("data:image/svg+xml,%3Csvg aria-hidden='true' xmlns='http://www.w3.org/2000/svg' width='20' height='20' fill='%236B7280' viewBox='0 0 20 24'%3E%3Cpath fill-rule='evenodd' d='M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm9.008-3.018a1.502 1.502 0 0 1 2.522 1.159v.024a1.44 1.44 0 0 1-1.493 1.418 1 1 0 0 0-1.037.999V14a1 1 0 1 0 2 0v-.539a3.44 3.44 0 0 0 2.529-3.256 3.502 3.502 0 0 0-7-.255 1 1 0 0 0 2 .076c.014-.398.187-.774.48-1.044Zm.982 7.026a1 1 0 1 0 0 2H12a1 1 0 1 0 0-2h-.01Z' clip-rule='evenodd'/%3E%3C/svg%3E%0A");
+}
+
+.gutenberg__editor .custom-block-accordion-item-text.checkmark h3::before {
+ margin-right: 7px;
+ content: url("data:image/svg+xml,%3Csvg aria-hidden='true' xmlns='http://www.w3.org/2000/svg' width='20' height='20' fill='%236B7280' viewBox='0 0 20 24'%3E%3Cpath fill-rule='evenodd' d='M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm13.707-1.293a1 1 0 0 0-1.414-1.414L11 12.586l-1.793-1.793a1 1 0 0 0-1.414 1.414l2.5 2.5a1 1 0 0 0 1.414 0l4-4Z' clip-rule='evenodd'%3E%3C/path%3E%3C/svg%3E");
+}
+
+.gutenberg__editor .custom-block-accordion-item-text.arrow h3::before {
+ margin-right: 7px;
+ content: url("data:image/svg+xml,%3Csvg aria-hidden='true' xmlns='http://www.w3.org/2000/svg' width='20' height='20' fill='%236B7280' %3E%3Cpath fill-rule='evenodd' d='M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16ZM6.75 9.25a.75.75 0 0 0 0 1.5h4.59l-2.1 1.95a.75.75 0 0 0 1.02 1.1l3.5-3.25a.75.75 0 0 0 0-1.1l-3.5-3.25a.75.75 0 1 0-1.02 1.1l2.1 1.95H6.75Z' clip-rule='evenodd'%3E%3C/path%3E%3C/svg%3E");
+}
diff --git a/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionItemTextValidator.php b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionItemTextValidator.php
new file mode 100644
index 000000000..4ab6b31ab
--- /dev/null
+++ b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionItemTextValidator.php
@@ -0,0 +1,51 @@
+ [
+ 'field_label' => $this->t('Title'),
+ 'rules' => ['required'],
+ ],
+ ];
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function validateContent($block = []): array {
+ $expectedChildren = [
+ 'validationType' => GutenbergCardinalityValidatorInterface::CARDINALITY_ANY,
+ 'min' => 1,
+ 'max' => GutenbergCardinalityValidatorInterface::CARDINALITY_UNLIMITED,
+ ];
+ return $this->validateCardinality($block, $expectedChildren);
+ }
+
+}
diff --git a/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionValidator.php b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionValidator.php
new file mode 100644
index 000000000..d0bae38b0
--- /dev/null
+++ b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionValidator.php
@@ -0,0 +1,42 @@
+ 'custom/accordion-item-text',
+ 'blockLabel' => $this->t('Accordion'),
+ 'min' => 1,
+ 'max' => GutenbergCardinalityValidatorInterface::CARDINALITY_UNLIMITED,
+ ],
+ ];
+ return $this->validateCardinality($block, $expectedChildren);
+ }
+
+}
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx b/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
new file mode 100644
index 000000000..aaf3f4a6d
--- /dev/null
+++ b/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
@@ -0,0 +1,91 @@
+import clsx from 'clsx';
+import React, { Fragment } from 'react';
+import {
+ InnerBlocks,
+ InspectorControls,
+ RichText,
+} from 'wordpress__block-editor';
+import { registerBlockType } from 'wordpress__blocks';
+import { PanelBody, SelectControl } from 'wordpress__components';
+import { compose, withState } from 'wordpress__compose';
+
+// @ts-ignore
+const { t: __ } = Drupal;
+// @ts-ignore
+registerBlockType('custom/accordion-item-text', {
+ title: 'Accordion Item Text',
+ icon: 'text',
+ category: 'layout',
+ parent: ['custom/accordion'],
+ attributes: {
+ title: {
+ type: 'string',
+ },
+ icon: {
+ type: 'string',
+ },
+ },
+ // @ts-ignore
+ edit: compose(withState())((props) => {
+ const { attributes, setAttributes } = props;
+ const icons = [
+ { label: __('- Select an optional icon -'), value: '' },
+ { label: __('Checkmark'), value: 'checkmark' },
+ { label: __('Questionmark'), value: 'questionmark' },
+ { label: __('Arrow'), value: 'arrow' },
+ ];
+ setAttributes({
+ icon: attributes.icon === undefined ? '' : attributes.icon,
+ });
+
+ return (
+
+
+
+ {
+ setAttributes({
+ icon: newValue,
+ });
+ }}
+ />
+
+
+
+
{__('Accordion Item Text')}
+
+ {
+ setAttributes({ title: newValue });
+ }}
+ />
+
+
+
+
+ );
+ }),
+
+ save: () => {
+ return ;
+ },
+});
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx b/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx
new file mode 100644
index 000000000..924746dd8
--- /dev/null
+++ b/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx
@@ -0,0 +1,25 @@
+import { InnerBlocks } from 'wordpress__block-editor';
+import { registerBlockType } from 'wordpress__blocks';
+
+// @ts-ignore
+const { t: __ } = Drupal;
+
+registerBlockType('custom/accordion', {
+ title: __('Accordion'),
+ icon: 'menu',
+ category: 'layout',
+ attributes: {},
+ edit: () => {
+ return (
+
+ );
+ },
+ save: () => ,
+});
diff --git a/packages/drupal/gutenberg_blocks/src/index.ts b/packages/drupal/gutenberg_blocks/src/index.ts
index 2c86b28df..e2c0159f7 100644
--- a/packages/drupal/gutenberg_blocks/src/index.ts
+++ b/packages/drupal/gutenberg_blocks/src/index.ts
@@ -10,3 +10,5 @@ import './filters/list';
import './blocks/cta';
import './blocks/quote';
import './blocks/horizontal-separator';
+import './blocks/accordion';
+import './blocks/accordion-item-text';
diff --git a/packages/drupal/test_content/content/node/a397ca48-8fad-411e-8901-0eba2feb989c.yml b/packages/drupal/test_content/content/node/a397ca48-8fad-411e-8901-0eba2feb989c.yml
index 25830e9fb..be659117f 100644
--- a/packages/drupal/test_content/content/node/a397ca48-8fad-411e-8901-0eba2feb989c.yml
+++ b/packages/drupal/test_content/content/node/a397ca48-8fad-411e-8901-0eba2feb989c.yml
@@ -120,9 +120,23 @@ default:
+
+
-
+ Incididunt laborum velit non proident nostrud velit. Minim excepteur ut aliqua nisi. Culpa laboris consectetur proident. Tempor esse ullamco et dolor proident id officia laborum voluptate nostrud elit dolore qui amet. Ex Lorem irure eu anim ipsum officia.
+
+
+
+
+
+ - Moitié-moitié
- Fribourgeoise
+
+
+
+ Incididunt laborum velit non proident nostrud velit. Minim excepteur ut aliqua nisi. Culpa laboris consectetur proident. Tempor esse ullamco et dolor proident id officia laborum voluptate nostrud elit dolore qui amet. Ex Lorem irure eu anim ipsum officia.
+
+
format: gutenberg
summary: ''
diff --git a/packages/schema/src/fragments/Page.gql b/packages/schema/src/fragments/Page.gql
index 3ecddb3c9..59285ccc4 100644
--- a/packages/schema/src/fragments/Page.gql
+++ b/packages/schema/src/fragments/Page.gql
@@ -36,6 +36,7 @@ fragment Page on Page {
...BlockImageWithText
...BlockQuote
...BlockHorizontalSeparator
+ ...BlockAccordion
}
metaTags {
tag
diff --git a/packages/schema/src/fragments/PageContent/BlockAccordion.gql b/packages/schema/src/fragments/PageContent/BlockAccordion.gql
new file mode 100644
index 000000000..0f77b257d
--- /dev/null
+++ b/packages/schema/src/fragments/PageContent/BlockAccordion.gql
@@ -0,0 +1,13 @@
+fragment BlockAccordion on BlockAccordion {
+ items {
+ ...BlockAccordionItemText
+ }
+}
+
+fragment BlockAccordionItemText on BlockAccordionItemText {
+ title
+ icon
+ textContent {
+ markup
+ }
+}
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index 179240b49..fbeafa4e3 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -207,6 +207,7 @@ union PageContent @resolveEditorBlockType =
| BlockImageWithText
| BlockQuote
| BlockHorizontalSeparator
+ | BlockAccordion
type BlockForm @type(id: "custom/form") {
url: Url @resolveEditorBlockAttribute(key: "formId") @webformIdToUrl(id: "$")
@@ -246,6 +247,16 @@ type BlockImageTeaser @default @value {
ctaUrl: Url @resolveEditorBlockAttribute(key: "ctaUrl")
}
+type BlockAccordion @type(id: "custom/accordion") {
+ items: [BlockAccordionItemText!]! @resolveEditorBlockChildren
+}
+
+type BlockAccordionItemText @default @value {
+ title: String! @resolveEditorBlockAttribute(key: "title")
+ icon: String! @resolveEditorBlockAttribute(key: "icon")
+ textContent: BlockMarkup @resolveEditorBlockChildren @seek(pos: 0)
+}
+
type BlockCta @type(id: "custom/cta") {
url: Url @resolveEditorBlockAttribute(key: "url")
text: String @resolveEditorBlockAttribute(key: "text")
diff --git a/packages/ui/package.json b/packages/ui/package.json
index f3320b5ce..967e148ea 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -44,6 +44,7 @@
"@heroicons/react": "^2.1.1",
"@hookform/resolvers": "^3.3.3",
"clsx": "^2.1.0",
+ "flowbite-react": "^0.9.0",
"framer-motion": "^10.17.4",
"hast-util-is-element": "^2.1.3",
"hast-util-select": "^5.0.5",
diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.stories.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.stories.tsx
new file mode 100644
index 000000000..bc8ec400e
--- /dev/null
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.stories.tsx
@@ -0,0 +1,58 @@
+import { Markup } from '@custom/schema';
+import { Meta, StoryObj } from '@storybook/react';
+
+import { BlockAccordion } from './BlockAccordion';
+
+export default {
+ component: BlockAccordion,
+} satisfies Meta;
+
+export const AccordionItemText = {
+ args: {
+ items: [
+ {
+ title: 'Cheese Fondue',
+ icon: 'arrow',
+ textContent: {
+ markup: `
+ The earliest known recipe for the modern form of cheese fondue comes from a 1699 book published in Zürich, under the name "Käss mit Wein zu kochen" 'to cook cheese with wine'.
+ It calls for grated or cut-up cheese to be melted with wine, and for bread to be dipped in it. However, the name "cheese fondue", until the late 19th century, referred to a dish composed of eggs and cheese, as in la Chapelle's 1735 Fonduë de Fromage, aux Truffes Fraiches; it was something between scrambled eggs with cheese and a cheese soufflé. Brillat-Savarin wrote in 1834 that it is "nothing other than scrambled eggs with cheese". Variations included cream ("à la genevoise") and truffles ("à la piémontaise") in addition to eggs, as well as what is now called "raclette" ("fondue valaisanne").
+
+ - Fribourgeoise
+ - Moitié-Moitié
+
+ ` as Markup,
+ },
+ },
+ {
+ title: 'Rösti',
+ icon: 'questionmark',
+ textContent: {
+ markup: `
+ Rösti is a kind of fried potato cake served as a main course or side dish.
+ As a main dish, rösti is usually accompanied with cheese, onions and cold meat or eggs. This dish, originally from Zürich, was first simply made by frying grated raw potatoes in a pan. It has then spread towards Bern where it is made with boiled potatoes instead. This is where it took the name Rösti. There are many variants in Switzerland and outside the borders. This culinary specialty gives its name to the röstigraben, which designates the cultural differences between the German- and French-speaking parts of the country.
+ ` as Markup,
+ },
+ },
+ {
+ title: 'Älplermagronen',
+ icon: 'checkmark',
+ textContent: {
+ markup: `
+ Älplermagronen are now regarded as a traditional dish of the Swiss Alps and a classic of Swiss comfort foods. According to a popular theory, pasta became widespread in northern Switzerland in the late 19th century, when the Gotthard Tunnel was built, partly by Italian workers who brought dry pasta with them.
+ ` as Markup,
+ },
+ },
+ {
+ title:
+ 'Meringue with double cream, a dessert made of whipped egg whites, traditionally accompanied by double Gruyère cream',
+ icon: '',
+ textContent: {
+ markup: `
+ The Oxford English Dictionary states that the French word is of unknown origin. The name meringue for this confection first appeared in print in François Massialot's cookbook of 1692.
+ ` as Markup,
+ },
+ },
+ ],
+ },
+} satisfies StoryObj;
diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
new file mode 100644
index 000000000..60cde5299
--- /dev/null
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -0,0 +1,125 @@
+import { BlockAccordionFragment, Html } from '@custom/schema';
+import {
+ ArrowRightCircleIcon,
+ CheckCircleIcon,
+ QuestionMarkCircleIcon,
+} from '@heroicons/react/20/solid';
+import clsx from 'clsx';
+import { Accordion, CustomFlowbiteTheme, Flowbite } from 'flowbite-react';
+import type { Element } from 'hast';
+import { selectAll } from 'hast-util-select';
+import React, { PropsWithChildren } from 'react';
+import { Plugin } from 'unified';
+
+const unorderedItems: Plugin<[], Element> = () => (tree) => {
+ selectAll('ul > li', tree).forEach((node) => {
+ node.properties!.unordered = true;
+ });
+};
+
+const accordionTheme: CustomFlowbiteTheme['accordion'] = {
+ root: {
+ base: 'mt-10 divide-y divide-gray-200 border-gray-200',
+ flush: {
+ off: 'last:border-0',
+ on: 'last:border-0',
+ },
+ },
+ content: {
+ base: 'pb-5 pt-5 text-base font-normal text-gray-500',
+ },
+ title: {
+ base: 'flex w-full items-center justify-between p-4 pl-1 text-left font-medium text-lg text-gray-500',
+ flush: {
+ off: 'hover:bg-gray-100',
+ on: 'bg-transparent',
+ },
+ heading: '',
+ open: {
+ off: '',
+ on: 'text-gray-900',
+ },
+ },
+};
+
+// Applying the custom theme to the Accordion component
+// doesn't work out, wrapping it in a Flowbite component.
+const theme: CustomFlowbiteTheme = {
+ accordion: accordionTheme,
+};
+
+export function BlockAccordion(props: BlockAccordionFragment) {
+ return (
+
+
+
+
+
+ {props.items.map((item, index) => (
+
+
+
+ {item.icon && }{' '}
+ {item.title}
+
+
+
+
+ {item.textContent?.markup && (
+ ) => {
+ return (
+
+ {children}
+
+ );
+ },
+ }}
+ markup={item.textContent.markup}
+ />
+ )}
+
+
+
+ ))}
+
+
+
+
+
+ );
+}
+
+function AccordionIcon({ icon }: { icon: string }) {
+ switch (icon) {
+ case 'questionmark':
+ return (
+
+ );
+ case 'checkmark':
+ return (
+
+ );
+ case 'arrow':
+ return (
+
+ );
+ default:
+ return null;
+ }
+}
diff --git a/packages/ui/src/components/Organisms/PageDisplay.tsx b/packages/ui/src/components/Organisms/PageDisplay.tsx
index b29c0a92b..a1de21c85 100644
--- a/packages/ui/src/components/Organisms/PageDisplay.tsx
+++ b/packages/ui/src/components/Organisms/PageDisplay.tsx
@@ -5,6 +5,7 @@ import { isTruthy } from '../../utils/isTruthy';
import { UnreachableCaseError } from '../../utils/unreachable-case-error';
import { BreadCrumbs } from '../Molecules/Breadcrumbs';
import { PageTransition } from '../Molecules/PageTransition';
+import { BlockAccordion } from './PageContent/BlockAccordion';
import { BlockCta } from './PageContent/BlockCta';
import { BlockForm } from './PageContent/BlockForm';
import { BlockHorizontalSeparator } from './PageContent/BlockHorizontalSeparator';
@@ -63,6 +64,8 @@ export function PageDisplay(page: PageFragment) {
return ;
case 'BlockHorizontalSeparator':
return ;
+ case 'BlockAccordion':
+ return ;
default:
throw new UnreachableCaseError(block);
}
diff --git a/packages/ui/src/components/Routes/Page.stories.tsx b/packages/ui/src/components/Routes/Page.stories.tsx
index 27ead643b..b1fe0090f 100644
--- a/packages/ui/src/components/Routes/Page.stories.tsx
+++ b/packages/ui/src/components/Routes/Page.stories.tsx
@@ -10,6 +10,7 @@ import { Meta, StoryObj } from '@storybook/react';
import React from 'react';
import { image } from '../../helpers/image';
+import { AccordionItemText } from '../Organisms/PageContent/BlockAccordion.stories';
import { Mixed, Paragraph } from '../Organisms/PageContent/BlockMarkup.stories';
import { WithCaption } from '../Organisms/PageContent/BlockMedia.stories';
import { Default as FrameStory } from './Frame.stories';
@@ -53,6 +54,10 @@ export const Default = {
__typename: 'BlockMarkup',
...Paragraph.args,
},
+ {
+ __typename: 'BlockAccordion',
+ ...AccordionItemText.args,
+ },
] as Exclude['content'],
},
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cf1905123..642d8ebde 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -532,6 +532,9 @@ importers:
clsx:
specifier: ^2.1.0
version: 2.1.0
+ flowbite-react:
+ specifier: ^0.9.0
+ version: 0.9.0(react-dom@18.2.0)(react@18.2.0)(tailwindcss@3.4.0)
framer-motion:
specifier: ^10.17.4
version: 10.17.4(react-dom@18.2.0)(react@18.2.0)
@@ -4158,14 +4161,12 @@ packages:
resolution: {integrity: sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==}
dependencies:
'@floating-ui/utils': 0.2.1
- dev: true
/@floating-ui/dom@1.6.3:
resolution: {integrity: sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==}
dependencies:
'@floating-ui/core': 1.6.0
'@floating-ui/utils': 0.2.1
- dev: true
/@floating-ui/react-dom@2.0.8(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==}
@@ -4176,11 +4177,22 @@ packages:
'@floating-ui/dom': 1.6.3
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
- dev: true
+
+ /@floating-ui/react@0.26.10(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-sh6f9gVvWQdEzLObrWbJ97c0clJObiALsFe0LiR/kb3tDRKwEhObASEH2QyfdoO/ZBPzwxa9j+nYFo+sqgbioA==}
+ peerDependencies:
+ react: '>=16.8.0'
+ react-dom: '>=16.8.0'
+ dependencies:
+ '@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.2.0)
+ '@floating-ui/utils': 0.2.1
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
+ tabbable: 6.2.0
+ dev: false
/@floating-ui/utils@0.2.1:
resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==}
- dev: true
/@formatjs/cli@6.2.4:
resolution: {integrity: sha512-g1o9O143F5TGB55skib3fKbyjifPa9YoDcX9L07hVJocRKngCcu4JhKViyUSN55KGcN2ttfBomM+wihN6wtBSQ==}
@@ -7273,6 +7285,10 @@ packages:
resolution: {integrity: sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==}
dev: true
+ /@popperjs/core@2.11.8:
+ resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
+ dev: false
+
/@radix-ui/number@1.0.1:
resolution: {integrity: sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==}
dependencies:
@@ -10374,6 +10390,7 @@ packages:
typescript: 5.4.4
transitivePeerDependencies:
- supports-color
+ dev: false
/@typescript-eslint/parser@6.17.0(eslint@7.0.0)(typescript@5.3.3):
resolution: {integrity: sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A==}
@@ -10687,6 +10704,7 @@ packages:
typescript: 5.4.4
transitivePeerDependencies:
- supports-color
+ dev: false
/@typescript-eslint/typescript-estree@6.17.0(typescript@5.3.3):
resolution: {integrity: sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg==}
@@ -11017,7 +11035,7 @@ packages:
vite: ^4 || ^5
dependencies:
'@swc/core': 1.4.13
- vite: 5.0.10(@types/node@18.0.0)
+ vite: 5.0.10(@types/node@20.11.17)
transitivePeerDependencies:
- '@swc/helpers'
dev: true
@@ -12001,6 +12019,7 @@ packages:
/aggregate-error@3.1.0:
resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
engines: {node: '>=8'}
+ requiresBuild: true
dependencies:
clean-stack: 2.2.0
indent-string: 4.0.0
@@ -13793,6 +13812,10 @@ packages:
static-extend: 0.1.2
dev: false
+ /classnames@2.5.1:
+ resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
+ dev: false
+
/clean-deep@3.4.0:
resolution: {integrity: sha512-Lo78NV5ItJL/jl+B5w0BycAisaieJGXK1qYi/9m4SjR8zbqmrUtO7Yhro40wEShGmmxs/aJLI/A+jNhdkXK8mw==}
engines: {node: '>=4'}
@@ -13805,6 +13828,7 @@ packages:
/clean-stack@2.2.0:
resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
engines: {node: '>=6'}
+ requiresBuild: true
/clean-stack@4.2.0:
resolution: {integrity: sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==}
@@ -14981,6 +15005,11 @@ packages:
resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
dev: true
+ /debounce@2.0.0:
+ resolution: {integrity: sha512-xRetU6gL1VJbs85Mc4FoEGSjQxzpdxRyFhe3lmWFyy2EzydIcD4xzUvRJMD+NPDfMwKNhxa3PvsIOU32luIWeA==}
+ engines: {node: '>=18'}
+ dev: false
+
/debug@2.6.9:
resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
peerDependencies:
@@ -16438,6 +16467,7 @@ packages:
/encoding@0.1.13:
resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
+ requiresBuild: true
dependencies:
iconv-lite: 0.6.3
@@ -17095,7 +17125,7 @@ packages:
eslint-import-resolver-webpack:
optional: true
dependencies:
- '@typescript-eslint/parser': 5.62.0(eslint@7.32.0)(typescript@5.4.4)
+ '@typescript-eslint/parser': 5.62.0(eslint@7.32.0)(typescript@4.9.5)
debug: 3.2.7
eslint: 7.32.0
eslint-import-resolver-node: 0.3.9
@@ -17202,7 +17232,7 @@ packages:
'@typescript-eslint/parser':
optional: true
dependencies:
- '@typescript-eslint/parser': 5.62.0(eslint@7.32.0)(typescript@5.4.4)
+ '@typescript-eslint/parser': 5.62.0(eslint@7.32.0)(typescript@4.9.5)
array-includes: 3.1.8
array.prototype.findlastindex: 1.2.5
array.prototype.flat: 1.3.2
@@ -18577,6 +18607,32 @@ packages:
engines: {node: '>=0.4.0'}
dev: true
+ /flowbite-react@0.9.0(react-dom@18.2.0)(react@18.2.0)(tailwindcss@3.4.0):
+ resolution: {integrity: sha512-wRGzTPHaEuRSXiAFhdTuksezABE/AjI/iyOOBGZpsFAz/sq7zuorAqjRud9FWgy3TlFPtldl7kL93wNY2nOnKQ==}
+ peerDependencies:
+ react: '>=18'
+ react-dom: '>=18'
+ tailwindcss: ^3
+ dependencies:
+ '@floating-ui/core': 1.6.0
+ '@floating-ui/react': 0.26.10(react-dom@18.2.0)(react@18.2.0)
+ classnames: 2.5.1
+ debounce: 2.0.0
+ flowbite: 2.3.0
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
+ react-icons: 5.0.1(react@18.2.0)
+ tailwind-merge: 2.2.2
+ tailwindcss: 3.4.0
+ dev: false
+
+ /flowbite@2.3.0:
+ resolution: {integrity: sha512-pm3JRo8OIJHGfFYWgaGpPv8E+UdWy0Z3gEAGufw+G/1dusaU/P1zoBLiQpf2/+bYAi+GBQtPVG86KYlV0W+AFQ==}
+ dependencies:
+ '@popperjs/core': 2.11.8
+ mini-svg-data-uri: 1.4.4
+ dev: false
+
/flush-write-stream@2.0.0:
resolution: {integrity: sha512-uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g==}
dependencies:
@@ -24707,7 +24763,6 @@ packages:
/mini-svg-data-uri@1.4.4:
resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==}
hasBin: true
- dev: true
/minimatch@3.1.2:
resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
@@ -25943,6 +25998,7 @@ packages:
/p-limit@4.0.0:
resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+ requiresBuild: true
dependencies:
yocto-queue: 1.0.0
@@ -25993,6 +26049,7 @@ packages:
/p-map@4.0.0:
resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
engines: {node: '>=10'}
+ requiresBuild: true
dependencies:
aggregate-error: 3.1.0
@@ -26700,7 +26757,6 @@ packages:
postcss-value-parser: 4.2.0
read-cache: 1.0.0
resolve: 1.22.8
- dev: true
/postcss-import@15.1.0(postcss@8.4.38):
resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
@@ -26735,7 +26791,6 @@ packages:
dependencies:
camelcase-css: 2.0.1
postcss: 8.4.32
- dev: true
/postcss-js@4.0.1(postcss@8.4.38):
resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==}
@@ -26763,7 +26818,6 @@ packages:
lilconfig: 3.1.1
postcss: 8.4.32
yaml: 2.3.4
- dev: true
/postcss-load-config@4.0.2(postcss@8.4.38):
resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
@@ -26779,7 +26833,7 @@ packages:
dependencies:
lilconfig: 3.1.1
postcss: 8.4.38
- yaml: 2.3.4
+ yaml: 2.4.1
/postcss-load-config@5.0.3(postcss@8.4.32):
resolution: {integrity: sha512-90pBBI5apUVruIEdCxZic93Wm+i9fTrp7TXbgdUCH+/L+2WnfpITSpq5dFU/IPvbv7aNiMlQISpUkAm3fEcvgQ==}
@@ -26986,7 +27040,6 @@ packages:
dependencies:
postcss: 8.4.32
postcss-selector-parser: 6.0.16
- dev: true
/postcss-nested@6.0.1(postcss@8.4.38):
resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
@@ -27328,7 +27381,6 @@ packages:
nanoid: 3.3.7
picocolors: 1.0.0
source-map-js: 1.2.0
- dev: true
/postcss@8.4.38:
resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
@@ -28144,6 +28196,14 @@ packages:
source-map: 0.7.4
dev: false
+ /react-icons@5.0.1(react@18.2.0):
+ resolution: {integrity: sha512-WqLZJ4bLzlhmsvme6iFdgO8gfZP17rfjYEJ2m9RsZjZ+cc4k1hTzknEz63YS1MeT50kVzoa1Nz36f4BEx+Wigw==}
+ peerDependencies:
+ react: '*'
+ dependencies:
+ react: 18.2.0
+ dev: false
+
/react-immutable-proptypes@2.2.0(immutable@3.8.2):
resolution: {integrity: sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==}
peerDependencies:
@@ -30331,6 +30391,7 @@ packages:
/sprintf-js@1.1.3:
resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
+ requiresBuild: true
/sqlite3@5.1.7:
resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==}
@@ -30903,6 +30964,10 @@ packages:
resolution: {integrity: sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==}
engines: {node: '>=18'}
+ /tabbable@6.2.0:
+ resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==}
+ dev: false
+
/table@5.4.6:
resolution: {integrity: sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==}
engines: {node: '>=6.0.0'}
@@ -30936,6 +31001,12 @@ packages:
- supports-color
dev: false
+ /tailwind-merge@2.2.2:
+ resolution: {integrity: sha512-tWANXsnmJzgw6mQ07nE3aCDkCK4QdT3ThPMCzawoYA2Pws7vSTCvz3Vrjg61jVUGfFZPJzxEP+NimbcW+EdaDw==}
+ dependencies:
+ '@babel/runtime': 7.24.4
+ dev: false
+
/tailwindcss@3.4.0:
resolution: {integrity: sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA==}
engines: {node: '>=14.0.0'}
@@ -30965,7 +31036,6 @@ packages:
sucrase: 3.35.0
transitivePeerDependencies:
- ts-node
- dev: true
/tailwindcss@3.4.3:
resolution: {integrity: sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==}
@@ -31657,6 +31727,7 @@ packages:
dependencies:
tslib: 1.14.1
typescript: 5.4.4
+ dev: false
/tsx@4.7.1:
resolution: {integrity: sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==}
diff --git a/tests/schema/specs/blocks.spec.ts b/tests/schema/specs/blocks.spec.ts
index 6b1b0f714..1786fc59b 100644
--- a/tests/schema/specs/blocks.spec.ts
+++ b/tests/schema/specs/blocks.spec.ts
@@ -76,6 +76,19 @@ test('Blocks', async () => {
... on BlockHorizontalSeparator {
__typename
}
+ ... on BlockAccordion {
+ items {
+ __typename
+ ... on BlockAccordionItemText {
+ __typename
+ title
+ icon
+ textContent {
+ markup
+ }
+ }
+ }
+ }
}
}
{
@@ -224,10 +237,31 @@ test('Blocks', async () => {
"role": "Project manager",
},
{
- "__typename": "BlockMarkup",
- "markup": "
-
+ "__typename": "BlockAccordion",
+ "items": [
+ {
+ "__typename": "BlockAccordionItemText",
+ "icon": "",
+ "textContent": {
+ "markup": "
+ Incididunt laborum velit non proident nostrud velit. Minim excepteur ut aliqua nisi. Culpa laboris consectetur proident. Tempor esse ullamco et dolor proident id officia laborum voluptate nostrud elit dolore qui amet. Ex Lorem irure eu anim ipsum officia.
+ ",
+ },
+ "title": "With a single paragraph and no icon",
+ },
+ {
+ "__typename": "BlockAccordionItemText",
+ "icon": "arrow",
+ "textContent": {
+ "markup": "
+ - Moitié-moitié
- Fribourgeoise
+
+ Incididunt laborum velit non proident nostrud velit. Minim excepteur ut aliqua nisi. Culpa laboris consectetur proident. Tempor esse ullamco et dolor proident id officia laborum voluptate nostrud elit dolore qui amet. Ex Lorem irure eu anim ipsum officia.
",
+ },
+ "title": "With a list and a paragraph and arrow icon",
+ },
+ ],
},
],
"hero": {