@lblod/ember-rdfa-editor-lblod-plugins 12.1.0 → 13.0.0

package/app/styles/date-plugin.scss

@@ -1,23 +1,3 @@
-
-span.date {
-  border-radius: 0.3rem;
-  margin-right: 0.5rem !important;
-  padding: 0 0.2rem !important;
-  line-height: 1.2rem !important;
-  transition: border 0.1s ease-in-out, background-color 0.1s ease-in-out;
-
-  &::selection {
-    background-color: var(--au-blue-200);
-  }
-
-  user-select: none;
-}
-
-span.date.ProseMirror-selectednode {
-  background-color: var(--au-blue-200);
-  outline: 2px solid var(--au-blue-500);
-}
-
 #date-plugin-time-info-tooltip {
   z-index: 3;
 }

package/app/styles/snippet-plugin.scss

@@ -71,7 +71,7 @@
   }
 }
 
-.snippet-lists-table {
+.say-snippet-lists-table {
   .au-c-table-wrapper {
     margin-top: 20px;
     margin-right: 100px;

package/app/styles/template-comments-plugin.scss

@@ -1,6 +1,6 @@
 @import "ember-appuniversum";
 
-.template-comment {
+.say-template-comment {
   color: var(--au-blue-900);
 
   .au-c-alert__content {
@@ -31,10 +31,10 @@
   }
 }
 
-.default-cursor {
+.say-default-cursor {
   cursor: default;
 }
 
-.text-cursor {
+.say-text-cursor {
   cursor: text;
-}
+}

package/app/styles/variable-plugin.scss

@@ -82,7 +82,7 @@
   }
 }
 
-.number-settings {
+.say-number-settings {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
   grid-template-rows: 1fr;
@@ -129,5 +129,5 @@
   // add top padding starting from second element
   * :not(*:nth-child(1)) {
     margin-top: 5px;
-  } 
+  }
 }

package/components/template-comments-plugin/template-comment.d.ts

@@ -1,6 +1,12 @@
 import Component from '@glimmer/component';
+import IntlService from 'ember-intl/services/intl';
 import { EmberNodeArgs } from '@lblod/ember-rdfa-editor/utils/ember-node';
 export default class TemplateCommentsPluginTemplateCommentComponent extends Component<EmberNodeArgs> {
+    intl: IntlService;
     get controller(): import("@lblod/ember-rdfa-editor").SayController;
+    get documentLanguage(): string;
+    get translation(): {
+        title: string;
+    };
     get selectionInside(): boolean;
 }

package/components/variable-plugin/address/insert-variable.d.ts

@@ -1,11 +1,14 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
 };
 export default class VariablePluginAddressInsertVariableComponent extends Component<Args> {
+    intl: IntlService;
     label?: string;
     get controller(): SayController;
+    get documentLanguage(): string;
     updateLabel(event: InputEvent): void;
     insertAddress(): void;
 }

package/components/variable-plugin/address/insert.d.ts

@@ -1,10 +1,13 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
 };
 export default class InsertAddressComponent extends Component<Args> {
+    intl: IntlService;
     get controller(): SayController;
+    get documentLanguage(): string;
     insertAddress(): void;
     get canInsertAddress(): boolean;
 }

package/components/variable-plugin/address/nodeview.d.ts

@@ -1,4 +1,5 @@
 import Component from '@glimmer/component';
+import IntlService from 'ember-intl/services/intl';
 import { PNode, SayController } from '@lblod/ember-rdfa-editor';
 import { Address } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables/address';
 type Args = {
@@ -7,6 +8,12 @@ type Args = {
     controller: SayController;
 };
 export default class AddressNodeviewComponent extends Component<Args> {
+    intl: IntlService;
+    get controller(): SayController;
+    get documentLanguage(): string;
+    get translations(): {
+        placeholder: string;
+    };
     get node(): PNode;
     get address(): Address | null;
     selectThisNode(): void;

package/components/variable-plugin/codelist/insert.d.ts

@@ -20,6 +20,7 @@ export default class CodelistInsertComponent extends Component<Args> {
     label?: string;
     selectedStyleValue: string;
     get controller(): SayController;
+    get documentLanguage(): string;
     get schema(): import("prosemirror-model").Schema<any, any>;
     get publisher(): string | undefined;
     get endpoint(): string;

package/components/{rdfa-date-plugin → variable-plugin/date}/date-time-picker.d.ts

@@ -4,7 +4,7 @@ type Args = {
     value?: Date;
     onChange: (date: Date) => void;
 };
-export default class RdfaDatePluginDateTimePicker extends Component<Args> {
+export default class DateTimePickerComponent extends Component<Args> {
     intl: Intl;
     date?: Date;
     get hours(): number | undefined;

package/components/{rdfa-date-plugin/card.d.ts → variable-plugin/date/edit.d.ts}

@@ -1,15 +1,15 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import { PNode } from '@lblod/ember-rdfa-editor';
-import { DateFormat, DateOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin';
-import { ValidationError } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/utils';
 import IntlService from 'ember-intl/services/intl';
 import { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import { DateFormat, DateOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables/date';
+import { ValidationError } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/date-helpers';
 type Args = {
     controller: SayController;
     options: DateOptions;
 };
-export default class RdfaDatePluginCardComponent extends Component<Args> {
+export default class DateEditComponent extends Component<Args> {
     intl: IntlService;
     helpModalOpen: boolean;
     tooltipOpen: boolean;

package/components/{rdfa-date-plugin → variable-plugin/date}/help-modal.d.ts

@@ -3,7 +3,7 @@ interface Args {
     modalOpen: boolean;
     closeModal: () => void;
 }
-export default class HelpModalComponent extends Component<Args> {
+export default class DateHelpComponent extends Component<Args> {
     exampleDate: Date;
     formatExample(format: string): string;
 }

package/components/variable-plugin/date/insert-variable.d.ts

@@ -0,0 +1,16 @@
+import Component from '@glimmer/component';
+import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
+type Args = {
+    controller: SayController;
+};
+export default class DateInsertVariableComponent extends Component<Args> {
+    intl: IntlService;
+    label?: string;
+    get controller(): SayController;
+    get schema(): import("prosemirror-model").Schema<any, any>;
+    get documentLanguage(): string;
+    updateLabel(event: InputEvent): void;
+    insert(): void;
+}
+export {};

package/components/variable-plugin/date/insert.d.ts

@@ -1,13 +1,14 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
 };
-export default class DateVariableInsertComponent extends Component<Args> {
-    label?: string;
+export default class DateInsertComponent extends Component<Args> {
+    intl: IntlService;
     get controller(): SayController;
     get schema(): import("prosemirror-model").Schema<any, any>;
-    updateLabel(event: InputEvent): void;
+    get documentLanguage(): string;
     insert(): void;
 }
 export {};

package/components/{rdfa-date-plugin/date.d.ts → variable-plugin/date/nodeview.d.ts}

@@ -1,5 +1,6 @@
 import Component from '@glimmer/component';
 import { DecorationSource, PNode, SayController, SayView } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 type Args = {
     getPos: () => number | undefined;
     node: PNode;
@@ -9,7 +10,10 @@ type Args = {
     selected: boolean;
     contentDecorations?: DecorationSource;
 };
-export default class VariableComponent extends Component<Args> {
+export default class DateNodeviewComponent extends Component<Args> {
+    intl: IntlService;
+    get controller(): SayController;
+    get documentLanguage(): string;
     onClick(): void;
     get humanReadableDate(): string;
 }

package/components/variable-plugin/location/insert.d.ts

@@ -13,6 +13,7 @@ export default class LocationInsertComponent extends Component<Args> {
     intl: IntlService;
     get controller(): SayController;
     get schema(): import("prosemirror-model").Schema<any, any>;
+    get documentLanguage(): string;
     get endpoint(): string;
     updateLabel(event: InputEvent): void;
     insert(): void;

package/components/variable-plugin/number/insert.d.ts

@@ -27,6 +27,7 @@ export default class NumberInsertComponent extends Component<Args> {
     }>;
     get controller(): SayController;
     get schema(): import("prosemirror-model").Schema<any, any>;
+    get documentLanguage(): string;
     get numberVariableError(): string;
     updateLabel(event: InputEvent): void;
     updateMinimumValue: (event: InputEvent) => void;

package/components/variable-plugin/number/nodeview.d.ts

@@ -16,6 +16,11 @@ export default class NumberNodeviewComponent extends Component<Args> {
     intl: intlService;
     cursorPositionKeyDown: number | null;
     focus(element: HTMLInputElement): void;
+    get controller(): SayController;
+    get documentLanguage(): string;
+    get translations(): {
+        placeholder: string;
+    };
     get node(): PNode;
     get formattedNumber(): string;
     get selected(): boolean;

package/components/variable-plugin/text/insert.d.ts

@@ -1,12 +1,15 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
 };
 export default class TextVariableInsertComponent extends Component<Args> {
+    intl: IntlService;
     label?: string;
     get controller(): SayController;
     get schema(): import("prosemirror-model").Schema<any, any>;
+    get documentLanguage(): string;
     updateLabel(event: InputEvent): void;
     insert(): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "12.1.0",
+  "version": "13.0.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -70,7 +70,8 @@
     "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@lblod/ember-rdfa-editor": "^5.3.0",
+    "@glint/template": "^1.1.0",
+    "@lblod/ember-rdfa-editor": "^6.1.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^3.1.0",
     "@tsconfig/ember": "^3.0.0",
@@ -111,12 +112,12 @@
     "broccoli-asset-rev": "^3.0.0",
     "changesets-release-it-plugin": "^0.1.1",
     "ember-cli": "~4.12.0",
-    "ember-cli-typescript": "^5.2.1",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sass": "^11.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
+    "ember-cli-typescript": "^5.2.1",
     "ember-data": "^4.12.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-functions-as-helper-polyfill": "^2.1.1",
@@ -149,11 +150,12 @@
   },
   "peerDependencies": {
     "@appuniversum/ember-appuniversum": "^2.4.2",
-    "@lblod/ember-rdfa-editor": "^5.3.0",
+    "@glint/template": "^1.1.0",
+    "@lblod/ember-rdfa-editor": "^6.0.0",
     "ember-concurrency": "^2.3.7",
+    "ember-data": "^3.28.0 || ^4.0.0",
     "ember-modifier": "^3.2.7",
-    "ember-source": "^3.28.0 || ^4.0.0",
-    "ember-data": "^3.28.0 || ^4.0.0"
+    "ember-source": "^3.28.0 || ^4.0.0"
   },
   "overrides": {
     "ember-intl": {

package/plugins/table-of-contents-plugin/utils/index.d.ts

@@ -1,4 +1,4 @@
-import { PNode } from '@lblod/ember-rdfa-editor';
+import { EditorState, PNode } from '@lblod/ember-rdfa-editor';
 export type OutlineEntry = {
     content: string;
     pos: number;
@@ -8,9 +8,10 @@ export declare function createTableOfContents(entries: OutlineEntry[]): [string,
 type Config = {
     nodeHierarchy: string[];
 }[];
-export declare function extractOutline({ node, pos, config, }: {
+export declare function extractOutline({ node, pos, config, state, }: {
     node: PNode;
     pos: number;
     config: Config;
+    state: EditorState;
 }): OutlineEntry[];
 export {};

package/plugins/{rdfa-date-plugin/nodes → variable-plugin/variables}/date.d.ts

@@ -1,3 +1,12 @@
-import { DateOptions } from '..';
+export type DateFormat = {
+    label?: string;
+    key: string;
+    dateFormat: string;
+    dateTimeFormat: string;
+};
+export type DateOptions = {
+    formats: DateFormat[];
+    allowCustomFormat: boolean;
+};
 export declare const date: (options: DateOptions) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
 export declare const dateView: (options: DateOptions) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("prosemirror-view").NodeViewConstructor;

package/plugins/variable-plugin/variables/index.d.ts

@@ -3,3 +3,4 @@ export * from './text';
 export * from './codelist';
 export * from './location';
 export * from './address';
+export * from './date';

package/translations/en-US.yaml

@@ -192,6 +192,7 @@ document-title-plugin:
 variable:
   number:
     placeholder: Insert number
+    label: number
     type-number: Type a number...
     error-not-integer: Only integers are allowed
     error-not-number: Only numbers are allowed
@@ -203,6 +204,15 @@ variable:
   codelist:
     single-select: Single selection
     multi-select: Multiple selection
+    label: codelist
+  location:
+    label: location
+  text:
+    label: text
+  date:
+    label: date
+  address:
+    label: address
 variable-plugin:
   insert-variable: Insert variable
   button: Insert
@@ -283,6 +293,7 @@ template-comments-plugin:
     remove: Remove template comment or example
     move-up: Move comment up
     move-down: Move comment down
+  heading: comment or example
 
 pagination:
   next: Next page

package/translations/nl-BE.yaml

@@ -203,6 +203,7 @@ table-of-contents-plugin:
 variable:
   number:
     placeholder: Voeg getal in
+    label: nummer
     type-number: typ een nummer...
     error-not-integer: Enkel gehele getallen zijn toegelaten
     error-not-number: Enkel getallen zijn toegelaten
@@ -214,6 +215,15 @@ variable:
   codelist:
     single-select: Enkelvoudige selectie
     multi-select: Meervoudige selectie
+    label: codelijst
+  location:
+    label: locatie
+  text:
+    label: tekst
+  date:
+    label: datum
+  address:
+    label: adres
 variable-plugin:
   insert-variable: Voeg variabele in
   button: Voeg in
@@ -287,6 +297,8 @@ template-comments-plugin:
     remove: Verwijder Toelichtings- of voorbeeldbepaling
     move-down: Toelichtings- of voorbeeldbepaling naar onder
     move-up: Toelichtings- of voorbeeldbepaling naar boven
+  heading: toelichtingsbepaling
+
 pagination:
   next: Volgende pagina
   previous: Vorige pagina

package/utils/translation.d.ts

@@ -0,0 +1,3 @@
+import type { EditorState } from '@lblod/ember-rdfa-editor';
+import { type TOptions } from 'ember-intl/services/intl';
+export declare const getTranslationFunction: (state: EditorState) => (key: string, fallback: string, options?: TOptions) => string;

package/addon/components/rdfa-date-plugin/insert.hbs

@@ -1,9 +0,0 @@
-<AuList::Item>
-  <AuButton
-    @icon="add"
-    @iconAlignment="left"
-    @skin="link"
-    {{on 'click' (fn this.insertDate true)}}>
-    {{t "date-plugin.insert.date"}}
-  </AuButton>
-</AuList::Item>

package/addon/components/rdfa-date-plugin/insert.ts

@@ -1,52 +0,0 @@
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { SayController } from '@lblod/ember-rdfa-editor';
-import { NodeSelection } from '@lblod/ember-rdfa-editor';
-import {
-  DateFormat,
-  DateOptions,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin';
-import { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
-
-type Args = {
-  controller: SayController;
-  options: DateOptions;
-};
-
-export default class RdfaDatePluginInsertComponent extends Component<Args> {
-  get controller() {
-    return this.args.controller;
-  }
-
-  get schema() {
-    return this.controller.schema;
-  }
-
-  get formats(): DateFormat[] {
-    return this.args.options.formats;
-  }
-
-  get defaultDateFormat(): Option<string> {
-    return this.formats[0].dateFormat;
-  }
-
-  @action
-  insertDate() {
-    this.controller.withTransaction((tr) => {
-      tr.replaceSelectionWith(
-        this.schema.node('date', {
-          onlyDate: true,
-          format: this.defaultDateFormat,
-          value: new Date().toISOString(),
-        }),
-      );
-      if (tr.selection.$anchor.nodeBefore) {
-        const resolvedPos = tr.doc.resolve(
-          tr.selection.anchor - tr.selection.$anchor.nodeBefore?.nodeSize,
-        );
-        tr.setSelection(new NodeSelection(resolvedPos));
-      }
-      return tr;
-    });
-  }
-}

package/addon/plugins/rdfa-date-plugin/index.ts

@@ -1,28 +0,0 @@
-export const defaultDateFormats: DateFormat[] = [
-  {
-    key: 'short',
-    dateFormat: 'dd/MM/yy',
-    dateTimeFormat: 'dd/MM/yy HH:mm',
-  },
-  {
-    key: 'long',
-    dateFormat: 'EEEE dd MMMM yyyy',
-    dateTimeFormat: 'PPPPp',
-  },
-];
-
-export type DateFormat = {
-  label?: string;
-  key: string;
-  dateFormat: string;
-  dateTimeFormat: string;
-};
-
-export type DateOptions = {
-  placeholder: {
-    insertDate: string;
-    insertDateTime: string;
-  };
-  formats: DateFormat[];
-  allowCustomFormat: boolean;
-};