@lblod/ember-rdfa-editor-lblod-plugins 35.2.0 → 35.3.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 35.3.0
+
+### Minor Changes
+
+- [#641](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/641) [`062b89a`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/062b89ad35edff9cb0963a17e606497697e7614a) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Add a way to set the required attribute of the label of the besluit type select
+
+### Patch Changes
+
+- [#635](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/635) [`d2ac617`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/d2ac61769c71978bc9bc5e3ff10385057ae807bb) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Fix resetting the placeholder edit card
+
 ## 35.2.0
 
 ### Minor Changes

package/addon/components/besluit-type-plugin/besluit-type-form.gts

@@ -8,6 +8,7 @@ interface Sig {
     types: BesluitType[];
     selectedType?: BesluitTypeInstance;
     setType: (selected: BesluitTypeInstance) => void;
+    required?: boolean;
   };
   Element: HTMLDivElement;
 }
@@ -44,6 +45,7 @@ export default class BesluitTypePluginBesluitTypeSelectComponent extends Compone
         @onchange={{this.updateParentType}}
         @selected={{@selectedType.parent}}
         @showWarningWhenEmpty={{false}}
+        @required={{@required}}
       />
       {{#if @selectedType.parent.subTypes.length}}
         <BesluitTypeSelect
@@ -52,6 +54,7 @@ export default class BesluitTypePluginBesluitTypeSelectComponent extends Compone
           @onchange={{this.updateSubType}}
           @selected={{@selectedType.subType}}
           @showWarningWhenEmpty={{true}}
+          @required={{@required}}
         />
       {{/if}}
       {{#if @selectedType.subType.subTypes.length}}
@@ -61,6 +64,7 @@ export default class BesluitTypePluginBesluitTypeSelectComponent extends Compone
           @onchange={{this.updateSubSubType}}
           @selected={{@selectedType.subSubType}}
           @showWarningWhenEmpty={{true}}
+          @required={{@required}}
         />
       {{/if}}
     </div>

package/addon/components/besluit-type-plugin/besluit-type-select.gts

@@ -15,6 +15,7 @@ interface Sig {
     selected?: BesluitType;
     showWarningWhenEmpty: boolean;
     onchange: (selected: BesluitType) => void;
+    required?: boolean;
   };
   Element: HTMLDivElement;
 }
@@ -43,7 +44,7 @@ export default class BesluitTypePluginBesluitTypeSelectComponent extends Compone
   <template>
     <div ...attributes>
       {{#let (uuidv4) as |id|}}
-        <AuLabel for={{id}}>
+        <AuLabel for={{id}} @required={{@required}}>
           {{t @fieldNameTranslation}}
         </AuLabel>
         <PowerSelect

package/addon/components/placeholder-utils-plugin/edit.gts

@@ -1,7 +1,6 @@
 import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
 import { type ComponentLike } from '@glint/template';
-import { NodeSelection, SayController } from '@lblod/ember-rdfa-editor';
+import { NodeSelection, Node, SayController } from '@lblod/ember-rdfa-editor';
 import { service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
 import AuCard from '@appuniversum/ember-appuniversum/components/au-card';
@@ -14,6 +13,8 @@ import AuNativeInput from '../au-native-input';
 import AuFormRow from '@appuniversum/ember-appuniversum/components/au-form-row';
 import checkEnterAndSubmit from '@lblod/ember-rdfa-editor-lblod-plugins/utils/check-enter-and-submit';
 import { fn } from '@ember/helper';
+import { not } from 'ember-truth-helpers';
+import { trackedReset } from 'tracked-toolbox';
 
 type VariableComponentArgs = {
   Args: {
@@ -34,7 +35,14 @@ type Args = {
 };
 
 export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
-  @tracked editedPlaceholderLabel?: string;
+  @trackedReset({
+    memo: 'selectedPlaceholderNode',
+    update(component: PlaceholderUtilsEditCardComponent) {
+      return component.selectedPlaceholderNode?.attrs.placeholderText;
+    },
+  })
+  placeholderLabel: string | null = null;
+  lastSelectedPlaceholder: Node | null = null;
 
   @service declare intl: IntlService;
 
@@ -50,20 +58,14 @@ export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
     ) {
       return selection.node;
     } else {
-      return;
+      return null;
     }
   }
   get showCard() {
     return !!this.selectedPlaceholderNode;
   }
-  get placeholderLabel() {
-    return (
-      this.editedPlaceholderLabel ||
-      this.selectedPlaceholderNode?.attrs.placeholderText
-    );
-  }
   updateLabelPlaceholder = (event: InputEvent) => {
-    this.editedPlaceholderLabel = (event.target as HTMLInputElement).value;
+    this.placeholderLabel = (event.target as HTMLInputElement).value;
   };
   updatePlaceholder = () => {
     const { selection } = this.controller.activeEditorState;
@@ -71,7 +73,7 @@ export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
       return tr.setNodeAttribute(
         selection.$from.pos,
         'placeholderText',
-        this.editedPlaceholderLabel,
+        this.placeholderLabel,
       );
     });
   };
@@ -110,6 +112,7 @@ export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
           <AuButton
             {{on 'click' this.updatePlaceholder}}
             class='au-u-margin-top'
+            @disabled={{not this.placeholderLabel}}
           >
             {{t 'editor-plugins.utils.insert'}}
           </AuButton>

package/declarations/addon/components/besluit-type-plugin/besluit-type-form.d.ts

@@ -6,6 +6,7 @@ interface Sig {
         types: BesluitType[];
         selectedType?: BesluitTypeInstance;
         setType: (selected: BesluitTypeInstance) => void;
+        required?: boolean;
     };
     Element: HTMLDivElement;
 }

package/declarations/addon/components/besluit-type-plugin/besluit-type-select.d.ts

@@ -7,6 +7,7 @@ interface Sig {
         selected?: BesluitType;
         showWarningWhenEmpty: boolean;
         onchange: (selected: BesluitType) => void;
+        required?: boolean;
     };
     Element: HTMLDivElement;
 }

package/declarations/addon/components/placeholder-utils-plugin/edit.d.ts

@@ -1,6 +1,6 @@
 import Component from '@glimmer/component';
 import { type ComponentLike } from '@glint/template';
-import { SayController } from '@lblod/ember-rdfa-editor';
+import { Node, SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type VariableComponentArgs = {
     Args: {
@@ -19,12 +19,12 @@ type Args = {
     variableTypes: VariableConfig[];
 };
 export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
-    editedPlaceholderLabel?: string;
+    placeholderLabel: string | null;
+    lastSelectedPlaceholder: Node | null;
     intl: IntlService;
     get controller(): SayController;
-    get selectedPlaceholderNode(): import("prosemirror-model").Node | undefined;
+    get selectedPlaceholderNode(): Node | null;
     get showCard(): boolean;
-    get placeholderLabel(): any;
     updateLabelPlaceholder: (event: InputEvent) => void;
     updatePlaceholder: () => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "35.2.0",
+  "version": "35.3.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",