@okam/directus-flexible-content 1.2.25 → 1.3.2

package/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 1.2.25 (2026-01-14)
+## 1.3.2 (2026-01-16)
+
+### 🧱 Updated Dependencies
+
+- Updated stack-ui to 1.44.1
+- Updated directus-block to 1.7.2
+
+## 1.3.0 (2026-01-16)
 
 ### 🚀 Features
 
@@ -7,6 +14,8 @@
 
 ### 🩹 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))
@@ -18,6 +27,58 @@
 
 - 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
@@ -652,4 +713,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 g=require("react/jsx-runtime"),H=require("@tanstack/react-query"),v=require("radashi"),R=require("graphql-request"),A=require("@okam/stack-ui"),K=require("react"),B=require("@tiptap/core"),V=require("@tiptap/extension-blockquote"),X=require("@tiptap/extension-bold"),J=require("@tiptap/extension-bullet-list"),W=require("@tiptap/extension-code"),$=require("@tiptap/extension-code-block"),Y=require("@tiptap/extension-document"),Z=require("@tiptap/extension-hard-break"),ee=require("@tiptap/extension-heading"),te=require("@tiptap/extension-horizontal-rule"),ne=require("@tiptap/extension-italic"),re=require("@tiptap/extension-link"),oe=require("@tiptap/extension-list-item"),ie=require("@tiptap/extension-ordered-list"),se=require("@tiptap/extension-paragraph"),ce=require("@tiptap/extension-strike"),ae=require("@tiptap/extension-subscript"),le=require("@tiptap/extension-superscript"),ue=require("@tiptap/extension-table"),de=require("@tiptap/extension-table-cell"),me=require("@tiptap/extension-table-header"),fe=require("@tiptap/extension-table-row"),pe=require("@tiptap/extension-text"),ge=require("@tiptap/extension-text-align");function M(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 ke=(e,n,r=!1)=>{const t=new q(e,n,r);return t.log("Logger initialized","info"),t},ye=ke("[DirectusQuery]"),be=process.env.NEXT_PUBLIC_GRAPHQL_URL,Ne=process.env.NEXT_SERVER_GRAPHQL_URL,qe=process.env.NEXT_GRAPHQL_URL_ADMIN,Te=process.env.NEXT_PUBLIC_API_TOKEN??"",he=process.env.NEXT_PUBLIC_API_TOKEN,_=new R.GraphQLClient(Ne||be,{credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${Te}`}});new R.GraphQLClient(qe,{credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${he}`}});new H.QueryClient({queryCache:new H.QueryCache({onError:e=>{ye.log("QueryClient Error","error",{error:e})}}),defaultOptions:{queries:{staleTime:5*1e3}}});function Q(e,n,r=_){return r.request(e,{...n})}process.env.NEXT_PUBLIC_GRAPHQL_URL;process.env.NEXT_PUBLIC_API_TOKEN;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"}}]}}]};function I(e){return!!e}function Be(e){const{id:n,settings:r,...t}=e??{};return v.isEmpty(t)}async function Se(e,n=_){const{document:r,blockKey:t,variables:i}=e;if(!r||!I(i))return null;const o=await Q(r,i,n);return!o||typeof o!="object"||!t?null:o[t]}async function ve(e,n=_){const{document:r,item:t,blockKey:i,variables:o}=e;if(t){if(!Be(t))return t;const a={id:t.id,...o};return I(a)?Se({...e,variables:a}):null}if(!r||!I(o))return null;const c=await Q(r,o,n);return!c||typeof c!="object"||!i?null:c[i]}function _e(e){return e instanceof R.GraphQLClient}async function Le(e,n,r=_){const t=v.get(e,"item"),i=_e(r),o=v.get(e,"document"),c=v.get(e,"variables"),s=await ve({item:t,blockKey:n,document:o??(i?void 0:r),variables:c},i?r:void 0),{tokens:a}=M(z,s==null?void 0:s.settings)??{};return{...s,cmsTokens:a}}function xe(e,...n){return n.reduce((t,i)=>i?{components:{...t.components,...i.components}}:t,e)}const Ee=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:a}=n??{},u=(n==null?void 0:n.id)??(i==null?void 0:i.id);if(!u)return null;const{variant:p}=M(z,a)??{},f=((m=s.getVariant)==null?void 0:m.call(s,e))??p??o,{default:k,document:d}=s,b=((h=s.variants)==null?void 0:h[f??""])??k;return b?g.jsx(b,{document:d,config:t,collection:r,item:n,...u?{variables:{...i,id:u}}:{variables:i},...c},u):null},Ae=async e=>{const n="block_wysiwygs_by_id",{themeName:r="wysiwyg",tokens:t}=e,{content:i,title:o,level:c,cmsTokens:s}=await Le(e,n);return!i&&!(o&&c)?null:g.jsxs(g.Fragment,{children:[o&&c&&g.jsx(A.Box,{as:"span",themeName:r,tokens:{...t,...s},children:K.createElement(c,{},o)}),i&&g.jsx(A.WysiwygBlock,{themeName:r,tokens:{...t,...s},content:i})]})},Ie={block_wysiwygs:{default:e=>g.jsx(Ae,{...e})}},Re={components:{...Ie}},O=e=>{const{children:n,config:r,...t}=e,i=xe(Re,r),o=s=>n?n({...t,...s,config:i}):g.jsx(Ee,{...t,...s,config:i});if("blocks"in e){const{blocks:s}=e;return s.map(o)}const{block:c}=e;return o(c)},we=(e,n,r="id",t="item")=>{const i=o=>{var c,s,a,u,p,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"&&((a=o.attrs)!=null&&a.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(p=o.content)==null||p.map(i),(f=o.marks)==null||f.map(i),o};return i(n)},Pe=(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}},Ce=(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}))},L=(e,n,r="node")=>{const t=D(e.type,r,n);if(!(t!=null&&t.renderHTML))return[];const i=Ce(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 a=L({...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(a)){const[p="span",f=s.attrs]=a,k={...f,data:void 0};c=r(p,k,c||e.text)}else c={...a,text:e.text}}),c}return e.text??""}const t=D(e.type,"node",n);if(t!=null&&t.render)return L(e,n);const[i="div",o=e.attrs]=L(e,n);return r(i,o,e.content)},He=(e,n,r)=>F(e,n,r),x={colspan:"colSpan",rowspan:"rowSpan",textAlign:"textalign"},Oe=(e,n)=>({...Object.fromEntries(Object.entries(n).map(([r,t])=>[(e==null?void 0:e[r])??(x==null?void 0:x[r])??r,t]))}),E={},U=e=>{const{content:n,serializers:r=[],componentSerializers:t=[],renderingNodes:i,remappedAttributes:o,themeName:c,tokens:s,customTheme:a}=e,u=JSON.parse(JSON.stringify(n)),p=Pe(r,t);return He(u,p,(f,k,d)=>{const y={...k,style:void 0},b=Oe(o,y),N=f,m=(i==null?void 0:i[N])??(E==null?void 0:E[N]);return m?m({children:d,attrs:b,themeName:c,tokens:s,customTheme:a}):g.jsx(A.Box,{as:f,...b,themeName:c,tokens:s,customTheme:a,children:d},JSON.stringify(d))})},Me=[Y,pe,se,Z,ee,$,J,ie,oe,V,te,re,X,ne,ce,W,ue.Table,me.TableHeader,fe.TableRow,de.TableCell,ge,ae,le],Qe=e=>{const{jsonContent:n,editorNodes:r,serializers:t,nodes:i,config:o,relationMarksConfig:c,themeName:s,tokens:a,customTheme:u,remappedAttributes:p}=e,f=we(r,n),k=t??[...Me]??[],d=(m,h)=>{var w,P,C;const{attrs:l}=m,G=`${(w=l==null?void 0:l.collection)==null?void 0:w.replace("related_","")}_id`;if(l!=null&&l.data){if(!((P=l==null?void 0:l.data)!=null&&P.blocks)){const T={collection:l.collection,item:{...l==null?void 0:l.data}};return g.jsx(O,{block:T,config:h},JSON.stringify(T))}const S=(C=l==null?void 0:l.data)==null?void 0:C.blocks,j=S==null?void 0:S.map(T=>({item:T==null?void 0:T[G],collection:l==null?void 0:l.collection}));return g.jsx(O,{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?g.jsx(U,{content:f,serializers:k,renderingNodes:i,themeName:s,tokens:a,customTheme:u,remappedAttributes:p}):null};exports.FlexibleEditorContent=Qe;exports.RenderNodes=U;
+"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,373 +1,219 @@
-import { jsx as k, jsxs as G, Fragment as V } from "react/jsx-runtime";
-import { QueryClient as X, QueryCache as J } from "@tanstack/react-query";
-import { isEmpty as W, get as v } from "radashi";
-import { GraphQLClient as P } from "graphql-request";
-import { Box as x, WysiwygBlock as $ } from "@okam/stack-ui";
-import j from "react";
-import { Mark as q, Node as I } from "@tiptap/core";
-import Y from "@tiptap/extension-blockquote";
-import Z from "@tiptap/extension-bold";
-import ee from "@tiptap/extension-bullet-list";
-import te from "@tiptap/extension-code";
-import ne from "@tiptap/extension-code-block";
-import re from "@tiptap/extension-document";
-import oe from "@tiptap/extension-hard-break";
-import ie from "@tiptap/extension-heading";
-import se from "@tiptap/extension-horizontal-rule";
-import ce from "@tiptap/extension-italic";
-import ae from "@tiptap/extension-link";
-import le from "@tiptap/extension-list-item";
-import me from "@tiptap/extension-ordered-list";
-import ue from "@tiptap/extension-paragraph";
-import fe from "@tiptap/extension-strike";
-import pe from "@tiptap/extension-subscript";
-import de from "@tiptap/extension-superscript";
-import { Table as ge } from "@tiptap/extension-table";
-import { TableCell as ke } from "@tiptap/extension-table-cell";
-import { TableHeader as ye } from "@tiptap/extension-table-header";
-import { TableRow as Ne } from "@tiptap/extension-table-row";
-import be from "@tiptap/extension-text";
-import Te from "@tiptap/extension-text-align";
-function z(e, n) {
-  return n;
-}
-class T {
-  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 T.instance || (T.instance = new T()), T.instance;
-  }
-  log(n, r, t) {
-    this.logger(n, r, t);
-  }
-}
-T.getInstance();
-const he = (e, n, r = !1) => {
-  const t = new T(e, n, r);
-  return t.log("Logger initialized", "info"), t;
-}, Be = he("[DirectusQuery]"), Se = process.env.NEXT_PUBLIC_GRAPHQL_URL, _e = process.env.NEXT_SERVER_GRAPHQL_URL, ve = process.env.NEXT_GRAPHQL_URL_ADMIN, Le = process.env.NEXT_PUBLIC_API_TOKEN ?? "", Ee = process.env.NEXT_PUBLIC_API_TOKEN, _ = new P(_e || Se, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${Le}`
-  }
-});
-new P(ve, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${Ee}`
-  }
-});
-new X({
-  queryCache: new J({
-    onError: (e) => {
-      Be.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 D(e, n, r = _) {
-  return r.request(e, {
-    ...n
-  });
-}
-process.env.NEXT_PUBLIC_GRAPHQL_URL;
-process.env.NEXT_PUBLIC_API_TOKEN;
-const F = { 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" } }] } }] };
-function w(e) {
-  return !!e;
-}
-function Ae(e) {
-  const { id: n, settings: r, ...t } = e ?? {};
-  return W(t);
-}
-async function Ie(e, n = _) {
-  const { document: r, blockKey: t, variables: i } = e;
-  if (!r || !w(i)) return null;
-  const o = await D(r, i, n);
-  return !o || typeof o != "object" || !t ? null : o[t];
-}
-async function we(e, n = _) {
-  const { document: r, item: t, blockKey: i, variables: o } = e;
-  if (t) {
-    if (!Ae(t))
-      return t;
-    const a = { id: t.id, ...o };
-    return w(a) ? Ie({
-      ...e,
-      variables: a
-    }) : null;
-  }
-  if (!r || !w(o)) return null;
-  const c = await D(r, o, n);
-  return !c || typeof c != "object" || !i ? null : c[i];
-}
-function Pe(e) {
-  return e instanceof P;
-}
-async function Re(e, n, r = _) {
-  const t = v(e, "item"), i = Pe(r), o = v(e, "document"), c = v(e, "variables"), s = await we(
-    {
-      item: t,
-      blockKey: n,
-      document: o ?? (i ? void 0 : r),
-      variables: c
-    },
-    i ? r : void 0
-  ), { tokens: a } = z(F, s == null ? void 0 : s.settings) ?? {};
-  return { ...s, cmsTokens: a };
-}
-function He(e, ...n) {
-  return n.reduce((t, i) => i ? { components: { ...t.components, ...i.components } } : t, e);
-}
-const Oe = (e) => {
-  var b, f, B;
-  const { item: n, collection: r, config: t, variables: i, defaultVariant: o, ...c } = e;
-  if (!r || !t) return null;
-  const s = (b = t == null ? void 0 : t.components) == null ? void 0 : b[r];
-  if (!s) return null;
-  const { settings: a } = n ?? {}, m = (n == null ? void 0 : n.id) ?? (i == null ? void 0 : i.id);
-  if (!m) return null;
-  const { variant: d } = z(F, a) ?? {}, p = ((f = s.getVariant) == null ? void 0 : f.call(s, e)) ?? d ?? o, { default: g, document: u } = s, N = ((B = s.variants) == null ? void 0 : B[p ?? ""]) ?? g;
-  return N ? /* @__PURE__ */ k(
-    N,
-    {
-      document: u,
-      config: t,
-      collection: r,
-      item: n,
-      ...m ? { variables: { ...i, id: m } } : { variables: i },
-      ...c
-    },
-    m
-  ) : null;
-}, Ce = async (e) => {
-  const n = "block_wysiwygs_by_id", { themeName: r = "wysiwyg", tokens: t } = e, { content: i, title: o, level: c, cmsTokens: s } = await Re(e, n);
-  return !i && !(o && c) ? null : /* @__PURE__ */ G(V, { children: [
-    o && c && /* @__PURE__ */ k(x, { as: "span", themeName: r, tokens: { ...t, ...s }, children: j.createElement(c, {}, o) }),
-    i && /* @__PURE__ */ k($, { themeName: r, tokens: { ...t, ...s }, content: i })
-  ] });
-}, xe = {
-  block_wysiwygs: {
-    default: (e) => /* @__PURE__ */ k(Ce, { ...e })
-  }
-}, qe = {
-  components: {
-    ...xe
-  }
-}, C = (e) => {
-  const { children: n, config: r, ...t } = e, i = He(qe, r), o = (s) => n ? n({ ...t, ...s, config: i }) : /* @__PURE__ */ k(Oe, { ...t, ...s, config: i });
-  if ("blocks" in e) {
-    const { blocks: s } = e;
-    return s.map(o);
-  }
-  const { block: c } = e;
-  return o(c);
-}, ze = (e, n, r = "id", t = "item") => {
-  const i = (o) => {
-    var c, s, a, m, d, p;
-    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" && ((a = o.attrs) != null && a.id)) {
-      const g = (m = e.find((u) => {
-        var y;
-        return (u == null ? void 0 : u[r]) === ((y = o.attrs) == null ? void 0 : y.id);
-      })) == null ? void 0 : m[t];
-      o.attrs.data = g;
-    }
-    return (d = o.content) == null || d.map(i), (p = o.marks) == null || p.map(i), o;
+    return (d = t.content) == null || d.map(i), (p = t.marks) == null || p.map(i), t;
   };
-  return i(n);
-}, De = (e, n) => {
-  const r = n.map((o) => (o.type === "mark" ? q : I).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 = r.map(({ name: o }) => o);
-  return [...e.filter((o) => t.indexOf(o.name) < 0), ...r];
-}, M = (e, n, r) => {
-  const t = r.find((i) => i.type === n && 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
     };
-}, Fe = (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;
+}, 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;
   }));
-}, L = (e, n, r = "node") => {
-  const t = M(e.type, r, n);
-  if (!(t != null && t.renderHTML)) return [];
-  const i = Fe(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
   });
-}, Q = (e, n, r) => {
-  if (e != null && e.content && (e.content = e.content.map((c) => Q(c, n, r))), e.type === "text") {
-    if (e.marks) {
-      let c;
-      return e.marks.reverse().forEach((s) => {
-        var m;
-        const a = L(
-          { ...s, attrs: { ...s.attrs, data: { ...(m = s == null ? void 0 : s.attrs) == null ? void 0 : m.data, markText: e.text } } },
-          n,
+}, 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(a)) {
-          const [d = "span", p = s.attrs] = a, g = { ...p, data: void 0 };
-          c = r(d, 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 = { ...a, text: e.text };
-      }), c;
+          s = { ...m, text: r.text };
+      }), s;
     }
-    return e.text ?? "";
+    return r.text ?? "";
   }
-  const t = M(e.type, "node", n);
-  if (t != null && t.render)
-    return L(e, n);
-  const [i = "div", o = e.attrs] = L(e, n);
-  return r(i, o, e.content);
-}, Me = (e, n, r) => Q(e, n, r), E = {
+  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"
-}, Qe = (e, n) => ({
+}, lr = (r, o) => ({
   ...Object.fromEntries(
-    Object.entries(n).map(([r, t]) => [(e == null ? void 0 : e[r]) ?? (E == null ? void 0 : E[r]) ?? r, t])
+    Object.entries(o).map(([n, e]) => [(r == null ? void 0 : r[n]) ?? (B == null ? void 0 : B[n]) ?? n, e])
   )
-}), A = {}, Ue = (e) => {
+}), H = {}, pr = (r) => {
   const {
-    content: n,
-    serializers: r = [],
-    componentSerializers: t = [],
+    content: o,
+    serializers: n = [],
+    componentSerializers: e = [],
     renderingNodes: i,
-    remappedAttributes: o,
-    themeName: c,
-    tokens: s,
-    customTheme: a
-  } = e, m = JSON.parse(JSON.stringify(n)), d = De(r, t);
-  return Me(
-    m,
+    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
-    (p, g, u) => {
-      const y = {
-        ...g,
+    (p, k, l) => {
+      const b = {
+        ...k,
         style: void 0
-      }, N = Qe(o, y), b = p, f = (i == null ? void 0 : i[b]) ?? (A == null ? void 0 : A[b]);
-      return f ? f({ children: u, attrs: N, themeName: c, tokens: s, customTheme: a }) : /* @__PURE__ */ k(
-        x,
+      }, 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: p,
-          ...N,
-          themeName: c,
-          tokens: s,
-          customTheme: a,
-          children: u
+          ...g,
+          themeName: s,
+          tokens: a,
+          customTheme: m,
+          children: l
         },
-        JSON.stringify(u)
+        JSON.stringify(l)
       );
     }
   );
-}, Ke = [
-  re,
-  be,
-  ue,
-  oe,
-  ie,
-  ne,
-  ee,
-  me,
-  le,
+}, fr = [
+  P,
+  nr,
   Y,
-  se,
-  ae,
+  V,
+  W,
+  F,
+  K,
+  X,
+  U,
+  D,
+  $,
+  Q,
+  _,
+  G,
   Z,
-  ce,
-  fe,
-  te,
-  ge,
-  ye,
-  Ne,
-  ke,
-  Te,
-  pe,
-  de
-], Bt = (e) => {
+  q,
+  rr,
+  er,
+  or,
+  tr,
+  ir,
+  j,
+  C
+], Fr = (r) => {
   const {
-    jsonContent: n,
-    editorNodes: r,
-    serializers: t,
+    jsonContent: o,
+    editorNodes: n,
+    serializers: e,
     nodes: i,
-    config: o,
-    relationMarksConfig: c,
-    themeName: s,
-    tokens: a,
-    customTheme: m,
+    config: t,
+    relationMarksConfig: s,
+    themeName: a,
+    tokens: m,
+    customTheme: u,
     remappedAttributes: d
-  } = e, p = ze(r, n), g = t ?? [...Ke] ?? [], u = (f, B) => {
-    var R, H, O;
-    const { attrs: l } = f, U = `${(R = l == null ? void 0 : l.collection) == null ? void 0 : R.replace("related_", "")}_id`;
-    if (l != null && l.data) {
-      if (!((H = l == null ? void 0 : l.data) != null && H.blocks)) {
-        const h = { collection: l.collection, item: { ...l == null ? void 0 : l.data } };
-        return /* @__PURE__ */ k(C, { block: h, config: B }, JSON.stringify(h));
+  } = 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 = (O = l == null ? void 0 : l.data) == null ? void 0 : O.blocks, K = S == null ? void 0 : S.map((h) => ({ item: h == null ? void 0 : h[U], collection: l == null ? void 0 : l.collection }));
-      return /* @__PURE__ */ k(C, { blocks: K, 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 = I.create({
+  }, b = L.create({
     name: "relation-block",
     renderHTML: () => ["relation-block"],
-    render: (f) => u(f, o)
-  }), N = I.create({
+    render: (f) => l(f, t)
+  }), g = L.create({
     name: "relation-inline-block",
     renderHTML: () => ["relation-inline-block"],
-    render: (f) => u(f, o)
-  }), b = q.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), p ? /* @__PURE__ */ k(
-    Ue,
+  return k.push(b, g, y), p ? /* @__PURE__ */ x(
+    pr,
     {
       content: p,
-      serializers: g,
+      serializers: k,
       renderingNodes: i,
-      themeName: s,
-      tokens: a,
-      customTheme: m,
+      themeName: a,
+      tokens: m,
+      customTheme: u,
       remappedAttributes: d
     }
   ) : null;
 };
 export {
-  Bt as FlexibleEditorContent,
-  Ue 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.25",
+  "version": "1.3.2",
   "main": "./index.js",
   "types": "./index.d.ts",
   "exports": {
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "@nx/vite": "20.2.2",
-    "@okam/directus-block": "1.6.3",
-    "@okam/stack-ui": "1.44.0",
+    "@okam/directus-block": "1.7.2",
+    "@okam/stack-ui": "1.44.1",
     "@vitejs/plugin-react": "4.3.4",
     "vite": "^5.0.13",
     "vite-plugin-dts": "~2.3.0",