enable support for hierarchical lists

lblod · Apr 26, 2024 · 9419f78 · 9419f78
1 parent fe2ab59
commit 9419f78
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 19 deletions.
diff --git a/.changeset/fuzzy-hats-compete.md b/.changeset/fuzzy-hats-compete.md
@@ -0,0 +1,5 @@
+---
+"frontend-gelinkt-notuleren": minor
+---
+
+Enable support for hierarchical lists
diff --git a/app/components/toolbar/list.hbs b/app/components/toolbar/list.hbs
@@ -1,2 +1,2 @@
 <Plugins::List::Unordered @controller={{@controller}}/>
-<Plugins::List::Ordered @controller={{@controller}}/>
+<Plugins::List::Ordered @controller={{@controller}} @enableHierarchicalList={{true}}/>
diff --git a/app/components/zitting-text-document-container.js b/app/components/zitting-text-document-container.js
@@ -30,9 +30,10 @@ import {
 } from '@lblod/ember-rdfa-editor/plugins/table';
 import { link, linkView } from '@lblod/ember-rdfa-editor/nodes/link';
 import {
-  bullet_list,
-  list_item,
-  ordered_list,
+  bulletListWithConfig,
+  listItemWithConfig,
+  listTrackingPlugin,
+  orderedListWithConfig,
 } from '@lblod/ember-rdfa-editor/plugins/list';
 import { placeholder } from '@lblod/ember-rdfa-editor/plugins/placeholder';
 import { heading } from '@lblod/ember-rdfa-editor/plugins/heading';
@@ -70,9 +71,9 @@ export default class ZittingTextDocumentContainerComponent extends Component {
       doc: docWithConfig(),
       paragraph,
       repaired_block,
-      list_item,
-      ordered_list,
-      bullet_list,
+      list_item: listItemWithConfig({ enableHierarchicalList: true }),
+      ordered_list: orderedListWithConfig({ enableHierarchicalList: true }),
+      bullet_list: bulletListWithConfig({ enableHierarchicalList: true }),
       placeholder,
       ...tableNodes({ tableGroup: 'block', cellContent: 'block+' }),
       date: date(this.config.date),
@@ -163,6 +164,7 @@ export default class ZittingTextDocumentContainerComponent extends Component {
       ...tablePlugins,
       tableKeymap,
       linkPasteHandler(this.schema.nodes.link),
+      listTrackingPlugin(),
     ];
   }
 

diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js
@@ -44,9 +44,10 @@ import {
   textVariableView,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables';
 import {
-  bullet_list,
-  list_item,
-  ordered_list,
+  bulletListWithConfig,
+  listItemWithConfig,
+  listTrackingPlugin,
+  orderedListWithConfig,
 } from '@lblod/ember-rdfa-editor/plugins/list';
 import { placeholder } from '@lblod/ember-rdfa-editor/plugins/placeholder';
 import { heading } from '@lblod/ember-rdfa-editor/plugins/heading';
@@ -115,9 +116,9 @@ export default class AgendapointsEditController extends Controller {
       doc: docWithConfig(),
       paragraph,
       repaired_block,
-      list_item,
-      ordered_list,
-      bullet_list,
+      list_item: listItemWithConfig({ enableHierarchicalList: true }),
+      ordered_list: orderedListWithConfig({ enableHierarchicalList: true }),
+      bullet_list: bulletListWithConfig({ enableHierarchicalList: true }),
       placeholder,
       ...tableNodes({ tableGroup: 'block', cellContent: 'block+' }),
       date: date(this.config.date),
@@ -260,6 +261,7 @@ export default class AgendapointsEditController extends Controller {
         },
       ),
       linkPasteHandler(this.schema.nodes.link),
+      listTrackingPlugin(),
     ];
   }
 

diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js
@@ -42,9 +42,10 @@ import {
   STRUCTURE_SPECS,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin/structures';
 import {
-  bullet_list,
-  list_item,
-  ordered_list,
+  bulletListWithConfig,
+  listItemWithConfig,
+  listTrackingPlugin,
+  orderedListWithConfig,
 } from '@lblod/ember-rdfa-editor/plugins/list';
 import { placeholder } from '@lblod/ember-rdfa-editor/plugins/placeholder';
 import { heading } from '@lblod/ember-rdfa-editor/plugins/heading';
@@ -112,9 +113,9 @@ export default class RegulatoryStatementsRoute extends Controller {
       document_title,
       table_of_contents: table_of_contents(this.config.tableOfContents),
       repaired_block,
-      list_item,
-      ordered_list,
-      bullet_list,
+      list_item: listItemWithConfig({ enableHierarchicalList: true }),
+      ordered_list: orderedListWithConfig({ enableHierarchicalList: true }),
+      bullet_list: bulletListWithConfig({ enableHierarchicalList: true }),
       placeholder,
       templateComment,
       ...tableNodes({ tableGroup: 'block', cellContent: 'block+' }),
@@ -181,6 +182,7 @@ export default class RegulatoryStatementsRoute extends Controller {
       ),
       linkPasteHandler(this.schema.nodes.link),
       emberApplication({ application: getOwner(this) }),
+      listTrackingPlugin(),
     ];
   }