@lblod/ember-rdfa-editor-lblod-plugins 1.0.0-beta.4 → 1.0.0-beta.6

package/CHANGELOG.md

@@ -13,6 +13,27 @@
 
 
 
+
+## 1.0.0-beta.6 (2023-01-25)
+
+#### :bug: Bug Fix
+* [#81](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/81) Wrap-structure-content: return false if structure is not a wrapper ([@elpoelma](https://github.com/elpoelma))
+
+#### Committers: 1
+- Elena Poelman ([@elpoelma](https://github.com/elpoelma))
+
+## 1.0.0-beta.5 (2023-01-25)
+
+* chore(deps): update editor to beta 7 (ef72b82)
+* Merge pull request #80 (d76dd89)
+* Merge pull request #79 (69a5c62)
+* Merge pull request #78 (fc68bf5)
+* fix(decision-type): remove the old type before adding the new one (701ad87)
+* fix(template): improve insertion behavior of standard templates (96cba5c)
+* fix(nodes): make important nodes defining (5534c00)
+* fix(nodes): make title node also parse on other header levels (9229677)
+
+
 ## 1.0.0-beta.4 (2023-01-24)
 
 #### :bug: Bug Fix

package/addon/components/besluit-type-plugin/toolbar-dropdown.ts

@@ -17,6 +17,7 @@ import fetchBesluitTypes, {
   BesluitType,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-type-plugin/utils/fetchBesluitTypes';
 import { findAncestorOfType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin/utils/structure';
+
 declare module 'ember__owner' {
   export default interface Owner {
     resolveRegistration(name: string): unknown;
@@ -207,14 +208,14 @@ export default class EditorPluginsToolbarDropdownComponent extends Component<Arg
   insert() {
     if (this.besluitType && this.currentBesluitRange) {
       this.cardExpanded = false;
-      this.controller.checkAndDoCommand(
-        addType(this.currentBesluitRange.from, this.besluitType.uri)
-      );
       if (this.previousBesluitType) {
         this.controller.checkAndDoCommand(
           removeType(this.currentBesluitRange.from, this.previousBesluitType)
         );
       }
+      this.controller.checkAndDoCommand(
+        addType(this.currentBesluitRange.from, this.besluitType.uri)
+      );
     }
   }
 

package/addon/components/standard-template-plugin/template-provider.ts

@@ -98,10 +98,17 @@ export default class TemplateProviderComponent extends Component<Args> {
     const selection = this.controller.state.selection;
     let insertRange: { from: number; to: number } = selection;
     const { $from, $to } = selection;
-    if (
+    const isInPlaceholder =
       $from.parent.type === this.controller.schema.nodes['placeholder'] &&
-      $from.sameParent($to)
-    ) {
+      $from.sameParent($to);
+    // if we would be completely replacing the contents of a simple paragraph node,
+    // replace the entire node instead
+    const isInSimpleParagraph =
+      $from.parent.type === this.controller.schema.nodes.paragraph &&
+      $from.sameParent($to) &&
+      $from.pos === $from.start() &&
+      $to.pos === $to.end();
+    if (isInPlaceholder || isInSimpleParagraph) {
       insertRange = {
         from: $from.start($from.depth - 1),
         to: $from.end($from.depth - 1),

package/addon/plugins/article-structure-plugin/commands/wrap-structure-content.ts

@@ -15,6 +15,9 @@ const wrapStructureContent = (
   intl: IntlService
 ): Command => {
   return (state, dispatch) => {
+    if (!structureSpec.content) {
+      return false;
+    }
     const { selection, schema } = state;
     const container = findInsertionContainer(
       selection,
@@ -23,12 +26,6 @@ const wrapStructureContent = (
     if (!container) {
       return false;
     }
-    // const { node, pos } = parent;
-    // if (
-    //   !node.canReplaceWith(0, node.childCount, schema.nodes[structureSpec.name])
-    // ) {
-    //   return false;
-    // }
     const contentToWrap = container.node.content;
 
     let result: {

package/addon/plugins/standard-template-plugin/utils/nodes.ts

@@ -19,6 +19,7 @@ import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 export const title: NodeSpec = {
   content: 'paragraph+',
   inline: false,
+  defining: true,
   attrs: {
     ...rdfaAttrs,
     property: {
@@ -33,7 +34,7 @@ export const title: NodeSpec = {
   },
   parseDOM: [
     {
-      tag: 'h4',
+      tag: 'h1,h2,h3,h4,h5',
       getAttrs(element: HTMLElement) {
         if (hasRDFaAttribute(element, 'property', ELI('title'))) {
           return getRdfaAttrs(element);
@@ -298,6 +299,7 @@ export const besluit: NodeSpec = {
   group: 'block',
   content: 'block*title?block*description?block*motivering?block*',
   inline: false,
+  defining: true,
   attrs: {
     ...rdfaAttrs,
     property: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -62,7 +62,7 @@
     "@embroider/test-setup": "^1.6.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@lblod/ember-rdfa-editor": "^1.0.0-beta.6",
+    "@lblod/ember-rdfa-editor": "^1.0.0-beta.7",
     "@rdfjs/types": "^1.1.0",
     "@release-it-plugins/lerna-changelog": "^5.0.0",
     "@tsconfig/ember": "^1.0.1",