npm - @dso-toolkit/core - Versions diffs - 84.1.0 → 85.0.0 - Mend

@dso-toolkit/core 84.1.0 → 85.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (628) hide show

package/dist/components/ozon-content.js CHANGED Viewed

@@ -147,8 +147,8 @@ class OzonContentBronNode {
     constructor() {
         this.name = "Bron";
     }
-    render(node, { mapNodeToJsx }) {
-        return h("span", { class: "dso-ozon-bron" }, mapNodeToJsx(node.childNodes));
+    render(node, { mapNodeToJsx }, ignoreMark) {
+        return h("span", { class: "dso-ozon-bron" }, mapNodeToJsx(node.childNodes, ignoreMark));
     }
 }
@@ -629,15 +629,15 @@ class OzonContentFallbackNode {
         // This name does not match any elements
         this.name = ["<fallback>"];
     }
-    render(node, { mapNodeToJsx }) {
-        return h("span", { class: `fallback od-${getNodeName(node)}` }, mapNodeToJsx(node.childNodes));
+    render(node, { mapNodeToJsx }, ignoreMark) {
+        return h("span", { class: `fallback od-${getNodeName(node)}` }, mapNodeToJsx(node.childNodes, ignoreMark));
     }
 }
-const Bijschrift = ({ bijschrift, bron, mapNodeToJsx }) => {
+const Bijschrift = ({ bijschrift, bron, mapNodeToJsx, ignoreMark }) => {
     var _a;
     const bronText = bron && ((_a = bron.textContent) === null || _a === void 0 ? void 0 : _a.trim());
-    return (h("span", { class: "figuur-bijschrift" }, bijschrift && bijschrift.inhoud && mapNodeToJsx(bijschrift.inhoud), bronText && (h(Fragment, null, `${bijschrift ? " " : ""}(bron: `, mapNodeToJsx(bron), ")"))));
+    return (h("span", { class: "figuur-bijschrift" }, bijschrift && bijschrift.inhoud && mapNodeToJsx(bijschrift.inhoud, ignoreMark), bronText && (h(Fragment, null, `${bijschrift ? " " : ""}(bron: `, mapNodeToJsx(bron, ignoreMark), ")"))));
 };
 class OzonContentFiguurNode {
     constructor() {
@@ -689,7 +689,7 @@ class OzonContentFiguurNode {
                 }
                 : undefined;
             const src = urlResolver && illustratie.naam ? urlResolver("Illustratie", "naam", illustratie.naam, node) : illustratie.naam;
-            return (h("div", { class: `dso-ozon-figuur ${bijschrift ? `bijschrift-${bijschrift.locatie}` : "onder"}`, style: this.getStyle(illustratie) }, titel && h("span", { class: "figuur-titel" }, mapNodeToJsx(titel)), (bijschrift === null || bijschrift === void 0 ? void 0 : bijschrift.locatie) === "boven" && (h(Bijschrift, { bijschrift: bijschrift, bron: bron, mapNodeToJsx: mapNodeToJsx })), h("dso-image-overlay", { wijzigactie: wijzigactie }, titel && (h("div", { slot: "titel" }, h("span", null, mapNodeToJsx(titel)))), h("img", { src: src !== null && src !== void 0 ? src : undefined, alt: (_d = (_c = (_b = illustratie.alt) !== null && _b !== void 0 ? _b : titel === null || titel === void 0 ? void 0 : titel.textContent) !== null && _c !== void 0 ? _c : illustratie.naam) !== null && _d !== void 0 ? _d : undefined }), (bijschrift || bron) && (h("div", { slot: "bijschrift" }, h(Bijschrift, { bijschrift: bijschrift, bron: bron, mapNodeToJsx: mapNodeToJsx })))), ((bijschrift === null || bijschrift === void 0 ? void 0 : bijschrift.locatie) === "onder" || (!bijschrift && bron)) && (h(Bijschrift, { bijschrift: bijschrift, bron: bron, mapNodeToJsx: mapNodeToJsx }))));
+            return (h("div", { class: `dso-ozon-figuur ${bijschrift ? `bijschrift-${bijschrift.locatie}` : "onder"}`, style: this.getStyle(illustratie) }, titel && h("span", { class: "figuur-titel" }, mapNodeToJsx(titel)), (bijschrift === null || bijschrift === void 0 ? void 0 : bijschrift.locatie) === "boven" && (h(Bijschrift, { bijschrift: bijschrift, bron: bron, mapNodeToJsx: mapNodeToJsx })), h("dso-image-overlay", { wijzigactie: wijzigactie }, titel && (h("div", { slot: "titel" }, h("span", null, mapNodeToJsx(titel, true)))), h("img", { src: src !== null && src !== void 0 ? src : undefined, alt: (_d = (_c = (_b = illustratie.alt) !== null && _b !== void 0 ? _b : titel === null || titel === void 0 ? void 0 : titel.textContent) !== null && _c !== void 0 ? _c : illustratie.naam) !== null && _d !== void 0 ? _d : undefined }), (bijschrift || bron) && (h("div", { slot: "bijschrift" }, h(Bijschrift, { bijschrift: bijschrift, bron: bron, mapNodeToJsx: mapNodeToJsx, ignoreMark: true })))), ((bijschrift === null || bijschrift === void 0 ? void 0 : bijschrift.locatie) === "onder" || (!bijschrift && bron)) && (h(Bijschrift, { bijschrift: bijschrift, bron: bron, mapNodeToJsx: mapNodeToJsx }))));
         }
     }
 }
@@ -1006,8 +1006,8 @@ class OzonContentTextNode {
     constructor() {
         this.name = "#text";
     }
-    render({ textContent }, { mark, emitMarkItemHighlight }) {
-        if (!mark || !textContent) {
+    render({ textContent }, { mark, emitMarkItemHighlight }, ignoreMark) {
+        if (ignoreMark || !mark || !textContent) {
             return h(Fragment, null, textContent);
         }
         return h(MarkText, { mark: mark, text: textContent, emitMarkItemHighlight: emitMarkItemHighlight });
@@ -1067,13 +1067,13 @@ class Mapper {
             return m.name === name;
         })) !== null && _a !== void 0 ? _a : this.fallbackNode);
     }
-    mapNodeToJsx(node, context, path) {
+    mapNodeToJsx(node, context, path, ignoreMark) {
         var _a;
         if (node instanceof NodeList) {
-            return h(Fragment, null, Array.from(node).map((n) => this.mapNodeToJsx(n, context, path)));
+            return h(Fragment, null, Array.from(node).map((n) => this.mapNodeToJsx(n, context, path, ignoreMark)));
         }
         if (Array.isArray(node)) {
-            return h(Fragment, null, node.map((n) => this.mapNodeToJsx(n, context, path)));
+            return h(Fragment, null, node.map((n) => this.mapNodeToJsx(n, context, path, ignoreMark)));
         }
         const nodeName = getNodeName(node);
         const mapper = this.findMapper(nodeName);
@@ -1086,7 +1086,7 @@ class Mapper {
         return mapper.render(node, {
             inline: context.inline,
             mark: context.mark,
-            mapNodeToJsx: (n) => this.mapNodeToJsx(n, context, [...path, node]),
+            mapNodeToJsx: (n, m) => this.mapNodeToJsx(n, context, [...path, node], m),
             emitClick: context.emitClick,
             setState,
             emitMarkItemHighlight: context.emitMarkItemHighlight,
@@ -1095,7 +1095,7 @@ class Mapper {
             urlResolver: context.urlResolver,
             begripResolver: context.begripResolver,
             annotated: context.annotated,
-        });
+        }, ignoreMark);
     }
     transform(input, context) {
         if (!input) {
@@ -1169,10 +1169,6 @@ label.dso-primary {
   background-color: var(--_dso-button-primary-background-color, #39870c);
   border-color: var(--_dso-button-primary-border-color, #39870c);
   color: var(--_dso-button-primary-color, #fff);
-}
-a.dso-primary,
-button.dso-primary,
-label.dso-primary {
   border-width: 1px;
   border-style: solid;
   border-radius: 4px;
@@ -1374,10 +1370,6 @@ label.dso-secondary {
   background-color: var(--_dso-button-secondary-background-color, #fff);
   border-color: var(--_dso-button-secondary-border-color, #39870c);
   color: var(--_dso-button-secondary-color, #39870c);
-}
-a.dso-secondary,
-button.dso-secondary,
-label.dso-secondary {
   border-width: 1px;
   border-style: solid;
   border-radius: 4px;
@@ -1813,10 +1805,6 @@ label.dso-map {
   background-color: var(--_dso-button-secondary-background-color, #fff);
   border-color: var(--_dso-button-secondary-border-color, #39870c);
   color: var(--_dso-button-secondary-color, #39870c);
-}
-a.dso-map,
-button.dso-map,
-label.dso-map {
   border-width: 1px;
   border-style: solid;
   border-radius: 4px;
@@ -2823,12 +2811,6 @@ table.editaction-add {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #e4f1d4;
   color: #191919;
-}
-p.editaction-add,
-span[role=paragraph].editaction-add,
-.dso-ozon-lijst.editaction-add,
-.dso-ozon-lijst > ul > li.editaction-add,
-table.editaction-add {
   box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.5);
   --_dso-ozon-content-toggletip-color: colors.$zwart;
 }
@@ -2884,12 +2866,6 @@ table.editaction-remove {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #f5d8dc;
   color: #191919;
-}
-p.editaction-remove,
-span[role=paragraph].editaction-remove,
-.dso-ozon-lijst.editaction-remove,
-.dso-ozon-lijst > ul > li.editaction-remove,
-table.editaction-remove {
   --_dso-ozon-content-toggletip-color: colors.$zwart;
   text-decoration: line-through;
   --_dso-ozon-content-toggletip-text-decoration: underline line-through;
@@ -2935,8 +2911,6 @@ ins.new-text {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #e4f1d4;
   color: #191919;
-}
-ins.new-text {
   box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.5);
   --_dso-ozon-content-toggletip-color: colors.$zwart;
 }
@@ -2944,8 +2918,6 @@ ins.editaction-add {
   display: inline-block;
   margin-block-end: 8px;
   padding: 8px;
-}
-ins.editaction-add {
   --_dso-alert-success-border-color: #39870c;
   --_dso-alert-error-border-color: #ce3f51;
   --_dso-alert-info-border-color: #6ca4d9;
@@ -2973,8 +2945,6 @@ ins.editaction-add {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #e4f1d4;
   color: #191919;
-}
-ins.editaction-add {
   box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.5);
   --_dso-ozon-content-toggletip-color: colors.$zwart;
 }
@@ -3010,8 +2980,6 @@ del.removed-text {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #f5d8dc;
   color: #191919;
-}
-del.removed-text {
   --_dso-ozon-content-toggletip-color: colors.$zwart;
   text-decoration: line-through;
   --_dso-ozon-content-toggletip-text-decoration: underline line-through;
@@ -3025,8 +2993,6 @@ del.editaction-remove {
   display: inline-block;
   margin-block-end: 8px;
   padding: 8px;
-}
-del.editaction-remove {
   --_dso-alert-success-border-color: #39870c;
   --_dso-alert-error-border-color: #ce3f51;
   --_dso-alert-info-border-color: #6ca4d9;
@@ -3054,8 +3020,6 @@ del.editaction-remove {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #f5d8dc;
   color: #191919;
-}
-del.editaction-remove {
   --_dso-ozon-content-toggletip-color: colors.$zwart;
   text-decoration: line-through;
   --_dso-ozon-content-toggletip-text-decoration: underline line-through;
@@ -3156,8 +3120,6 @@ del.editaction-remove p:last-child {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #f5d8dc;
   color: #191919;
-}
-.subtitel:has(del:not(.removed-text)) {
   --_dso-ozon-content-toggletip-color: colors.$zwart;
   text-decoration: line-through;
   --_dso-ozon-content-toggletip-text-decoration: underline line-through;
@@ -3169,8 +3131,6 @@ del.editaction-remove p:last-child {
 }
 .subtitel:has(ins:not(.new-text)) {
   text-decoration: none;
-}
-.subtitel:has(ins:not(.new-text)) {
   --_dso-alert-success-border-color: #39870c;
   --_dso-alert-error-border-color: #ce3f51;
   --_dso-alert-info-border-color: #6ca4d9;
@@ -3198,8 +3158,6 @@ del.editaction-remove p:last-child {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #e4f1d4;
   color: #191919;
-}
-.subtitel:has(ins:not(.new-text)) {
   box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.5);
   --_dso-ozon-content-toggletip-color: colors.$zwart;
 }
@@ -3236,8 +3194,6 @@ td.editaction-remove {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #f5d8dc;
   color: #191919;
-}
-td.editaction-remove {
   --_dso-ozon-content-toggletip-color: colors.$zwart;
   text-decoration: line-through;
   --_dso-ozon-content-toggletip-text-decoration: underline line-through;
@@ -3275,8 +3231,6 @@ td.editaction-add {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #e4f1d4;
   color: #191919;
-}
-td.editaction-add {
   box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.5);
   --_dso-ozon-content-toggletip-color: colors.$zwart;
 }
@@ -3309,8 +3263,6 @@ td.editaction-add {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #e4f1d4;
   color: #191919;
-}
-.begrippenlijst .editaction-add {
   box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.5);
   --_dso-ozon-content-toggletip-color: colors.$zwart;
 }
@@ -3342,8 +3294,6 @@ td.editaction-add {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #f5d8dc;
   color: #191919;
-}
-.begrippenlijst .editaction-remove {
   --_dso-ozon-content-toggletip-color: colors.$zwart;
   text-decoration: line-through;
   --_dso-ozon-content-toggletip-text-decoration: underline line-through;
@@ -3370,8 +3320,6 @@ td.editaction-add {
 .kop ins {
   text-decoration: none;
-}
-.kop ins {
   --_dso-alert-success-border-color: #39870c;
   --_dso-alert-error-border-color: #ce3f51;
   --_dso-alert-info-border-color: #6ca4d9;
@@ -3399,8 +3347,6 @@ td.editaction-add {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #e4f1d4;
   color: #191919;
-}
-.kop ins {
   box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.5);
   --_dso-ozon-content-toggletip-color: colors.$zwart;
 }
@@ -3432,8 +3378,6 @@ td.editaction-add {
   --_dso-icon-button-tertiary-disabled-color: #999;
   background-color: #f5d8dc;
   color: #191919;
-}
-.kop del {
   --_dso-ozon-content-toggletip-color: colors.$zwart;
   text-decoration: line-through;
   --_dso-ozon-content-toggletip-text-decoration: underline line-through;