@remkoj/optimizely-cms-react 4.3.1 → 5.0.1

package/dist/components/cms-content-area/types.d.ts

@@ -1,8 +1,8 @@
 import type { ReactNode, SuspenseProps } from "react";
-import type { PropsWithContext } from "../../context/types.js";
+import type { PropsWithContext, PropsWithOptionalContext } from "../../context/types.js";
 import type { PropsWithCmsContent } from "../cms-content/types.js";
 import type { ContentType } from "../../types.js";
-import type { ElementChildrenProps, ElementProps, ElementType, PropTypeIfPropExists, MayBeArray, TypeIfPropExists } from '../type-utils.js';
+import type { ElementChildrenProps, ElementProps, ElementType, PropTypeIfPropExists, MayBeArray, TypeIfPropExists, ReservedKeys } from '../type-utils.js';
 export type ContentAreaItemDefinition = {
     __typename?: string | null;
     _type?: string | null;
@@ -35,21 +35,27 @@ export type ValidContentAreaItemDefinition = {
         } | null;
     };
 } & Record<string, any>;
-export type CmsContentAreaProps<T extends ElementType, CT extends ElementType> = {
+export type ItemsProperty<T extends ElementType> = "children" extends ElementChildrenProps<T> ? {
     /**
-     * The content area items to be rendered
+     * The property of the component set for the "as" property of the Content Area which
+     * should receive the items within the Content Area.
+     *
+     * Defaults to "children", if not provided
      */
-    items: (ContentAreaItemDefinition | null | undefined)[] | undefined | null;
+    itemsProperty?: ElementChildrenProps<T>;
+} : {
     /**
-     * The mapper used to apply CSS Classes to items, based upon
-     * the display mode (PaaS Only), Content type and position in
-     * content area.
+     * The property of the component set for the "as" property of the Content Area which
+     * should receive the items within the Content Area.
      */
-    classMapper?: TypeIfPropExists<T, "className", CmsContentAreaClassMapper>;
+    itemsProperty: ElementChildrenProps<T>;
+};
+export type PassthroughProps<T extends ElementType, ParentKeys extends string | number | symbol> = Omit<ElementProps<T>, ParentKeys | ReservedKeys | ElementChildrenProps<T>>;
+export type CmsContentAreaCoreProps = PropsWithOptionalContext<{
     /**
-     * The CSS Class to apply to the content area container
+     * The content area items to be rendered
      */
-    className?: MayBeArray<PropTypeIfPropExists<T, "className">>;
+    items: (ContentAreaItemDefinition | null | undefined)[] | undefined | null;
     /**
      * Whether or not a suspense must be applied around each item of the
      * ContentArea to allow dynamic content within the ContentArea items.
@@ -64,10 +70,6 @@ export type CmsContentAreaProps<T extends ElementType, CT extends ElementType> =
      * editing
      */
     fieldName?: string;
-    /**
-     * The HTML element, or React Component to use to render the Content Area Container
-     */
-    as?: T;
     /**
      * If set to true, there will be no wrapping element around the
      * items in the Content Area. Setting this to `true` ignores
@@ -78,54 +80,44 @@ export type CmsContentAreaProps<T extends ElementType, CT extends ElementType> =
      * renditions, without changing the main path of the component.
      */
     variant?: string;
+}>;
+export type CmsContentAreaWrapperProps<T extends ElementType, CT extends ElementType> = {
+    /**
+     * The HTML element, or React Component to use to render the Content Area Container
+     */
+    as?: T;
     /**
-     * Configure the wrapper around each item within the ContentArea
+     * The mapper used to apply CSS Classes to items, based upon
+     * the display mode (PaaS Only), Content type and position in
+     * content area.
      */
-    itemWrapper?: ({
-        /**
-         * Override the element type used to wrap the CMS Content Item
-         */
-        as?: CT;
-        /**
-         * If set to true, there will be no wrapping element around the
-         * CmsContent used to render the item. Setting this to `true`
-         * ignores all other `itemWrapper` properties.
-         */
-        noWrapper?: boolean;
-        /**
-         * The CSS Class to apply to the content area item wrapper
-         */
-        className?: MayBeArray<PropTypeIfPropExists<CT, "className">>;
-    } & ("children" extends ElementChildrenProps<CT> ? {
-        /**
-         * The property of the component set for the "as" property of the Content Area Item
-         * which should receive the items within the Content Area.
-         *
-         * Defaults to "children", if not provided
-         */
-        itemsProperty?: ElementChildrenProps<CT>;
-    } : {
-        /**
-         * The property of the component set for the "as" property of the Content Area Item
-         * which should receive the items within the Content Area.
-         */
-        itemsProperty: ElementChildrenProps<CT>;
-    }) & Omit<Omit<ElementProps<CT>, "className" | "data-epi-block-id" | "data-displayoption" | "data-tag">, ElementChildrenProps<CT>>);
-} & Omit<Omit<ElementProps<T>, "className" | "data-epi-edit">, ElementChildrenProps<T>> & ("children" extends ElementChildrenProps<T> ? {
+    classMapper?: TypeIfPropExists<T, "className", CmsContentAreaClassMapper>;
     /**
-     * The property of the component set for the "as" property of the Content Area which
-     * should receive the items within the Content Area.
-     *
-     * Defaults to "children", if not provided
+     * The CSS Class to apply to the content area item wrapper
      */
-    itemsProperty?: ElementChildrenProps<T>;
-} : {
+    className?: MayBeArray<PropTypeIfPropExists<T, "className">>;
     /**
-     * The property of the component set for the "as" property of the Content Area which
-     * should receive the items within the Content Area.
+     * Configure the wrapper for each item within the ContentArea
      */
-    itemsProperty: ElementChildrenProps<T>;
-});
+    itemWrapper?: CmsContentAreaItemWrapperProps<CT>;
+} & ItemsProperty<T> & PassthroughProps<T, "as" | "classMapper" | "className" | "itemWrapper" | keyof CmsContentAreaCoreProps>;
+export type CmsContentAreaItemWrapperProps<CT extends ElementType> = ({
+    /**
+     * Override the element type used to wrap the CMS Content Item
+     */
+    as?: CT;
+    /**
+     * If set to true, there will be no wrapping element around the
+     * CmsContent used to render the item. Setting this to `true`
+     * ignores all other `itemWrapper` properties.
+     */
+    noWrapper?: boolean;
+    /**
+     * The CSS Class to apply to the content area item wrapper
+     */
+    className?: MayBeArray<PropTypeIfPropExists<CT, "className">>;
+} & ItemsProperty<CT> & PassthroughProps<CT, "as" | "noWrapper" | "className">);
+export type CmsContentAreaProps<T extends ElementType, CT extends ElementType> = CmsContentAreaCoreProps & CmsContentAreaWrapperProps<T, CT>;
 export type CmsContentAreaClassMapper = (displayOption: string, contentType: ContentType | null, index: number) => string;
 export type BaseCmsContentAreaProps<T extends ElementType, CT extends ElementType> = PropsWithCmsContent<PropsWithContext<CmsContentAreaProps<T, CT>>>;
 export type CmsContentAreaBaseComponent = <T extends ElementType, CT extends ElementType>(props: BaseCmsContentAreaProps<T, CT>) => ReactNode;

package/dist/components/cms-editable/index.d.ts

@@ -1,21 +1,56 @@
-import { type ComponentProps, type ComponentType as ReactComponentType, type ExoticComponent as ReactExoticComponent, type ReactNode } from 'react';
-import { PropsWithContext } from '../../context/types.js';
-export type EditableComponentType = (ReactComponentType<any>) | (ReactExoticComponent<any>) | (keyof JSX.IntrinsicElements);
-export type EditableComponentProps<FT extends EditableComponentType> = FT extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[FT] : ComponentProps<FT>;
-export type CmsEditableProps<FT extends EditableComponentType> = {
+import { PropsWithChildren, type ReactNode } from 'react';
+import { GenericContext, PropsWithContext } from '../../context/types.js';
+import type { ElementType, GenericContextProps, ElementProps } from '../type-utils.js';
+import { type ContentLink } from '@remkoj/optimizely-graph-client';
+export type CmsEditableProps<FT extends ElementType> = PropsWithChildren<{
+    /**
+     * Override the component used to render, instead of wrapping the children. It allows
+     * any valid JSX identifier (e.g. HTML Element, Component or ExoticComponent)
+     */
     as?: FT;
-} & ({
+    /**
+     * The identifier of the component wrapped in this CmsEditable component. This will
+     * add the 'data-epi-block-id' property to the component.
+     */
     cmsId?: string | null;
-    cmsFieldName?: never;
-} | {
-    cmsId?: never;
+    /**
+     * The name of the component field wrapped by this CmsEditable component. This will
+     * add the 'data-epi-property-name' property to the component.
+     */
     cmsFieldName?: string | null;
-}) & EditableComponentProps<FT>;
-export type CmsEditableComponent = <CT extends EditableComponentType>(props: CmsEditableProps<CT>) => ReactNode;
-export type CmsEditableBaseComponent = <CT extends EditableComponentType>(props: PropsWithContext<CmsEditableProps<CT>>) => ReactNode;
+    /**
+     * The Context to be used when determining if the page rendering happens in edit mode
+     * or not.
+     */
+    ctx?: GenericContext;
+    /**
+     * The default CTX paramteer is caught by this component, set this to true to pass the
+     * `ctx` property to the 'as' Component, or set to a valid property name to pass into
+     * that property.
+     */
+    forwardCtx?: ElementProps<FT>['ctx'] extends GenericContext ? boolean | GenericContextProps<FT> : GenericContextProps<FT>;
+    /**
+     * If set, the `data-epi-block-id` attribute will always be included when the `cmsId`
+     * parameter is being set.
+     */
+    forceBlockId?: boolean;
+    /**
+     * If set, this will be used to test if the content item being rendered is actually
+     * the one being edited. This allows
+     */
+    currentContent?: ContentLink;
+    /**
+     * Override the value for the `data-epi-property-edittype` property
+     */
+    editType?: 'floating' | 'inline' | null;
+} & Omit<ElementProps<FT>, 'as' | 'cmsId' | 'cmsFieldName' | 'ctx' | 'forwardCtx'>>;
+export type CmsEditableComponent = <CT extends ElementType>(props: CmsEditableProps<CT>) => ReactNode;
+export type CmsEditableBaseComponent = <CT extends ElementType>(props: PropsWithContext<CmsEditableProps<CT>>) => ReactNode;
 /**
  * Server side wrapper to create HTML elements that include the needed
- * data-epi- properties to render the edit mode markers
+ * data-epi- properties to render the edit mode markers. If the `cmsId`
+ * is a 32 character long string, it is assumed to be a GUID and rendered
+ * as `data-epi-content-id`, otherwise it is rendered as `data-epi-block-id`.
  *
  * @param   param0      The HTML element with the simple properties
  * @returns

package/dist/components/cms-editable/index.js

@@ -1,15 +1,58 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Server side wrapper to create HTML elements that include the needed
- * data-epi- properties to render the edit mode markers
+ * data-epi- properties to render the edit mode markers. If the `cmsId`
+ * is a 32 character long string, it is assumed to be a GUID and rendered
+ * as `data-epi-content-id`, otherwise it is rendered as `data-epi-block-id`.
  *
  * @param   param0      The HTML element with the simple properties
  * @returns
  */
-//@ts-expect-error Typescript doesn't understand the property type :'(
-export const CmsEditable = ({ ctx, as: DefaultElement = 'div', cmsId, cmsFieldName, children, key, ...props }) => {
-    const { inEditMode } = ctx;
-    return _jsx(DefaultElement, { ...props, "data-epi-block-id": inEditMode ? cmsId ?? undefined : undefined, "data-epi-property-name": inEditMode ? cmsFieldName ?? undefined : undefined, children: children });
+export const CmsEditable = ({ ctx, forwardCtx, as, cmsId, cmsFieldName, children, key, forceBlockId, currentContent, editType, ...props }) => {
+    const { inEditMode, isDebugOrDevelopment, isDebug, editableContent, editableContentIsExperience, } = ctx || {
+        inEditMode: false,
+        isDebug: true,
+        isDebugOrDevelopment: true,
+        editableContentIsExperience: false,
+    };
+    const DefaultElement = as || 'div';
+    if (isDebugOrDevelopment && inEditMode && !cmsFieldName && !cmsId) {
+        console.warn(`⚠ [CmsEditable] CMS Editable used without a fieldname or id, this will not ouline the item`);
+        if (isDebug) {
+            console.trace('This happened here');
+        }
+    }
+    const addEditProps = inEditMode
+        ? currentContent
+            ? editableContent?.key == currentContent.key
+            : true
+        : false;
+    // If we're rendering for an experience, we don't need to inject property names, as the
+    // experience editor only deals with property ids - injecting property names will cause
+    // it to outline incorrect items.
+    const dataEpiPropertyName = editableContentIsExperience
+        ? undefined
+        : (cmsFieldName ?? undefined);
+    const itemProps = addEditProps
+        ? {
+            ...props,
+            // We assume GUIDs are represented as 32 char long strings, all other values are IDs
+            'data-epi-block-id': cmsId && (cmsId.length != 32 || forceBlockId) ? cmsId : undefined,
+            // We assume GUIDs are represented as 32 char long strings
+            'data-epi-content-id': cmsId && cmsId.length == 32 ? cmsId : undefined,
+            // We pass through the property name if provided
+            'data-epi-property-name': dataEpiPropertyName,
+            // Configure the rendition of the property editor
+            'data-epi-property-edittype': editType ?? undefined,
+        }
+        : {
+            ...props,
+        };
+    if (forwardCtx === true)
+        itemProps['ctx'] = ctx;
+    if (typeof forwardCtx == 'string' && forwardCtx.length > 0)
+        itemProps[forwardCtx] = ctx;
+    return _jsx(DefaultElement, { ...itemProps, children: children });
 };
 export default CmsEditable;
 //# sourceMappingURL=index.js.map

package/dist/components/cms-editable/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/cms-editable/index.tsx"],"names":[],"mappings":";AAiBA;;;;;;GAMG;AACH,sEAAsE;AACtE,MAAM,CAAC,MAAM,WAAW,GAA8B,CAA2C,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,GAAG,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,KAAK,EAA0C,EAAE,EAAE;IAE1N,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAA;IAC1B,OAAO,KAAC,cAAc,OAAK,KAAK,uBAAsB,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,4BAA4B,UAAU,CAAC,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,YAAK,QAAQ,GAAmB,CAAA;AACnN,CAAC,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/cms-editable/index.tsx"],"names":[],"mappings":";AAyEA;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,WAAW,GAA6B,CAAyB,EAC5E,GAAG,EACH,UAAU,EACV,EAAE,EACF,KAAK,EACL,YAAY,EACZ,QAAQ,EACR,GAAG,EACH,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,GAAG,KAAK,EAC+B,EAAE,EAAE;IAC3C,MAAM,EACJ,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,eAAe,EACf,2BAA2B,GAC5B,GAAG,GAAG,IAAI;QACT,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,IAAI;QACb,oBAAoB,EAAE,IAAI;QAC1B,2BAA2B,EAAE,KAAK;KACnC,CAAA;IACD,MAAM,cAAc,GAAG,EAAE,IAAI,KAAK,CAAA;IAElC,IAAI,oBAAoB,IAAI,UAAU,IAAI,CAAC,YAAY,IAAI,CAAC,KAAK,EAAE,CAAC;QAClE,OAAO,CAAC,IAAI,CACV,4FAA4F,CAC7F,CAAA;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACrC,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAAG,UAAU;QAC7B,CAAC,CAAC,cAAc;YACd,CAAC,CAAC,eAAe,EAAE,GAAG,IAAI,cAAc,CAAC,GAAG;YAC5C,CAAC,CAAC,IAAI;QACR,CAAC,CAAC,KAAK,CAAA;IAET,uFAAuF;IACvF,uFAAuF;IACvF,iCAAiC;IACjC,MAAM,mBAAmB,GAAG,2BAA2B;QACrD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC,CAAA;IAE/B,MAAM,SAAS,GAAwB,YAAY;QACjD,CAAC,CAAC;YACE,GAAG,KAAK;YACR,oFAAoF;YACpF,mBAAmB,EACjB,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACnE,0DAA0D;YAC1D,qBAAqB,EAAE,KAAK,IAAI,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACtE,gDAAgD;YAChD,wBAAwB,EAAE,mBAAmB;YAC7C,iDAAiD;YACjD,4BAA4B,EAAE,QAAQ,IAAI,SAAS;SACpD;QACH,CAAC,CAAC;YACE,GAAG,KAAK;SACT,CAAA;IAEL,IAAI,UAAU,KAAK,IAAI;QAAE,SAAS,CAAC,KAAK,CAAC,GAAG,GAAG,CAAA;IAC/C,IAAI,OAAO,UAAU,IAAI,QAAQ,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QACxD,SAAS,CAAC,UAAU,CAAC,GAAG,GAAG,CAAA;IAE7B,OAAO,KAAC,cAAc,OAAK,SAAS,YAAG,QAAQ,GAAkB,CAAA;AACnE,CAAC,CAAA;AAED,eAAe,WAAW,CAAA"}

package/dist/components/rich-text/components.d.ts

@@ -1,6 +1,7 @@
-import { type FunctionComponent, type PropsWithChildren } from "react";
-import { ComponentTypeDictionary } from "../../factory/types.js";
-import type { TextNode, TypedNode } from "./types.js";
+import { type FunctionComponent, type PropsWithChildren } from 'react';
+import { ComponentTypeDictionary } from '../../factory/types.js';
+import type { TextNode, TypedNode } from './types.js';
+import { type PropsWithOptionalContext } from '../../context/types.js';
 /**
  * Create a React Component to render an element within a Rich-Text area.
  * The generated React Component contains the logic to transform the attributes
@@ -16,12 +17,12 @@ import type { TextNode, TypedNode } from "./types.js";
  *
  * @returns     The React Component
  */
-export declare function createHtmlComponent<E extends keyof JSX.IntrinsicElements>(element: E, ignoreChildren?: boolean, defaultProps?: JSX.IntrinsicElements[E] & Record<string, string>): ({ children, node, ...props }: PropsWithChildren<JSX.IntrinsicElements[E] & {
+export declare function createHtmlComponent<E extends keyof JSX.IntrinsicElements>(element: E, ignoreChildren?: boolean, defaultProps?: JSX.IntrinsicElements[E] & Record<string, string>): ({ children, node, ctx, ...props }: PropsWithOptionalContext<PropsWithChildren<JSX.IntrinsicElements[E] & {
     node: TypedNode;
-}>) => import("react/jsx-runtime").JSX.Element;
-export declare const DefaultTextNode: FunctionComponent<{
+}>>) => import("react/jsx-runtime").JSX.Element;
+export declare const DefaultTextNode: FunctionComponent<PropsWithOptionalContext<{
     node: TextNode;
-}>;
+}>>;
 /**
  * A default component dictionary that allows to serialize the structured HTML
  * into React, using the component library shared across the react SDK.

package/dist/components/rich-text/components.js

@@ -20,11 +20,13 @@ const reservedProps = ['url', 'class', 'children', 'type', 'internal', 'base'];
  */
 export function createHtmlComponent(element, ignoreChildren = false, defaultProps) {
     const HtmlElement = element;
-    const component = ({ children, node, ...props }) => {
+    const component = ({ children, node, ctx, ...props }) => {
         const nodeProps = {};
         const renderProps = Object.getOwnPropertyNames(node);
         // Copy over non-reserved Props
-        renderProps.filter(x => !reservedProps.includes(x)).forEach(x => nodeProps[x] = node[x]);
+        renderProps
+            .filter((x) => !reservedProps.includes(x))
+            .forEach((x) => (nodeProps[x] = node[x]));
         // Move CSS Class definition into React property name
         if (renderProps.includes('class'))
             nodeProps['className'] = node['class'];
@@ -44,19 +46,17 @@ export function createHtmlComponent(element, ignoreChildren = false, defaultProp
             }
         }
         // Render element
-        return ignoreChildren ?
-            _jsx(HtmlElement, { ...defaultProps, ...nodeProps, ...props }) :
-            _jsx(HtmlElement, { ...defaultProps, ...nodeProps, ...props, children: children });
+        return ignoreChildren ? (_jsx(HtmlElement, { ...defaultProps, ...nodeProps, ...props })) : (_jsx(HtmlElement, { ...defaultProps, ...nodeProps, ...props, children: children }));
     };
     return component;
 }
-export const DefaultTextNode = ({ node }) => {
+export const DefaultTextNode = ({ ctx, node }) => {
     if (node.bold)
         return _jsx("strong", { children: decodeHTML(node.text) });
     if (node.italic)
         return _jsx("em", { children: decodeHTML(node.text) });
-    const unsupportedProps = Object.getOwnPropertyNames(node).filter(x => x != 'text');
-    if (unsupportedProps.length > 0 && process.env.NODE_ENV != 'production')
+    const unsupportedProps = Object.getOwnPropertyNames(node).filter((x) => x != 'text');
+    if (unsupportedProps.length > 0 && ctx?.isDebugOrDevelopment)
         console.warn('🟠 [Rich Text] Text node with unsupported additional properties:', unsupportedProps.join(', '));
     return decodeHTML(node.text);
 };
@@ -66,22 +66,27 @@ export const DefaultTextNode = ({ node }) => {
  */
 export const DefaultComponents = [
     // System types
-    { type: 'RichText/richText', component: createHtmlComponent("div", false, { className: "cms:rich-text" }) },
+    {
+        type: 'RichText/richText',
+        component: createHtmlComponent('div', false, {
+            className: 'cms:rich-text',
+        }),
+    },
     { type: 'RichText/text', component: DefaultTextNode },
     // Aliased tags
-    { type: 'RichText/paragraph', component: createHtmlComponent("p") },
-    { type: 'RichText/heading-one', component: createHtmlComponent("h1") },
-    { type: 'RichText/heading-two', component: createHtmlComponent("h2") },
-    { type: 'RichText/heading-three', component: createHtmlComponent("h3") },
-    { type: 'RichText/heading-four', component: createHtmlComponent("h4") },
-    { type: 'RichText/heading-five', component: createHtmlComponent("h5") },
-    { type: 'RichText/heading-six', component: createHtmlComponent("h6") },
-    { type: 'RichText/link', component: createHtmlComponent("a") },
-    { type: 'RichText/bulleted-list', component: createHtmlComponent("ul") },
-    { type: 'RichText/numbered-list', component: createHtmlComponent("ol") },
-    { type: 'RichText/list-item', component: createHtmlComponent("li") },
-    { type: 'RichText/image', component: createHtmlComponent("img", true) },
+    { type: 'RichText/paragraph', component: createHtmlComponent('p') },
+    { type: 'RichText/heading-one', component: createHtmlComponent('h1') },
+    { type: 'RichText/heading-two', component: createHtmlComponent('h2') },
+    { type: 'RichText/heading-three', component: createHtmlComponent('h3') },
+    { type: 'RichText/heading-four', component: createHtmlComponent('h4') },
+    { type: 'RichText/heading-five', component: createHtmlComponent('h5') },
+    { type: 'RichText/heading-six', component: createHtmlComponent('h6') },
+    { type: 'RichText/link', component: createHtmlComponent('a') },
+    { type: 'RichText/bulleted-list', component: createHtmlComponent('ul') },
+    { type: 'RichText/numbered-list', component: createHtmlComponent('ol') },
+    { type: 'RichText/list-item', component: createHtmlComponent('li') },
+    { type: 'RichText/image', component: createHtmlComponent('img', true) },
     // Self-closing tags
-    { type: 'RichText/br', component: createHtmlComponent("br", true) },
+    { type: 'RichText/br', component: createHtmlComponent('br', true) },
 ];
 //# sourceMappingURL=components.js.map

package/dist/components/rich-text/components.js.map

@@ -1 +1 @@
-{"version":3,"file":"components.js","sourceRoot":"","sources":["../../../src/components/rich-text/components.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"components.js","sourceRoot":"","sources":["../../../src/components/rich-text/components.tsx"],"names":[],"mappings":"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"}

package/dist/components/rich-text/index.d.ts

@@ -1,5 +1,5 @@
-import { type FunctionComponent } from "react";
-import type { RichTextProps } from "./types.js";
-import { type PropsWithContext } from "../../context/types.js";
-export * from "./types.js";
+import { type FunctionComponent } from 'react';
+import type { RichTextProps } from './types.js';
+import { type PropsWithContext } from '../../context/types.js';
+export * from './types.js';
 export declare const RichText: FunctionComponent<PropsWithContext<RichTextProps>>;

package/dist/components/rich-text/index.js

@@ -1,39 +1,36 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import * as Utils from './utils.js';
-import { DefaultComponentFactory } from "../../factory/default.js";
-import { DefaultComponents, DefaultTextNode, createHtmlComponent } from "./components.js";
-import { CmsEditable } from "../cms-editable/index.js";
-export * from "./types.js";
-export const RichText = ({ factory, text = "{ \"type\": \"richText\" }", className = 'rich-text', as: Wrapper = "div", debug = false, noWrapper = false, cmsFieldName = null, cmsId = null, ctx, ...props }) => {
-    const id = Utils.getRandomId("rich-text");
-    const richTextFactory = factory ?? ctx.factory ?? new DefaultComponentFactory(DefaultComponents);
-    const { inEditMode } = ctx;
+import { DefaultComponentFactory } from '../../factory/default.js';
+import { DefaultComponents, DefaultTextNode, createHtmlComponent, } from './components.js';
+import { CmsEditable } from '../cms-editable/index.js';
+export * from './types.js';
+export const RichText = ({ factory, text = '{ "type": "richText" }', className = 'rich-text', as: Wrapper = 'div', debug = false, noWrapper = false, cmsFieldName = null, cmsId = null, ctx, ...props }) => {
+    const id = Utils.getRandomId('rich-text');
+    const richTextFactory = ctx.factory ?? factory ?? new DefaultComponentFactory(DefaultComponents);
     try {
         const data = Utils.processNodeInput(text);
         const textContent = (data?.children || []).map((child, idx) => {
             const elementId = id + '::' + idx;
-            return _jsx(RichTextElement, { factory: richTextFactory, node: child, idPrefix: elementId + '::' }, elementId);
+            return (_jsx(RichTextElement, { factory: richTextFactory, node: child, idPrefix: elementId + '::', ctx: ctx }, elementId));
         });
         if (noWrapper)
             return _jsx(_Fragment, { children: textContent });
-        if (inEditMode && (cmsId || cmsFieldName))
-            return _jsx(CmsEditable, { as: Wrapper, className: className, cmsId: cmsId || undefined, cmsFieldName: cmsFieldName || undefined, ctx: ctx, ...props, children: textContent });
-        return _jsx(Wrapper, { className: className, ...props, children: textContent });
+        return (_jsx(CmsEditable, { as: Wrapper, className: className, cmsId: cmsId || undefined, cmsFieldName: cmsFieldName || undefined, ctx: ctx, ...props, children: textContent }));
     }
     catch {
         if (debug)
             console.warn('🟠 [Rich Text] Invalid rich text received: ', text);
-        return Object.getOwnPropertyNames(props).length > 0 ? _jsx("div", { className: className, ...props }) : null;
+        return Object.getOwnPropertyNames(props).length > 0 ? (_jsx("div", { className: className, ...props })) : null;
     }
 };
 //#region Supportive React components
-const RichTextElement = ({ factory, node, idPrefix, debug }) => {
+const RichTextElement = ({ factory, node, idPrefix, debug, ctx }) => {
     // Render text
     if (Utils.isText(node)) {
         if (node.text.length == 0)
             return null;
         const TextComponent = factory?.resolve(`RichText/text`) ?? DefaultTextNode;
-        return _jsx(TextComponent, { node: node });
+        return _jsx(TextComponent, { node: node, ctx: ctx });
     }
     // Ignore incorrect data
     if (!Utils.isTypedNode(node)) {
@@ -42,10 +39,12 @@ const RichTextElement = ({ factory, node, idPrefix, debug }) => {
         return null;
     }
     // Process children
-    const childData = node.children && (node.children.length > 0) ? node.children.map((child, idx) => {
-        const elementId = idPrefix + idx;
-        return _jsx(RichTextElement, { factory: factory, node: child, idPrefix: elementId + '::' }, elementId);
-    }) : undefined;
+    const childData = node.children && node.children.length > 0
+        ? node.children.map((child, idx) => {
+            const elementId = idPrefix + idx;
+            return (_jsx(RichTextElement, { factory: factory, node: child, idPrefix: elementId + '::', ctx: ctx }, elementId));
+        })
+        : undefined;
     // Resolve component (and add to factory if not yet present)
     let Component = factory?.resolve(`RichText/${node.type}`);
     if (!Component) {
@@ -55,6 +54,6 @@ const RichTextElement = ({ factory, node, idPrefix, debug }) => {
         factory?.register(`RichText/${node.type}`, Component);
     }
     // Return component
-    return _jsx(Component, { node: node, children: childData && (childData.length > 0) ? childData : undefined });
+    return (_jsx(Component, { node: node, ctx: ctx, children: childData && childData.length > 0 ? childData : undefined }));
 };
 //# sourceMappingURL=index.js.map

package/dist/components/rich-text/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/rich-text/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/rich-text/index.tsx"],"names":[],"mappings":"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"}

package/dist/components/rich-text/types.d.ts

@@ -1,5 +1,7 @@
 import type { ComponentType as ReactComponentType } from "react";
-import type { ComponentFactory, ComponentType } from "../../factory/types.js";
+import type { ComponentFactory } from "../../factory/types.js";
+import type { PropsWithOptionalContext } from "../../context/types.js";
+import type { ElementType } from "../type-utils.js";
 export type RichTextProps = {
     /**
      * The component factory used for this rich text content
@@ -20,7 +22,7 @@ export type RichTextProps = {
      * Set the component type of the wrapper to use, defaults to a 'div'
      * element when not defined
      */
-    as?: ComponentType;
+    as?: ElementType;
     /**
      * Control the debugging output
      */
@@ -30,16 +32,6 @@ export type RichTextProps = {
      * will be set on the Fragment to prevent React errors.
      */
     noWrapper?: boolean;
-} & ({
-    /**
-     * The fieldname of this Rich Text, when it is used as part of a block
-     */
-    cmsFieldName?: never;
-    /**
-     * The Element ID if this is the sole output of a Visual Builder element
-     */
-    cmsId?: string | null;
-} | {
     /**
      * The fieldname of this Rich Text, when it is used as part of a block
      */
@@ -47,9 +39,9 @@ export type RichTextProps = {
     /**
      * The Element ID if this is the sole output of a Visual Builder element
      */
-    cmsId?: never;
-});
-export type RichTextComponent = ReactComponentType<RichTextProps>;
+    cmsId?: string | null;
+};
+export type RichTextComponent = ReactComponentType<PropsWithOptionalContext<RichTextProps>>;
 export type RichTextElementProps = Readonly<{
     debug?: boolean;
     factory?: ComponentFactory;