alinea 1.5.1 → 1.5.4

package/dist/.init/content/pages/welcome.json

@@ -1,5 +1,5 @@
 {
-  "_id": "32jmmrahEGbj2XLJgk85LnTNyEt",
+  "_id": "36bYvugxw883tiYAmoEtvMRAN3F",
   "_type": "Page",
   "_index": "a0",
   "_seeded": "welcome.json",

package/dist/LICENSES.md

@@ -80,6 +80,32 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+===
+
+# @headlessui/react@2.2.0 (MIT)
+
+MIT License
+
+Copyright (c) 2020 Tailwind Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 ===
 
 # htmlparser2@9.1.0 (MIT)
@@ -105,7 +131,7 @@ IN THE SOFTWARE.
 
 ===
 
-# domutils@3.1.0 (BSD-2-Clause)
+# domhandler@5.0.3 (BSD-2-Clause)
 
 Copyright (c) Felix Böhm
 All rights reserved.
@@ -122,33 +148,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===
 
-# @headlessui/react@2.2.0 (MIT)
-
-MIT License
-
-Copyright (c) 2020 Tailwind Labs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-===
-
-# domhandler@5.0.3 (BSD-2-Clause)
+# domutils@3.1.0 (BSD-2-Clause)
 
 Copyright (c) Felix Böhm
 All rights reserved.
@@ -182,38 +182,37 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===
 
-# @badgateway/oauth2-client@3.2.0 (MIT)
+# @popperjs/core@2.11.8 (MIT)
 
-MIT License
+The MIT License (MIT)
 
-Copyright (c) 2019-2023 Evert Pot
+Copyright (c) 2019 Federico Zivolo
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 ===
 
-# prop-types@15.8.1 (MIT)
+# @badgateway/oauth2-client@3.2.0 (MIT)
 
 MIT License
 
-Copyright (c) 2013-present, Facebook, Inc.
+Copyright (c) 2019-2023 Evert Pot
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -443,28 +442,29 @@ SOFTWARE.
 
 ===
 
-# @popperjs/core@2.11.8 (MIT)
+# prop-types@15.8.1 (MIT)
 
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2019 Federico Zivolo
+Copyright (c) 2013-present, Facebook, Inc.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ===
@@ -513,16 +513,43 @@ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ===
 
-# @headless-tree/core@0.0.15 (MIT)
+# @headless-tree/react@0.0.15 (MIT)
 
 MIT
 
 ===
 
-# @headless-tree/react@0.0.15 (MIT)
+# @headless-tree/core@0.0.15 (MIT)
 
 MIT
 
+===
+
+# y-prosemirror@1.2.15 (MIT)
+
+The MIT License (MIT)
+
+Copyright (c) 2019 Kevin Jahns <kevin.jahns@protonmail.com>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ===
 
 # @babel/runtime@7.25.4 (MIT)
@@ -551,33 +578,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-===
-
-# y-prosemirror@1.2.15 (MIT)
-
-The MIT License (MIT)
-
-Copyright (c) 2019 Kevin Jahns <kevin.jahns@protonmail.com>.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ===
 
 # @react-aria/focus@3.19.1 (Apache-2.0)
@@ -1612,6 +1612,33 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+===
+
+# @tanstack/virtual-core@3.10.6 (MIT)
+
+MIT License
+
+Copyright (c) 2021-present Tanner Linsley
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ===
 
 # @react-stately/utils@3.10.5 (Apache-2.0)
@@ -1817,30 +1844,3 @@ limitations under the License.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
-===
-
-# @tanstack/virtual-core@3.10.6 (MIT)
-
-MIT License
-
-Copyright (c) 2021-present Tanner Linsley
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/backend/api/OAuth2.js

@@ -525,8 +525,7 @@ var OAuth2 = class {
                   value: codeVerifier,
                   path: redirectUri.pathname,
                   secure: redirectUri.protocol === "https:",
-                  httpOnly: true,
-                  sameSite: "strict"
+                  httpOnly: true
                 })
               }
             }
@@ -651,10 +650,9 @@ function clearCookies(redirectUri) {
       name: COOKIE_ACCESS_TOKEN,
       value: "",
       expires: /* @__PURE__ */ new Date(0),
-      path: redirectUri.pathname,
+      path: "/",
       secure: redirectUri.protocol === "https:",
-      httpOnly: true,
-      sameSite: "strict"
+      httpOnly: true
     },
     {
       name: COOKIE_REFRESH_TOKEN,
@@ -674,10 +672,9 @@ function tokenToCookie(token, redirectUri) {
       name: COOKIE_ACCESS_TOKEN,
       value: token.accessToken,
       expires: token.expiresAt ? new Date(token.expiresAt) : void 0,
-      path: redirectUri.pathname,
+      path: "/",
       secure: redirectUri.protocol === "https:",
-      httpOnly: true,
-      sameSite: "strict"
+      httpOnly: true
     },
     {
       name: COOKIE_REFRESH_TOKEN,

package/dist/bundled.d.ts

@@ -9882,6 +9882,20 @@ declare module 'alinea/ui/icons/TableDeleteRow' {
   
 }
 
+declare module 'alinea/ui/icons/TableHeaderCell' {
+
+  import type { SVGProps } from 'react';
+  export function TableHeaderCell(props: SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+  
+}
+
+declare module 'alinea/ui/icons/TableHeaderColumn' {
+
+  import type { SVGProps } from 'react';
+  export function TableHeaderColumn(props: SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+  
+}
+
 declare module 'alinea/ui/icons/TableHeaderRow' {
 
   import type { SVGProps } from 'react';
@@ -9924,6 +9938,20 @@ declare module 'alinea/ui/icons/TableInsertRowBefore' {
   
 }
 
+declare module 'alinea/ui/icons/TableMergeCells' {
+
+  import type { SVGProps } from 'react';
+  export function TableMergeCells(props: SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+  
+}
+
+declare module 'alinea/ui/icons/TableSplitCell' {
+
+  import type { SVGProps } from 'react';
+  export function TableSplitCell(props: SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;
+  
+}
+
 declare module 'alinea/ui/Lift' {
 
   import type { HTMLProps } from 'react';

package/dist/chunks/{chunk-SH4E6FUG.js → chunk-APLOCHCC.js}

@@ -57,7 +57,7 @@ var package_default = {
   },
   devDependencies: {
     "@alinea/styler": "^1.0.3",
-    "@alinea/suite": "^0.6.2",
+    "@alinea/suite": "^0.6.3",
     "@biomejs/biome": "^2.1.2",
     "@esbx/reporter": "^0.0.20",
     "@esbx/workspaces": "^0.0.20",

package/dist/chunks/{chunk-Z3QMPIDC.js → chunk-F7QQQJ6Z.js}

@@ -2,7 +2,7 @@
 var package_default = {
   bin: "./dist/cli.js",
   name: "alinea",
-  version: "1.5.1",
+  version: "1.5.4",
   description: "Headless git-based CMS",
   repository: {
     type: "git",

package/dist/cli/Serve.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-Z3QMPIDC.js";
+} from "../chunks/chunk-F7QQQJ6Z.js";
 import "../chunks/chunk-NZLE2WMY.js";
 
 // src/cli/Serve.ts

package/dist/cli/bin.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-Z3QMPIDC.js";
+} from "../chunks/chunk-F7QQQJ6Z.js";
 import "../chunks/chunk-NZLE2WMY.js";
 
 // node_modules/mri/lib/index.mjs

package/dist/cloud/CloudRemote.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-Z3QMPIDC.js";
+} from "../chunks/chunk-F7QQQJ6Z.js";
 import "../chunks/chunk-NZLE2WMY.js";
 
 // src/cloud/CloudRemote.ts

package/dist/core/db/EntryResolver.js

@@ -104,7 +104,7 @@ var EntryResolver = class {
       case "next": {
         const [next] = this.index.filter({
           condition({ workspace, root, parentId, index, locale }) {
-            return workspace === entry.workspace && root === entry.root && parentId === entry.parentId && index < entry.index && locale === entry.locale;
+            return workspace === entry.workspace && root === entry.root && parentId === entry.parentId && index > entry.index && locale === entry.locale;
           }
         }).sort((a, b) => compareStrings(a.index, b.index));
         return { ids: next ? [next.id] : [] };
@@ -112,7 +112,7 @@ var EntryResolver = class {
       case "previous": {
         const [previous] = this.index.filter({
           condition({ workspace, root, parentId, index, locale }) {
-            return workspace === entry.workspace && root === entry.root && parentId === entry.parentId && index > entry.index && locale === entry.locale;
+            return workspace === entry.workspace && root === entry.root && parentId === entry.parentId && index < entry.index && locale === entry.locale;
           }
         }).sort((a, b) => compareStrings(b.index, a.index));
         return { ids: previous ? [previous.id] : [] };

package/dist/field/richtext/RichTextToolbar.js

@@ -4,6 +4,8 @@ import {
 import "../../chunks/chunk-NZLE2WMY.js";
 
 // src/field/richtext/RichTextToolbar.tsx
+import { FieldToolbar } from "alinea/dashboard/view/entry/FieldToolbar";
+import { IconButton } from "alinea/dashboard/view/IconButton";
 import { HStack, Icon, px, Typo } from "alinea/ui";
 import { DropdownMenu } from "alinea/ui/DropdownMenu";
 import { IcAlignCenter } from "alinea/ui/icons/IcAlignCenter";
@@ -18,21 +20,23 @@ import { IcRoundFormatListNumbered } from "alinea/ui/icons/IcRoundFormatListNumb
 import { IcRoundHorizontalRule } from "alinea/ui/icons/IcRoundHorizontalRule";
 import { IcRoundLink } from "alinea/ui/icons/IcRoundLink";
 import { IcRoundQuote } from "alinea/ui/icons/IcRoundQuote";
-import { IcRoundTextFields } from "alinea/ui/icons/IcRoundTextFields";
-import { IcRoundUnfoldMore } from "alinea/ui/icons/IcRoundUnfoldMore";
-import { FieldToolbar } from "alinea/dashboard/view/entry/FieldToolbar";
-import { IconButton } from "alinea/dashboard/view/IconButton";
 import { IcRoundSubscript } from "alinea/ui/icons/IcRoundSubscript";
 import { IcRoundSuperscript } from "alinea/ui/icons/IcRoundSuperscript";
+import { IcRoundTextFields } from "alinea/ui/icons/IcRoundTextFields";
+import { IcRoundUnfoldMore } from "alinea/ui/icons/IcRoundUnfoldMore";
 import { TableDelete } from "alinea/ui/icons/TableDelete";
 import { TableDeleteColumn } from "alinea/ui/icons/TableDeleteColumn";
 import { TableDeleteRow } from "alinea/ui/icons/TableDeleteRow";
+import { TableHeaderCell } from "alinea/ui/icons/TableHeaderCell";
+import { TableHeaderColumn } from "alinea/ui/icons/TableHeaderColumn";
 import { TableHeaderRow } from "alinea/ui/icons/TableHeaderRow";
 import { TableInsert } from "alinea/ui/icons/TableInsert";
 import { TableInsertColumnAfter } from "alinea/ui/icons/TableInsertColumnAfter";
 import { TableInsertColumnBefore } from "alinea/ui/icons/TableInsertColumnBefore";
 import { TableInsertRowAfter } from "alinea/ui/icons/TableInsertRowAfter";
 import { TableInsertRowBefore } from "alinea/ui/icons/TableInsertRowBefore";
+import { TableMergeCells } from "alinea/ui/icons/TableMergeCells";
+import { TableSplitCell } from "alinea/ui/icons/TableSplitCell";
 import { forwardRef } from "react";
 import { attributesToReference, referenceToAttributes } from "./ReferenceLink.js";
 
@@ -185,34 +189,32 @@ var RichTextToolbar = forwardRef(function RichTextToolbar2({ pickLink, editor, f
             /* @__PURE__ */ jsx(
               DropdownMenu.Item,
               {
-                onClick: () => exec().addRowBefore().run(),
+                onClick: () => exec().mergeCells().run(),
+                disabled: !editor.can().mergeCells(),
                 children: /* @__PURE__ */ jsxs(HStack, { gap: 8, center: true, children: [
-                  /* @__PURE__ */ jsx(Icon, { icon: TableInsertRowBefore, size: 20 }),
-                  "Insert row before"
+                  /* @__PURE__ */ jsx(Icon, { icon: TableMergeCells, size: 20 }),
+                  "Merge cells"
                 ] })
               }
             ),
             /* @__PURE__ */ jsx(
               DropdownMenu.Item,
               {
-                onClick: () => exec().addRowAfter().run(),
+                onClick: () => exec().splitCell().run(),
+                disabled: !editor.can().splitCell(),
                 children: /* @__PURE__ */ jsxs(HStack, { gap: 8, center: true, children: [
-                  /* @__PURE__ */ jsx(Icon, { icon: TableInsertRowAfter, size: 20 }),
-                  "Insert row after"
+                  /* @__PURE__ */ jsx(Icon, { icon: TableSplitCell, size: 20 }),
+                  "Split cell"
                 ] })
               }
             ),
-            /* @__PURE__ */ jsx(DropdownMenu.Item, { onClick: () => exec().deleteRow().run(), children: /* @__PURE__ */ jsxs(HStack, { gap: 8, center: true, children: [
-              /* @__PURE__ */ jsx(Icon, { icon: TableDeleteRow, size: 20 }),
-              "Delete row"
-            ] }) }),
             /* @__PURE__ */ jsx(
               DropdownMenu.Item,
               {
-                onClick: () => exec().toggleHeaderRow().run(),
+                onClick: () => exec().toggleHeaderCell().run(),
                 children: /* @__PURE__ */ jsxs(HStack, { gap: 8, center: true, children: [
-                  /* @__PURE__ */ jsx(Icon, { icon: TableHeaderRow, size: 20 }),
-                  "Toggle header row"
+                  /* @__PURE__ */ jsx(Icon, { icon: TableHeaderCell, size: 20 }),
+                  "Toggle header cell"
                 ] })
               }
             ),
@@ -237,6 +239,16 @@ var RichTextToolbar = forwardRef(function RichTextToolbar2({ pickLink, editor, f
                 ] })
               }
             ),
+            /* @__PURE__ */ jsx(
+              DropdownMenu.Item,
+              {
+                onClick: () => exec().toggleHeaderColumn().run(),
+                children: /* @__PURE__ */ jsxs(HStack, { gap: 8, center: true, children: [
+                  /* @__PURE__ */ jsx(Icon, { icon: TableHeaderColumn, size: 20 }),
+                  "Toggle header column"
+                ] })
+              }
+            ),
             /* @__PURE__ */ jsx(
               DropdownMenu.Item,
               {
@@ -248,6 +260,41 @@ var RichTextToolbar = forwardRef(function RichTextToolbar2({ pickLink, editor, f
               }
             ),
             /* @__PURE__ */ jsx(HrDivider, {}),
+            /* @__PURE__ */ jsx(
+              DropdownMenu.Item,
+              {
+                onClick: () => exec().addRowBefore().run(),
+                children: /* @__PURE__ */ jsxs(HStack, { gap: 8, center: true, children: [
+                  /* @__PURE__ */ jsx(Icon, { icon: TableInsertRowBefore, size: 20 }),
+                  "Insert row before"
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              DropdownMenu.Item,
+              {
+                onClick: () => exec().addRowAfter().run(),
+                children: /* @__PURE__ */ jsxs(HStack, { gap: 8, center: true, children: [
+                  /* @__PURE__ */ jsx(Icon, { icon: TableInsertRowAfter, size: 20 }),
+                  "Insert row after"
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              DropdownMenu.Item,
+              {
+                onClick: () => exec().toggleHeaderRow().run(),
+                children: /* @__PURE__ */ jsxs(HStack, { gap: 8, center: true, children: [
+                  /* @__PURE__ */ jsx(Icon, { icon: TableHeaderRow, size: 20 }),
+                  "Toggle header row"
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsx(DropdownMenu.Item, { onClick: () => exec().deleteRow().run(), children: /* @__PURE__ */ jsxs(HStack, { gap: 8, center: true, children: [
+              /* @__PURE__ */ jsx(Icon, { icon: TableDeleteRow, size: 20 }),
+              "Delete row"
+            ] }) }),
+            /* @__PURE__ */ jsx(HrDivider, {}),
             /* @__PURE__ */ jsx(
               DropdownMenu.Item,
               {

package/dist/index.css

@@ -338,12 +338,16 @@ button {
 }
 .alinea-EntryHeader-description {
   flex: 1;
-  overflow-x: auto;
   height: 100%;
   margin: auto;
   padding: 0 var(--alinea-main-padding-x);
   max-width: var(--alinea-main-width);
 }
+@media (max-width: 439.9px) {
+  .alinea-EntryHeader-description {
+    overflow-x: auto;
+  }
+}
 .alinea-EntryHeader-description-separator {
   border-right: 1px solid;
   opacity: 0;
@@ -3335,6 +3339,10 @@ h3.alinea-RichTextKit-heading:not(:last-child) {
   padding: 0.25rem 0.5rem;
   border: 1px solid var(--alinea-fields-table);
 }
+.alinea-RichTextKit-td.selectedCell,
+.alinea-RichTextKit-th.selectedCell {
+  background-color: var(--alinea-highlight);
+}
 .alinea-RichTextKit-th {
   background: var(--alinea-fields-header);
   text-align: left;
@@ -3875,15 +3883,21 @@ h3.alinea-RichTextKit-heading:not(:last-child) {
   user-select: none;
   border-radius: var(--alinea-border-radius);
   padding: 0.5rem 0.625rem;
+}
+.alinea-DropdownMenu-item:not([disabled]) {
   cursor: pointer;
 }
 .alinea-DropdownMenu-item:focus {
-  background-color: var(--alinea-selected);
+  background: var(--alinea-selected);
 }
 .alinea-DropdownMenu-item:hover,
 .alinea-DropdownMenu-item.alinea-DropdownMenu-is-active {
   background: var(--alinea-highlight);
 }
+.alinea-DropdownMenu-item:disabled {
+  pointer-events: none;
+  opacity: 0.5;
+}
 
 /* src/ui/Ellipsis.module.scss */
 .alinea-Ellipsis {

package/dist/ui/icons/TableHeaderCell.d.ts

@@ -0,0 +1,2 @@
+import type { SVGProps } from 'react';
+export declare function TableHeaderCell(props: SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;

package/dist/ui/icons/TableHeaderCell.js

@@ -0,0 +1,16 @@
+import "../../chunks/chunk-NZLE2WMY.js";
+
+// src/ui/icons/TableHeaderCell.tsx
+import { jsx } from "react/jsx-runtime";
+function TableHeaderCell(props) {
+  return /* @__PURE__ */ jsx("svg", { width: "1em", height: "1em", viewBox: "0 0 24 24", ...props, children: /* @__PURE__ */ jsx(
+    "path",
+    {
+      fill: "currentColor",
+      d: "M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14Zm-8 9H5v5h6v-5Zm8 0h-6v5h6v-5Zm-8-7H5v5h6V6Z"
+    }
+  ) });
+}
+export {
+  TableHeaderCell
+};

package/dist/ui/icons/TableHeaderColumn.d.ts

@@ -0,0 +1,2 @@
+import type { SVGProps } from 'react';
+export declare function TableHeaderColumn(props: SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;

package/dist/ui/icons/TableHeaderColumn.js

@@ -0,0 +1,16 @@
+import "../../chunks/chunk-NZLE2WMY.js";
+
+// src/ui/icons/TableHeaderColumn.tsx
+import { jsx } from "react/jsx-runtime";
+function TableHeaderColumn(props) {
+  return /* @__PURE__ */ jsx("svg", { width: "1em", height: "1em", viewBox: "0 0 24 24", ...props, children: /* @__PURE__ */ jsx(
+    "path",
+    {
+      fill: "currentColor",
+      d: "M19,4 C20.1045695,4 21,4.8954305 21,6 L21,18 C21,19.1045695 20.1045695,20 19,20 L5,20 C3.8954305,20 3,19.1045695 3,18 L3,6 C3,4.8954305 3.8954305,4 5,4 L19,4 Z M19,13 L15,13 L15,18 L19,18 L19,13 Z M13,13 L9,13 L9,18 L13,18 L13,13 Z M13,6 L9,6 L9,11 L13,11 L13,6 Z M19,6 L15,6 L15,11 L19,11 L19,6 Z"
+    }
+  ) });
+}
+export {
+  TableHeaderColumn
+};

package/dist/ui/icons/TableHeaderRow.js

@@ -7,7 +7,7 @@ function TableHeaderRow(props) {
     "path",
     {
       fill: "currentColor",
-      d: "M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14ZM5 15v3h6v-3H5Zm14 0h-6v3h6v-3Zm0-9h-6v3h6V6ZM5 9h6V6H5v3Z"
+      d: "M19,4 C20.1045695,4 21,4.8954305 21,6 L21,18 C21,19.1045695 20.1045695,20 19,20 L5,20 C3.8954305,20 3,19.1045695 3,18 L3,6 C3,4.8954305 3.8954305,4 5,4 L19,4 Z M11,15 L5,15 L5,18 L11,18 L11,15 Z M19,15 L13,15 L13,18 L19,18 L19,15 Z M19,10 L13,10 L13,13 L19,13 L19,10 Z M5,13 L11,13 L11,10 L5,10 L5,13 Z"
     }
   ) });
 }

package/dist/ui/icons/TableMergeCells.d.ts

@@ -0,0 +1,2 @@
+import type { SVGProps } from 'react';
+export declare function TableMergeCells(props: SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;

package/dist/ui/icons/TableMergeCells.js

@@ -0,0 +1,16 @@
+import "../../chunks/chunk-NZLE2WMY.js";
+
+// src/ui/icons/TableMergeCells.tsx
+import { jsx } from "react/jsx-runtime";
+function TableMergeCells(props) {
+  return /* @__PURE__ */ jsx("svg", { width: "1em", height: "1em", viewBox: "0 0 24 24", ...props, children: /* @__PURE__ */ jsx(
+    "path",
+    {
+      fill: "currentColor",
+      d: "M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14ZM5 15.5V18h3v-2.5H5Zm14-5h-9V18h9v-7.5ZM19 6h-4v2.5h4V6ZM8 6H5v2.5h3V6Zm5 0h-3v2.5h3V6Zm-8 7.5h3v-3H5v3Z"
+    }
+  ) });
+}
+export {
+  TableMergeCells
+};

package/dist/ui/icons/TableSplitCell.d.ts

@@ -0,0 +1,2 @@
+import type { SVGProps } from 'react';
+export declare function TableSplitCell(props: SVGProps<SVGSVGElement>): import("react/jsx-runtime").JSX.Element;

package/dist/ui/icons/TableSplitCell.js

@@ -0,0 +1,16 @@
+import "../../chunks/chunk-NZLE2WMY.js";
+
+// src/ui/icons/TableSplitCell.tsx
+import { jsx } from "react/jsx-runtime";
+function TableSplitCell(props) {
+  return /* @__PURE__ */ jsx("svg", { width: "1em", height: "1em", viewBox: "0 0 24 24", ...props, children: /* @__PURE__ */ jsx(
+    "path",
+    {
+      fill: "currentColor",
+      d: "M19 4a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V6c0-1.1.9-2 2-2h14ZM8 15.5H5V18h3v-2.5Zm11-5h-9V18h9v-7.5Zm-2.5 1 1 1-2 2 2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2Zm-8.5-1H5v3h3v-3ZM19 6h-4v2.5h4V6ZM8 6H5v2.5h3V6Zm5 0h-3v2.5h3V6Z"
+    }
+  ) });
+}
+export {
+  TableSplitCell
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "bin": "./dist/cli.js",
   "name": "alinea",
-  "version": "1.5.1",
+  "version": "1.5.4",
   "description": "Headless git-based CMS",
   "repository": {
     "type": "git",