@okam/directus-flexible-content 1.2.24 → 1.3.1

package/CHANGELOG.md

@@ -1,3 +1,88 @@
+## 1.3.0 (2026-01-16)
+
+### 🚀 Features
+
+- ⚠️  React 19 + Next.js 15 upgrade for all @okam/* packages ([#369](https://github.com/OKAMca/stack/pull/369))
+- bump ([ab924b9](https://github.com/OKAMca/stack/commit/ab924b9))
+
+### 🩹 Fixes
+
+- **directus-flexible-content:** remove breaking changes tag ([37954b3](https://github.com/OKAMca/stack/commit/37954b3))
+- **directus-flexible-content:** stop bundling okam libs ([cc8cfed](https://github.com/OKAMca/stack/commit/cc8cfed))
+- **directus-flexible-content:** core-lib in external deps ([e44cb2b](https://github.com/OKAMca/stack/commit/e44cb2b))
+- update vite-plugin-dts to version 3 ([5d33c77](https://github.com/OKAMca/stack/commit/5d33c77))
+- package deps error ([b665a45](https://github.com/OKAMca/stack/commit/b665a45))
+- search field type export ([5ab6070](https://github.com/OKAMca/stack/commit/5ab6070))
+- search field icon ([0850fde](https://github.com/OKAMca/stack/commit/0850fde))
+- select controlled ([#280](https://github.com/OKAMca/stack/pull/280))
+
+### ⚠️  Breaking Changes
+
+- Consumers must now have react and react-dom in their own
+
+### ❤️ Thank You
+
+- Marie-Maxime Tanguay @marie-maxime
+- Pierre-Olivier Clerson @poclerson
+- poclerson
+
+## 1.2.26 (2026-01-16)
+
+### 🚀 Features
+
+- ⚠️  React 19 + Next.js 15 upgrade for all @okam/* packages ([#369](https://github.com/OKAMca/stack/pull/369))
+- bump ([ab924b9](https://github.com/OKAMca/stack/commit/ab924b9))
+- Consumers must now have react and react-dom in their own
+
+### 🩹 Fixes
+
+- **directus-flexible-content:** remove breaking changes tag ([37954b3](https://github.com/OKAMca/stack/commit/37954b3))
+- **directus-flexible-content:** stop bundling okam libs ([cc8cfed](https://github.com/OKAMca/stack/commit/cc8cfed))
+- **directus-flexible-content:** core-lib in external deps ([e44cb2b](https://github.com/OKAMca/stack/commit/e44cb2b))
+- update vite-plugin-dts to version 3 ([5d33c77](https://github.com/OKAMca/stack/commit/5d33c77))
+- package deps error ([b665a45](https://github.com/OKAMca/stack/commit/b665a45))
+- search field type export ([5ab6070](https://github.com/OKAMca/stack/commit/5ab6070))
+- search field icon ([0850fde](https://github.com/OKAMca/stack/commit/0850fde))
+- select controlled ([#280](https://github.com/OKAMca/stack/pull/280))
+
+### 🧱 Updated Dependencies
+
+- Updated directus-block to 1.7.0
+
+### ❤️ Thank You
+
+- Marie-Maxime Tanguay @marie-maxime
+- Pierre-Olivier Clerson @poclerson
+- poclerson
+
+## 1.2.25 (2026-01-14)
+
+### 🚀 Features
+
+- ⚠️  React 19 + Next.js 15 upgrade for all @okam/* packages ([#369](https://github.com/OKAMca/stack/pull/369))
+- Consumers must now have react and react-dom in their own
+- bump ([ab924b9](https://github.com/OKAMca/stack/commit/ab924b9))
+
+### 🩹 Fixes
+
+- **directus-flexible-content:** core-lib in external deps ([e44cb2b](https://github.com/OKAMca/stack/commit/e44cb2b))
+- update vite-plugin-dts to version 3 ([5d33c77](https://github.com/OKAMca/stack/commit/5d33c77))
+- package deps error ([b665a45](https://github.com/OKAMca/stack/commit/b665a45))
+- search field type export ([5ab6070](https://github.com/OKAMca/stack/commit/5ab6070))
+- search field icon ([0850fde](https://github.com/OKAMca/stack/commit/0850fde))
+- select controlled ([#280](https://github.com/OKAMca/stack/pull/280))
+
+### 🧱 Updated Dependencies
+
+- Updated stack-ui to 1.44.0
+- Updated directus-block to 1.6.3
+
+### ❤️ Thank You
+
+- Marie-Maxime Tanguay @marie-maxime
+- Pierre-Olivier Clerson @poclerson
+- poclerson
+
 ## 1.2.24 (2026-01-13)
 
 ### 🚀 Features
@@ -621,4 +706,4 @@
 
 # 1.0.0 (2024-07-08)
 
-This was a version bump only for directus-flexible-content to align it with other projects, there were no code changes.
+This was a version bump only for directus-flexible-content to align it with other projects, there were no code changes.

package/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("react/jsx-runtime"),O=require("@tanstack/react-query"),_=require("radashi"),C=require("graphql-request"),E=require("@okam/stack-ui"),G=require("react"),B=require("@tiptap/core"),K=require("@tiptap/extension-blockquote"),V=require("@tiptap/extension-bold"),X=require("@tiptap/extension-bullet-list"),J=require("@tiptap/extension-code"),W=require("@tiptap/extension-code-block"),$=require("@tiptap/extension-document"),Y=require("@tiptap/extension-hard-break"),Z=require("@tiptap/extension-heading"),ee=require("@tiptap/extension-horizontal-rule"),te=require("@tiptap/extension-italic"),ne=require("@tiptap/extension-link"),re=require("@tiptap/extension-list-item"),oe=require("@tiptap/extension-ordered-list"),ie=require("@tiptap/extension-paragraph"),se=require("@tiptap/extension-strike"),ce=require("@tiptap/extension-subscript"),ae=require("@tiptap/extension-superscript"),le=require("@tiptap/extension-table"),ue=require("@tiptap/extension-table-cell"),de=require("@tiptap/extension-table-header"),me=require("@tiptap/extension-table-row"),fe=require("@tiptap/extension-text"),ge=require("@tiptap/extension-text-align");function H(e,n){return n}class q{constructor(n,r,t){this.nameSpace="[STACK]",this.suppressConsole=!1,this.env=process.env.NODE_ENV,this.nameSpace=n??this.nameSpace,this.suppressConsole=t??this.suppressConsole,this.logger=r??this.internalLogger}internalLogger(n,r,t){this.env!=="production"&&console[r||"log"](`${this.nameSpace} ${n}`.trimStart(),t??"")}setLogger(n){this.logger=(r,t,i)=>{this.suppressConsole&&this.internalLogger(r,t,i),n(r,t,i)}}static getInstance(){return q.instance||(q.instance=new q),q.instance}log(n,r,t){this.logger(n,r,t)}}q.getInstance();const pe=(e,n,r=!1)=>{const t=new q(e,n,r);return t.log("Logger initialized","info"),t},ke=pe("[DirectusQuery]"),ye=process.env.NEXT_PUBLIC_GRAPHQL_URL,be=process.env.NEXT_SERVER_GRAPHQL_URL,Ne=process.env.NEXT_GRAPHQL_URL_ADMIN,qe=process.env.NEXT_PUBLIC_API_TOKEN??"",Te=process.env.NEXT_PUBLIC_API_TOKEN,he=new C.GraphQLClient(be||ye,{credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${qe}`}});new C.GraphQLClient(Ne,{credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${Te}`}});new O.QueryClient({queryCache:new O.QueryCache({onError:e=>{ke.log("QueryClient Error","error",{error:e})}}),defaultOptions:{queries:{staleTime:5*1e3}}});function M(e,n,r=he){return r.request(e,{...n})}process.env.NEXT_PUBLIC_GRAPHQL_URL;process.env.NEXT_PUBLIC_API_TOKEN;function A(e){return!!e}function Be(e){const{id:n,settings:r,...t}=e??{};return _.isEmpty(t)}async function Se(e){const{document:n,blockKey:r,variables:t}=e;if(!n||!A(t))return null;const i=await M(n,t);return!i||typeof i!="object"||!r?null:i[r]}async function _e(e){const{document:n,item:r,blockKey:t,variables:i}=e;if(r){if(!Be(r))return r;const s={id:r.id,...i};return A(s)?Se({...e,variables:s}):null}if(!n||!A(i))return null;const o=await M(n,i);return!o||typeof o!="object"||!t?null:o[t]}function ve(e,...n){return n.reduce((t,i)=>i?{components:{...t.components,...i.components}}:t,e)}const z={kind:"Document",definitions:[{kind:"FragmentDefinition",name:{kind:"Name",value:"BlockSettings"},typeCondition:{kind:"NamedType",name:{kind:"Name",value:"block_settings"}},selectionSet:{kind:"SelectionSet",selections:[{kind:"Field",name:{kind:"Name",value:"tokens"}},{kind:"Field",name:{kind:"Name",value:"variant"}}]}}]},Le=e=>{var N,m,h;const{item:n,collection:r,config:t,variables:i,defaultVariant:o,...c}=e;if(!r||!t)return null;const s=(N=t==null?void 0:t.components)==null?void 0:N[r];if(!s)return null;const{settings:l}=n??{},u=(n==null?void 0:n.id)??(i==null?void 0:i.id);if(!u)return null;const{variant:g}=H(z,l)??{},f=((m=s.getVariant)==null?void 0:m.call(s,e))??g??o,{default:k,document:d}=s,b=((h=s.variants)==null?void 0:h[f??""])??k;return b?p.jsx(b,{document:d,config:t,collection:r,item:n,...u?{variables:{...i,id:u}}:{variables:i},...c},u):null};async function xe(e,n,r){const t=_.get(e,"item"),i=_.get(e,"document"),o=_.get(e,"variables"),c=await _e({item:t,blockKey:n,document:i,variables:o}),{tokens:s}=H(z,c==null?void 0:c.settings)??{};return{...c,cmsTokens:s}}const Ee=async e=>{const n="block_wysiwyg_by_id",{themeName:r="wysiwyg",tokens:t}=e,{content:i,title:o,level:c,cmsTokens:s}=await xe(e,n);return!i&&!(o&&c)?null:p.jsxs(p.Fragment,{children:[o&&c&&p.jsx(E.Box,{as:"span",themeName:r,tokens:{...t,...s},children:G.createElement(c,{},o)}),i&&p.jsx(E.WysiwygBlock,{themeName:r,tokens:{...t,...s},content:i})]})},Ae={block_wysiwyg:{default:e=>p.jsx(Ee,{...e})}},Ie={components:{...Ae}},P=e=>{const{children:n,config:r,...t}=e,i=ve(Ie,r),o=s=>n?n({...t,...s,config:i}):p.jsx(Le,{...t,...s,config:i});if("blocks"in e){const{blocks:s}=e;return s.map(o)}const{block:c}=e;return o(c)},Re=(e,n,r="id",t="item")=>{const i=o=>{var c,s,l,u,g,f;if(!e&&o)return o;if(!o||!e)return null;if(o.type==="relation-mark"&&((c=o.attrs)!=null&&c.id)||o.type==="relation-block"&&((s=o.attrs)!=null&&s.id)||o.type==="relation-inline-block"&&((l=o.attrs)!=null&&l.id)){const k=(u=e.find(d=>{var y;return(d==null?void 0:d[r])===((y=o.attrs)==null?void 0:y.id)}))==null?void 0:u[t];o.attrs.data=k}return(g=o.content)==null||g.map(i),(f=o.marks)==null||f.map(i),o};return i(n)},we=(e,n)=>{const r=n.map(o=>(o.type==="mark"?B.Mark:B.Node).create({name:o.name,renderHTML({HTMLAttributes:s}){return o.render?[...o.render(s),0]:[o.component??(o.type==="mark"?"span":"div"),s,0]}})),t=r.map(({name:o})=>o);return[...e.filter(o=>t.indexOf(o.name)<0),...r]},D=(e,n,r)=>{const t=r.find(i=>i.type===n&&i.name===e);if(t)return{...t.config,options:t.options}},Oe=(e,n)=>{var t;const r=(t=n.addAttributes)==null?void 0:t.call(n);return!r||!e?e:Object.fromEntries(Object.entries(e).filter(([i])=>{var o;return((o=r[i])==null?void 0:o.rendered)!==!1}))},v=(e,n,r="node")=>{const t=D(e.type,r,n);if(!(t!=null&&t.renderHTML))return[];const i=Oe(e.attrs,t);return t.render?t.render(e):t.renderHTML({node:e,HTMLAttributes:i})},F=(e,n,r)=>{if(e!=null&&e.content&&(e.content=e.content.map(c=>F(c,n,r))),e.type==="text"){if(e.marks){let c;return e.marks.reverse().forEach(s=>{var u;const l=v({...s,attrs:{...s.attrs,data:{...(u=s==null?void 0:s.attrs)==null?void 0:u.data,markText:e.text}}},n,"mark");if(Array.isArray(l)){const[g="span",f=s.attrs]=l,k={...f,data:void 0};c=r(g,k,c||e.text)}else c={...l,text:e.text}}),c}return e.text??""}const t=D(e.type,"node",n);if(t!=null&&t.render)return v(e,n);const[i="div",o=e.attrs]=v(e,n);return r(i,o,e.content)},Pe=(e,n,r)=>F(e,n,r),L={colspan:"colSpan",rowspan:"rowSpan",textAlign:"textalign"},Ce=(e,n)=>({...Object.fromEntries(Object.entries(n).map(([r,t])=>[(e==null?void 0:e[r])??(L==null?void 0:L[r])??r,t]))}),x={},Q=e=>{const{content:n,serializers:r=[],componentSerializers:t=[],renderingNodes:i,remappedAttributes:o,themeName:c,tokens:s,customTheme:l}=e,u=JSON.parse(JSON.stringify(n)),g=we(r,t);return Pe(u,g,(f,k,d)=>{const y={...k,style:void 0},b=Ce(o,y),N=f,m=(i==null?void 0:i[N])??(x==null?void 0:x[N]);return m?m({children:d,attrs:b,themeName:c,tokens:s,customTheme:l}):p.jsx(E.Box,{as:f,...b,themeName:c,tokens:s,customTheme:l,children:d},JSON.stringify(d))})},He=[$,fe,ie,Y,Z,W,X,oe,re,K,ee,ne,V,te,se,J,le.Table,de.TableHeader,me.TableRow,ue.TableCell,ge,ce,ae],Me=e=>{const{jsonContent:n,editorNodes:r,serializers:t,nodes:i,config:o,relationMarksConfig:c,themeName:s,tokens:l,customTheme:u,remappedAttributes:g}=e,f=Re(r,n),k=t??[...He]??[],d=(m,h)=>{var I,R,w;const{attrs:a}=m,U=`${(I=a==null?void 0:a.collection)==null?void 0:I.replace("related_","")}_id`;if(a!=null&&a.data){if(!((R=a==null?void 0:a.data)!=null&&R.blocks)){const T={collection:a.collection,item:{...a==null?void 0:a.data}};return p.jsx(P,{block:T,config:h},JSON.stringify(T))}const S=(w=a==null?void 0:a.data)==null?void 0:w.blocks,j=S==null?void 0:S.map(T=>({item:T==null?void 0:T[U],collection:a==null?void 0:a.collection}));return p.jsx(P,{blocks:j,config:h},JSON.stringify(S))}return null},y=B.Node.create({name:"relation-block",renderHTML:()=>["relation-block"],render:m=>d(m,o)}),b=B.Node.create({name:"relation-inline-block",renderHTML:()=>["relation-inline-block"],render:m=>d(m,o)}),N=B.Mark.create({name:"relation-mark",type:"relation-mark",renderHTML:()=>["relation-mark"],render:m=>d(m,c)});return k.push(y,b,N),f?p.jsx(Q,{content:f,serializers:k,renderingNodes:i,themeName:s,tokens:l,customTheme:u,remappedAttributes:g}):null};exports.FlexibleEditorContent=Me;exports.RenderNodes=Q;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("react/jsx-runtime"),A=require("@okam/directus-block/server"),x=require("@tiptap/core"),E=require("@okam/stack-ui"),J=require("@tiptap/extension-blockquote"),D=require("@tiptap/extension-bold"),_=require("@tiptap/extension-bullet-list"),j=require("@tiptap/extension-code"),F=require("@tiptap/extension-code-block"),K=require("@tiptap/extension-document"),P=require("@tiptap/extension-hard-break"),U=require("@tiptap/extension-heading"),V=require("@tiptap/extension-horizontal-rule"),W=require("@tiptap/extension-italic"),$=require("@tiptap/extension-link"),G=require("@tiptap/extension-list-item"),Q=require("@tiptap/extension-ordered-list"),X=require("@tiptap/extension-paragraph"),Y=require("@tiptap/extension-strike"),Z=require("@tiptap/extension-subscript"),C=require("@tiptap/extension-superscript"),ee=require("@tiptap/extension-table"),re=require("@tiptap/extension-table-cell"),te=require("@tiptap/extension-table-header"),ne=require("@tiptap/extension-table-row"),oe=require("@tiptap/extension-text"),ie=require("@tiptap/extension-text-align"),ce=(e,n,o="id",t="item")=>{const i=r=>{var a,s,l,f,m,d;if(!e&&r)return r;if(!r||!e)return null;if(r.type==="relation-mark"&&((a=r.attrs)!=null&&a.id)||r.type==="relation-block"&&((s=r.attrs)!=null&&s.id)||r.type==="relation-inline-block"&&((l=r.attrs)!=null&&l.id)){const b=(f=e.find(u=>{var k;return(u==null?void 0:u[o])===((k=r.attrs)==null?void 0:k.id)}))==null?void 0:f[t];r.attrs.data=b}return(m=r.content)==null||m.map(i),(d=r.marks)==null||d.map(i),r};return i(n)},se=(e,n)=>{const o=n.map(r=>(r.type==="mark"?x.Mark:x.Node).create({name:r.name,renderHTML({HTMLAttributes:s}){return r.render?[...r.render(s),0]:[r.component??(r.type==="mark"?"span":"div"),s,0]}})),t=o.map(({name:r})=>r);return[...e.filter(r=>t.indexOf(r.name)<0),...o]},v=(e,n,o)=>{const t=o.find(i=>i.type===n&&i.name===e);if(t)return{...t.config,options:t.options}},ae=(e,n)=>{var t;const o=(t=n.addAttributes)==null?void 0:t.call(n);return!o||!e?e:Object.fromEntries(Object.entries(e).filter(([i])=>{var r;return((r=o[i])==null?void 0:r.rendered)!==!1}))},N=(e,n,o="node")=>{const t=v(e.type,o,n);if(!(t!=null&&t.renderHTML))return[];const i=ae(e.attrs,t);return t.render?t.render(e):t.renderHTML({node:e,HTMLAttributes:i})},h=(e,n,o)=>{if(e!=null&&e.content&&(e.content=e.content.map(a=>h(a,n,o))),e.type==="text"){if(e.marks){let a;return e.marks.reverse().forEach(s=>{var f;const l=N({...s,attrs:{...s.attrs,data:{...(f=s==null?void 0:s.attrs)==null?void 0:f.data,markText:e.text}}},n,"mark");if(Array.isArray(l)){const[m="span",d=s.attrs]=l,b={...d,data:void 0};a=o(m,b,a||e.text)}else a={...l,text:e.text}}),a}return e.text??""}const t=v(e.type,"node",n);if(t!=null&&t.render)return N(e,n);const[i="div",r=e.attrs]=N(e,n);return o(i,r,e.content)},le=(e,n,o)=>h(e,n,o),B={colspan:"colSpan",rowspan:"rowSpan",textAlign:"textalign"},ue=(e,n)=>({...Object.fromEntries(Object.entries(n).map(([o,t])=>[(e==null?void 0:e[o])??(B==null?void 0:B[o])??o,t]))}),H={},I=e=>{const{content:n,serializers:o=[],componentSerializers:t=[],renderingNodes:i,remappedAttributes:r,themeName:a,tokens:s,customTheme:l}=e,f=JSON.parse(JSON.stringify(n)),m=se(o,t);return le(f,m,(d,b,u)=>{const k={...b,style:void 0},S=ue(r,k),T=d,p=(i==null?void 0:i[T])??(H==null?void 0:H[T]);return p?p({children:u,attrs:S,themeName:a,tokens:s,customTheme:l}):y.jsx(E.Box,{as:d,...S,themeName:a,tokens:s,customTheme:l,children:u},JSON.stringify(u))})},de=[K,oe,X,P,U,F,_,Q,G,J,V,$,D,W,Y,j,ee.Table,te.TableHeader,ne.TableRow,re.TableCell,ie,Z,C],pe=e=>{const{jsonContent:n,editorNodes:o,serializers:t,nodes:i,config:r,relationMarksConfig:a,themeName:s,tokens:l,customTheme:f,remappedAttributes:m}=e,d=ce(o,n),b=t??[...de]??[],u=(p,M)=>{var O,L,z;const{attrs:c}=p,R=`${(O=c==null?void 0:c.collection)==null?void 0:O.replace("related_","")}_id`;if(c!=null&&c.data){if(!((L=c==null?void 0:c.data)!=null&&L.blocks)){const q={collection:c.collection,item:{...c==null?void 0:c.data}};return y.jsx(A.BlockDispatcher,{block:q,config:M},JSON.stringify(q))}const g=(z=c==null?void 0:c.data)==null?void 0:z.blocks,w=g==null?void 0:g.map(q=>({item:q==null?void 0:q[R],collection:c==null?void 0:c.collection}));return y.jsx(A.BlockDispatcher,{blocks:w,config:M},JSON.stringify(g))}return null},k=x.Node.create({name:"relation-block",renderHTML:()=>["relation-block"],render:p=>u(p,r)}),S=x.Node.create({name:"relation-inline-block",renderHTML:()=>["relation-inline-block"],render:p=>u(p,r)}),T=x.Mark.create({name:"relation-mark",type:"relation-mark",renderHTML:()=>["relation-mark"],render:p=>u(p,a)});return b.push(k,S,T),d?y.jsx(I,{content:d,serializers:b,renderingNodes:i,themeName:s,tokens:l,customTheme:f,remappedAttributes:m}):null};exports.FlexibleEditorContent=pe;exports.RenderNodes=I;

package/index.mjs

@@ -1,367 +1,219 @@
-import { jsx as k, jsxs as K, Fragment as G } from "react/jsx-runtime";
-import { QueryClient as V, QueryCache as X } from "@tanstack/react-query";
-import { isEmpty as J, get as _ } from "radashi";
-import { GraphQLClient as H } from "graphql-request";
-import { Box as C, WysiwygBlock as W } from "@okam/stack-ui";
-import $ from "react";
-import { Mark as x, Node as A } from "@tiptap/core";
-import j from "@tiptap/extension-blockquote";
-import Y from "@tiptap/extension-bold";
-import Z from "@tiptap/extension-bullet-list";
-import ee from "@tiptap/extension-code";
-import te from "@tiptap/extension-code-block";
-import re from "@tiptap/extension-document";
-import ne from "@tiptap/extension-hard-break";
-import oe from "@tiptap/extension-heading";
-import ie from "@tiptap/extension-horizontal-rule";
-import se from "@tiptap/extension-italic";
-import ce from "@tiptap/extension-link";
-import ae from "@tiptap/extension-list-item";
-import le from "@tiptap/extension-ordered-list";
-import me from "@tiptap/extension-paragraph";
-import ue from "@tiptap/extension-strike";
-import fe from "@tiptap/extension-subscript";
-import de from "@tiptap/extension-superscript";
-import { Table as pe } from "@tiptap/extension-table";
-import { TableCell as ge } from "@tiptap/extension-table-cell";
-import { TableHeader as ke } from "@tiptap/extension-table-header";
-import { TableRow as ye } from "@tiptap/extension-table-row";
-import Ne from "@tiptap/extension-text";
-import be from "@tiptap/extension-text-align";
-function q(e, r) {
-  return r;
-}
-class T {
-  constructor(r, n, t) {
-    this.nameSpace = "[STACK]", this.suppressConsole = !1, this.env = process.env.NODE_ENV, this.nameSpace = r ?? this.nameSpace, this.suppressConsole = t ?? this.suppressConsole, this.logger = n ?? this.internalLogger;
-  }
-  internalLogger(r, n, t) {
-    this.env !== "production" && console[n || "log"](`${this.nameSpace} ${r}`.trimStart(), t ?? "");
-  }
-  setLogger(r) {
-    this.logger = (n, t, i) => {
-      this.suppressConsole && this.internalLogger(n, t, i), r(n, t, i);
-    };
-  }
-  static getInstance() {
-    return T.instance || (T.instance = new T()), T.instance;
-  }
-  log(r, n, t) {
-    this.logger(r, n, t);
-  }
-}
-T.getInstance();
-const Te = (e, r, n = !1) => {
-  const t = new T(e, r, n);
-  return t.log("Logger initialized", "info"), t;
-}, he = Te("[DirectusQuery]"), Be = process.env.NEXT_PUBLIC_GRAPHQL_URL, Se = process.env.NEXT_SERVER_GRAPHQL_URL, _e = process.env.NEXT_GRAPHQL_URL_ADMIN, ve = process.env.NEXT_PUBLIC_API_TOKEN ?? "", Le = process.env.NEXT_PUBLIC_API_TOKEN, Ee = new H(Se || Be, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${ve}`
-  }
-});
-new H(_e, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${Le}`
-  }
-});
-new V({
-  queryCache: new X({
-    onError: (e) => {
-      he.log("QueryClient Error", "error", { error: e });
-    }
-  }),
-  defaultOptions: {
-    queries: {
-      staleTime: 5 * 1e3
+import { jsx as x } from "react/jsx-runtime";
+import { BlockDispatcher as h } from "@okam/directus-block/server";
+import { Mark as v, Node as L } from "@tiptap/core";
+import { Box as R } from "@okam/stack-ui";
+import D from "@tiptap/extension-blockquote";
+import _ from "@tiptap/extension-bold";
+import K from "@tiptap/extension-bullet-list";
+import q from "@tiptap/extension-code";
+import F from "@tiptap/extension-code-block";
+import P from "@tiptap/extension-document";
+import V from "@tiptap/extension-hard-break";
+import W from "@tiptap/extension-heading";
+import $ from "@tiptap/extension-horizontal-rule";
+import G from "@tiptap/extension-italic";
+import Q from "@tiptap/extension-link";
+import U from "@tiptap/extension-list-item";
+import X from "@tiptap/extension-ordered-list";
+import Y from "@tiptap/extension-paragraph";
+import Z from "@tiptap/extension-strike";
+import j from "@tiptap/extension-subscript";
+import C from "@tiptap/extension-superscript";
+import { Table as rr } from "@tiptap/extension-table";
+import { TableCell as tr } from "@tiptap/extension-table-cell";
+import { TableHeader as er } from "@tiptap/extension-table-header";
+import { TableRow as or } from "@tiptap/extension-table-row";
+import nr from "@tiptap/extension-text";
+import ir from "@tiptap/extension-text-align";
+const cr = (r, o, n = "id", e = "item") => {
+  const i = (t) => {
+    var s, a, m, u, d, p;
+    if (!r && t) return t;
+    if (!t || !r) return null;
+    if (t.type === "relation-mark" && ((s = t.attrs) != null && s.id) || t.type === "relation-block" && ((a = t.attrs) != null && a.id) || t.type === "relation-inline-block" && ((m = t.attrs) != null && m.id)) {
+      const k = (u = r.find((l) => {
+        var b;
+        return (l == null ? void 0 : l[n]) === ((b = t.attrs) == null ? void 0 : b.id);
+      })) == null ? void 0 : u[e];
+      t.attrs.data = k;
     }
-  }
-});
-function z(e, r, n = Ee) {
-  return n.request(e, {
-    ...r
-  });
-}
-process.env.NEXT_PUBLIC_GRAPHQL_URL;
-process.env.NEXT_PUBLIC_API_TOKEN;
-function I(e) {
-  return !!e;
-}
-function Ae(e) {
-  const { id: r, settings: n, ...t } = e ?? {};
-  return J(t);
-}
-async function Ie(e) {
-  const { document: r, blockKey: n, variables: t } = e;
-  if (!r || !I(t)) return null;
-  const i = await z(r, t);
-  return !i || typeof i != "object" || !n ? null : i[n];
-}
-async function we(e) {
-  const { document: r, item: n, blockKey: t, variables: i } = e;
-  if (n) {
-    if (!Ae(n))
-      return n;
-    const s = { id: n.id, ...i };
-    return I(s) ? Ie({
-      ...e,
-      variables: s
-    }) : null;
-  }
-  if (!r || !I(i)) return null;
-  const o = await z(r, i);
-  return !o || typeof o != "object" || !t ? null : o[t];
-}
-function Oe(e, ...r) {
-  return r.reduce((t, i) => i ? { components: { ...t.components, ...i.components } } : t, e);
-}
-const D = { kind: "Document", definitions: [{ kind: "FragmentDefinition", name: { kind: "Name", value: "BlockSettings" }, typeCondition: { kind: "NamedType", name: { kind: "Name", value: "block_settings" } }, selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "tokens" } }, { kind: "Field", name: { kind: "Name", value: "variant" } }] } }] }, Pe = (e) => {
-  var b, f, B;
-  const { item: r, collection: n, config: t, variables: i, defaultVariant: o, ...c } = e;
-  if (!n || !t) return null;
-  const s = (b = t == null ? void 0 : t.components) == null ? void 0 : b[n];
-  if (!s) return null;
-  const { settings: l } = r ?? {}, m = (r == null ? void 0 : r.id) ?? (i == null ? void 0 : i.id);
-  if (!m) return null;
-  const { variant: p } = q(D, l) ?? {}, d = ((f = s.getVariant) == null ? void 0 : f.call(s, e)) ?? p ?? o, { default: g, document: u } = s, N = ((B = s.variants) == null ? void 0 : B[d ?? ""]) ?? g;
-  return N ? /* @__PURE__ */ k(
-    N,
-    {
-      document: u,
-      config: t,
-      collection: n,
-      item: r,
-      ...m ? { variables: { ...i, id: m } } : { variables: i },
-      ...c
-    },
-    m
-  ) : null;
-};
-async function Re(e, r, n) {
-  const t = _(e, "item"), i = _(e, "document"), o = _(e, "variables"), c = await we({
-    item: t,
-    blockKey: r,
-    document: i,
-    variables: o
-  }), { tokens: s } = q(D, c == null ? void 0 : c.settings) ?? {};
-  return { ...c, cmsTokens: s };
-}
-const He = async (e) => {
-  const r = "block_wysiwyg_by_id", { themeName: n = "wysiwyg", tokens: t } = e, { content: i, title: o, level: c, cmsTokens: s } = await Re(e, r);
-  return !i && !(o && c) ? null : /* @__PURE__ */ K(G, { children: [
-    o && c && /* @__PURE__ */ k(C, { as: "span", themeName: n, tokens: { ...t, ...s }, children: $.createElement(c, {}, o) }),
-    i && /* @__PURE__ */ k(W, { themeName: n, tokens: { ...t, ...s }, content: i })
-  ] });
-}, Ce = {
-  block_wysiwyg: {
-    default: (e) => /* @__PURE__ */ k(He, { ...e })
-  }
-}, xe = {
-  components: {
-    ...Ce
-  }
-}, R = (e) => {
-  const { children: r, config: n, ...t } = e, i = Oe(xe, n), o = (s) => r ? r({ ...t, ...s, config: i }) : /* @__PURE__ */ k(Pe, { ...t, ...s, config: i });
-  if ("blocks" in e) {
-    const { blocks: s } = e;
-    return s.map(o);
-  }
-  const { block: c } = e;
-  return o(c);
-}, qe = (e, r, n = "id", t = "item") => {
-  const i = (o) => {
-    var c, s, l, m, p, d;
-    if (!e && o) return o;
-    if (!o || !e) return null;
-    if (o.type === "relation-mark" && ((c = o.attrs) != null && c.id) || o.type === "relation-block" && ((s = o.attrs) != null && s.id) || o.type === "relation-inline-block" && ((l = o.attrs) != null && l.id)) {
-      const g = (m = e.find((u) => {
-        var y;
-        return (u == null ? void 0 : u[n]) === ((y = o.attrs) == null ? void 0 : y.id);
-      })) == null ? void 0 : m[t];
-      o.attrs.data = g;
-    }
-    return (p = o.content) == null || p.map(i), (d = o.marks) == null || d.map(i), o;
+    return (d = t.content) == null || d.map(i), (p = t.marks) == null || p.map(i), t;
   };
-  return i(r);
-}, ze = (e, r) => {
-  const n = r.map((o) => (o.type === "mark" ? x : A).create({
-    name: o.name,
+  return i(o);
+}, ar = (r, o) => {
+  const n = o.map((t) => (t.type === "mark" ? v : L).create({
+    name: t.name,
     // eslint-disable-next-line
-    renderHTML({ HTMLAttributes: s }) {
-      return o.render ? [...o.render(s), 0] : [o.component ?? (o.type === "mark" ? "span" : "div"), s, 0];
+    renderHTML({ HTMLAttributes: a }) {
+      return t.render ? [...t.render(a), 0] : [t.component ?? (t.type === "mark" ? "span" : "div"), a, 0];
     }
-  })), t = n.map(({ name: o }) => o);
-  return [...e.filter((o) => t.indexOf(o.name) < 0), ...n];
-}, F = (e, r, n) => {
-  const t = n.find((i) => i.type === r && i.name === e);
-  if (t)
+  })), e = n.map(({ name: t }) => t);
+  return [...r.filter((t) => e.indexOf(t.name) < 0), ...n];
+}, I = (r, o, n) => {
+  const e = n.find((i) => i.type === o && i.name === r);
+  if (e)
     return {
-      ...t.config,
-      options: t.options
+      ...e.config,
+      options: e.options
     };
-}, De = (e, r) => {
-  var t;
-  const n = (t = r.addAttributes) == null ? void 0 : t.call(r);
-  return !n || !e ? e : Object.fromEntries(Object.entries(e).filter(([i]) => {
-    var o;
-    return ((o = n[i]) == null ? void 0 : o.rendered) !== !1;
+}, sr = (r, o) => {
+  var e;
+  const n = (e = o.addAttributes) == null ? void 0 : e.call(o);
+  return !n || !r ? r : Object.fromEntries(Object.entries(r).filter(([i]) => {
+    var t;
+    return ((t = n[i]) == null ? void 0 : t.rendered) !== !1;
   }));
-}, v = (e, r, n = "node") => {
-  const t = F(e.type, n, r);
-  if (!(t != null && t.renderHTML)) return [];
-  const i = De(e.attrs, t);
-  return t.render ? t.render(e) : t.renderHTML({
-    node: e,
+}, N = (r, o, n = "node") => {
+  const e = I(r.type, n, o);
+  if (!(e != null && e.renderHTML)) return [];
+  const i = sr(r.attrs, e);
+  return e.render ? e.render(r) : e.renderHTML({
+    node: r,
     HTMLAttributes: i
   });
-}, M = (e, r, n) => {
-  if (e != null && e.content && (e.content = e.content.map((c) => M(c, r, n))), e.type === "text") {
-    if (e.marks) {
-      let c;
-      return e.marks.reverse().forEach((s) => {
-        var m;
-        const l = v(
-          { ...s, attrs: { ...s.attrs, data: { ...(m = s == null ? void 0 : s.attrs) == null ? void 0 : m.data, markText: e.text } } },
-          r,
+}, J = (r, o, n) => {
+  if (r != null && r.content && (r.content = r.content.map((s) => J(s, o, n))), r.type === "text") {
+    if (r.marks) {
+      let s;
+      return r.marks.reverse().forEach((a) => {
+        var u;
+        const m = N(
+          { ...a, attrs: { ...a.attrs, data: { ...(u = a == null ? void 0 : a.attrs) == null ? void 0 : u.data, markText: r.text } } },
+          o,
           "mark"
         );
-        if (Array.isArray(l)) {
-          const [p = "span", d = s.attrs] = l, g = { ...d, data: void 0 };
-          c = n(p, g, c || e.text);
+        if (Array.isArray(m)) {
+          const [d = "span", p = a.attrs] = m, k = { ...p, data: void 0 };
+          s = n(d, k, s || r.text);
         } else
-          c = { ...l, text: e.text };
-      }), c;
+          s = { ...m, text: r.text };
+      }), s;
     }
-    return e.text ?? "";
+    return r.text ?? "";
   }
-  const t = F(e.type, "node", r);
-  if (t != null && t.render)
-    return v(e, r);
-  const [i = "div", o = e.attrs] = v(e, r);
-  return n(i, o, e.content);
-}, Fe = (e, r, n) => M(e, r, n), L = {
+  const e = I(r.type, "node", o);
+  if (e != null && e.render)
+    return N(r, o);
+  const [i = "div", t = r.attrs] = N(r, o);
+  return n(i, t, r.content);
+}, mr = (r, o, n) => J(r, o, n), B = {
   colspan: "colSpan",
   rowspan: "rowSpan",
   textAlign: "textalign"
-}, Me = (e, r) => ({
+}, lr = (r, o) => ({
   ...Object.fromEntries(
-    Object.entries(r).map(([n, t]) => [(e == null ? void 0 : e[n]) ?? (L == null ? void 0 : L[n]) ?? n, t])
+    Object.entries(o).map(([n, e]) => [(r == null ? void 0 : r[n]) ?? (B == null ? void 0 : B[n]) ?? n, e])
   )
-}), E = {}, Qe = (e) => {
+}), H = {}, pr = (r) => {
   const {
-    content: r,
+    content: o,
     serializers: n = [],
-    componentSerializers: t = [],
+    componentSerializers: e = [],
     renderingNodes: i,
-    remappedAttributes: o,
-    themeName: c,
-    tokens: s,
-    customTheme: l
-  } = e, m = JSON.parse(JSON.stringify(r)), p = ze(n, t);
-  return Fe(
-    m,
-    p,
+    remappedAttributes: t,
+    themeName: s,
+    tokens: a,
+    customTheme: m
+  } = r, u = JSON.parse(JSON.stringify(o)), d = ar(n, e);
+  return mr(
+    u,
+    d,
     // @ts-expect-error Expects ReactNode
-    (d, g, u) => {
-      const y = {
-        ...g,
+    (p, k, l) => {
+      const b = {
+        ...k,
         style: void 0
-      }, N = Me(o, y), b = d, f = (i == null ? void 0 : i[b]) ?? (E == null ? void 0 : E[b]);
-      return f ? f({ children: u, attrs: N, themeName: c, tokens: s, customTheme: l }) : /* @__PURE__ */ k(
-        C,
+      }, g = lr(t, b), y = p, f = (i == null ? void 0 : i[y]) ?? (H == null ? void 0 : H[y]);
+      return f ? f({ children: l, attrs: g, themeName: s, tokens: a, customTheme: m }) : /* @__PURE__ */ x(
+        R,
         {
-          as: d,
-          ...N,
-          themeName: c,
-          tokens: s,
-          customTheme: l,
-          children: u
+          as: p,
+          ...g,
+          themeName: s,
+          tokens: a,
+          customTheme: m,
+          children: l
         },
-        JSON.stringify(u)
+        JSON.stringify(l)
       );
     }
   );
-}, Ue = [
-  re,
-  Ne,
-  me,
-  ne,
-  oe,
-  te,
+}, fr = [
+  P,
+  nr,
+  Y,
+  V,
+  W,
+  F,
+  K,
+  X,
+  U,
+  D,
+  $,
+  Q,
+  _,
+  G,
   Z,
-  le,
-  ae,
+  q,
+  rr,
+  er,
+  or,
+  tr,
+  ir,
   j,
-  ie,
-  ce,
-  Y,
-  se,
-  ue,
-  ee,
-  pe,
-  ke,
-  ye,
-  ge,
-  be,
-  fe,
-  de
-], ht = (e) => {
+  C
+], Fr = (r) => {
   const {
-    jsonContent: r,
+    jsonContent: o,
     editorNodes: n,
-    serializers: t,
+    serializers: e,
     nodes: i,
-    config: o,
-    relationMarksConfig: c,
-    themeName: s,
-    tokens: l,
-    customTheme: m,
-    remappedAttributes: p
-  } = e, d = qe(n, r), g = t ?? [...Ue] ?? [], u = (f, B) => {
-    var w, O, P;
-    const { attrs: a } = f, Q = `${(w = a == null ? void 0 : a.collection) == null ? void 0 : w.replace("related_", "")}_id`;
-    if (a != null && a.data) {
-      if (!((O = a == null ? void 0 : a.data) != null && O.blocks)) {
-        const h = { collection: a.collection, item: { ...a == null ? void 0 : a.data } };
-        return /* @__PURE__ */ k(R, { block: h, config: B }, JSON.stringify(h));
+    config: t,
+    relationMarksConfig: s,
+    themeName: a,
+    tokens: m,
+    customTheme: u,
+    remappedAttributes: d
+  } = r, p = cr(n, o), k = e ?? [...fr] ?? [], l = (f, O) => {
+    var z, A, M;
+    const { attrs: c } = f, w = `${(z = c == null ? void 0 : c.collection) == null ? void 0 : z.replace("related_", "")}_id`;
+    if (c != null && c.data) {
+      if (!((A = c == null ? void 0 : c.data) != null && A.blocks)) {
+        const S = { collection: c.collection, item: { ...c == null ? void 0 : c.data } };
+        return /* @__PURE__ */ x(h, { block: S, config: O }, JSON.stringify(S));
       }
-      const S = (P = a == null ? void 0 : a.data) == null ? void 0 : P.blocks, U = S == null ? void 0 : S.map((h) => ({ item: h == null ? void 0 : h[Q], collection: a == null ? void 0 : a.collection }));
-      return /* @__PURE__ */ k(R, { blocks: U, config: B }, JSON.stringify(S));
+      const T = (M = c == null ? void 0 : c.data) == null ? void 0 : M.blocks, E = T == null ? void 0 : T.map((S) => ({ item: S == null ? void 0 : S[w], collection: c == null ? void 0 : c.collection }));
+      return /* @__PURE__ */ x(h, { blocks: E, config: O }, JSON.stringify(T));
     }
     return null;
-  }, y = A.create({
+  }, b = L.create({
     name: "relation-block",
     renderHTML: () => ["relation-block"],
-    render: (f) => u(f, o)
-  }), N = A.create({
+    render: (f) => l(f, t)
+  }), g = L.create({
     name: "relation-inline-block",
     renderHTML: () => ["relation-inline-block"],
-    render: (f) => u(f, o)
-  }), b = x.create({
+    render: (f) => l(f, t)
+  }), y = v.create({
     name: "relation-mark",
     type: "relation-mark",
     renderHTML: () => ["relation-mark"],
-    render: (f) => u(f, c)
+    render: (f) => l(f, s)
   });
-  return g.push(y, N, b), d ? /* @__PURE__ */ k(
-    Qe,
+  return k.push(b, g, y), p ? /* @__PURE__ */ x(
+    pr,
     {
-      content: d,
-      serializers: g,
+      content: p,
+      serializers: k,
       renderingNodes: i,
-      themeName: s,
-      tokens: l,
-      customTheme: m,
-      remappedAttributes: p
+      themeName: a,
+      tokens: m,
+      customTheme: u,
+      remappedAttributes: d
     }
   ) : null;
 };
 export {
-  ht as FlexibleEditorContent,
-  Qe as RenderNodes
+  Fr as FlexibleEditorContent,
+  pr as RenderNodes
 };

package/lib/components/FlexibleEditorContent/extensions.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (import('@tiptap/core').Node<any, any> | import('@tiptap/core').Extension<import('@tiptap/extension-text-align').TextAlignOptions, any> | import('@tiptap/core').Mark<import('@tiptap/extension-subscript').SubscriptExtensionOptions, any>)[];
+declare const _default: (import('@tiptap/core').Node<any, any> | import('@tiptap/core').Mark<import('@tiptap/extension-bold').BoldOptions, any> | import('@tiptap/core').Extension<import('@tiptap/extension-text-align').TextAlignOptions, any>)[];
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okam/directus-flexible-content",
-  "version": "1.2.24",
+  "version": "1.3.1",
   "main": "./index.js",
   "types": "./index.d.ts",
   "exports": {
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "@nx/vite": "20.2.2",
-    "@okam/directus-block": "1.6.2",
-    "@okam/stack-ui": "1.43.0",
+    "@okam/directus-block": "1.7.1",
+    "@okam/stack-ui": "1.44.0",
     "@vitejs/plugin-react": "4.3.4",
     "vite": "^5.0.13",
     "vite-plugin-dts": "~2.3.0",