alinea 2.0.0-preview.6 → 2.0.0-preview.7

package/dist/index.css

@@ -1566,17 +1566,23 @@
 }
 .alinea-ListLabel {
   color: var(--alinea-fg-muted);
-  border: none;
   flex-wrap: wrap;
   align-items: flex-start;
-  min-height: auto;
+  gap: 6px;
   margin-bottom: 8px;
-  margin-left: -8px;
+  padding-block: 4px;
+  display: flex;
+}
+.alinea-ListLabel .alinea-ListLabel-toggle {
+  color: inherit;
+  border: none;
+  min-height: auto;
+  margin-inline: -8px;
   padding-block: 0;
 }
-.alinea-ListLabel[data-hovered],
-.alinea-ListLabel[data-pressed],
-.alinea-ListLabel[data-active] {
+.alinea-ListLabel .alinea-ListLabel-toggle[data-hovered],
+.alinea-ListLabel .alinea-ListLabel-toggle[data-pressed],
+.alinea-ListLabel .alinea-ListLabel-toggle[data-active] {
   background: none;
 }
 .alinea-ListError {
@@ -4437,6 +4443,11 @@
 .alinea-EntrySidebar-disclosurePanel {
   padding-top: 10px;
 }
+.alinea-EntrySidebar-loading {
+  justify-content: center;
+  padding: 12px 0;
+  display: flex;
+}
 .alinea-EntrySidebar-previewPanel {
   flex-direction: column;
   flex: 1;

package/dist/ui/RichText.js

@@ -92,12 +92,14 @@ function defaultNodeElement(type, attributes, content) {
       const href = attributes?.href;
       const target = attributes?.target;
       const title = attributes?.title;
+      const rel = attributes?.rel;
       return /* @__PURE__ */ jsx(
         "a",
         {
           href: typeof href === "string" ? href : void 0,
           target: typeof target === "string" ? target : void 0,
-          title: typeof title === "string" ? title : void 0
+          title: typeof title === "string" ? title : void 0,
+          rel: typeof rel === "string" ? rel : void 0
         }
       );
     }
@@ -143,37 +145,50 @@ function textAlignAttribute(value) {
 function isComponentView(view) {
   return Boolean(view) && !isValidElement(view);
 }
+function renderMarks(content, marks, views) {
+  return (marks ?? []).reduce((children, mark) => {
+    const element = nodeElement(mark[Mark.type], mark);
+    if (!element?.type) return children;
+    const View = views[String(element.type)];
+    if (isComponentView(View)) {
+      const Component = View;
+      return /* @__PURE__ */ jsx(Component, { ...element.props, children });
+    }
+    const view = View ?? element;
+    return /* @__PURE__ */ jsx(view.type, { ...element.props, ...view.props, children });
+  }, content);
+}
 function RichTextNodeView({ views, node }) {
   if (Node.isText(node)) {
     const { [TextNode.text]: text, [TextNode.marks]: marks } = node;
     const TextView = views.text;
     const content = typeof TextView === "function" ? /* @__PURE__ */ jsx(TextView, { children: text }) : text ?? "";
-    const wrappers = marks?.map((mark) => ({
-      type: mark[Mark.type],
-      element: nodeElement(mark[Mark.type], mark)
-    }));
-    return (wrappers ?? []).reduce((children, { element }) => {
-      if (!element?.type) return children;
-      const View = views[String(element.type)];
-      if (isComponentView(View)) {
-        const Component = View;
-        return /* @__PURE__ */ jsx(Component, { ...element.props, children });
-      }
-      const view = View ?? element;
-      return /* @__PURE__ */ jsx(view.type, { ...element.props, ...view.props, children });
-    }, content);
+    return renderMarks(content, marks, views);
   }
   if (Node.isElement(node)) {
-    const { [Node.type]: type, [ElementNode.content]: content, ...attrs } = node;
+    const {
+      [Node.type]: type,
+      [ElementNode.content]: content,
+      marks,
+      ...attrs
+    } = node;
     const element = nodeElement(type, attrs, content);
     const View = type === "table" ? views.table : element?.type ? views[String(element.type)] : void 0;
     const inner = content?.map((node2, i) => /* @__PURE__ */ jsx(RichTextNodeView, { views, node: node2 }, i)) ?? null;
     if (isComponentView(View)) {
       const Component = View;
-      return /* @__PURE__ */ jsx(Component, { ...element?.props, children: inner });
+      return renderMarks(
+        /* @__PURE__ */ jsx(Component, { ...element?.props, children: inner }),
+        marks,
+        views
+      );
     }
     const el = View ?? element ?? { type: Fragment, props: {} };
-    return /* @__PURE__ */ jsx(el.type, { ...element?.props, ...el.props, children: inner });
+    return renderMarks(
+      /* @__PURE__ */ jsx(el.type, { ...element?.props, ...el.props, children: inner }),
+      marks,
+      views
+    );
   }
   if (Node.isBlock(node)) {
     const { [Node.type]: type, [BlockNode.id]: id, ...attrs } = node;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alinea",
-  "version": "2.0.0-preview.6",
+  "version": "2.0.0-preview.7",
   "description": "Headless git-based CMS",
   "repository": "github:alineacms/alinea",
   "license": "MIT",