Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update @lblod/ember-rdfa-editor to 9.7.0 and enable support for hierarchical lists #651

Merged
merged 2 commits into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fuzzy-hats-compete.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"frontend-gelinkt-notuleren": minor
---

Enable support for hierarchical lists
5 changes: 5 additions & 0 deletions .changeset/slimy-lobsters-admire.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"frontend-gelinkt-notuleren": patch
---

Update `@lblod/ember-rdfa-editor` to version 9.7.0
2 changes: 1 addition & 1 deletion app/components/toolbar/list.hbs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<Plugins::List::Unordered @controller={{@controller}}/>
<Plugins::List::Ordered @controller={{@controller}}/>
<Plugins::List::Ordered @controller={{@controller}} @enableHierarchicalList={{true}}/>
14 changes: 8 additions & 6 deletions app/components/zitting-text-document-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -163,6 +164,7 @@ export default class ZittingTextDocumentContainerComponent extends Component {
...tablePlugins,
tableKeymap,
linkPasteHandler(this.schema.nodes.link),
listTrackingPlugin(),
];
}

Expand Down
14 changes: 8 additions & 6 deletions app/controllers/agendapoints/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -260,6 +261,7 @@ export default class AgendapointsEditController extends Controller {
},
),
linkPasteHandler(this.schema.nodes.link),
listTrackingPlugin(),
];
}

Expand Down
14 changes: 8 additions & 6 deletions app/controllers/regulatory-statements/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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+' }),
Expand Down Expand Up @@ -181,6 +182,7 @@ export default class RegulatoryStatementsRoute extends Controller {
),
linkPasteHandler(this.schema.nodes.link),
emberApplication({ application: getOwner(this) }),
listTrackingPlugin(),
];
}

Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@lblod/ember-acmidm-login": "^2.0.0-beta.1",
"@lblod/ember-environment-banner": "^0.5.0",
"@lblod/ember-mock-login": "0.7.0",
"@lblod/ember-rdfa-editor": "9.6.1",
"@lblod/ember-rdfa-editor": "9.7.0",
"@lblod/ember-rdfa-editor-lblod-plugins": "^17.1.0",
"@release-it-plugins/lerna-changelog": "^6.0.0",
"broccoli-asset-rev": "^3.0.0",
Expand Down