@internetstiftelsen/styleguide 2.21.11 → 2.21.12

package/dist/atoms/textarea/rich-text.js

@@ -137,7 +137,7 @@ function createToolbar(el, editor) {
 function getHTML(editor) {
 	var html = editor.getHTML();
 
-	return html.replace(/<li><p>/g, '<li>').replace(/<\/p><\/li>/g, '</li>');
+	return html;
 }
 
 function setupTextArea(el) {
@@ -158,6 +158,7 @@ function setupTextArea(el) {
 		},
 		onUpdate: function onUpdate(props) {
 			var html = getHTML(props.editor);
+			console.log(html);
 			el.value = html;
 			onChange(html);
 		}

package/dist/molecules/modal/modal.js

@@ -218,7 +218,7 @@ function display() {
  * Dispatch the next modal in queue.
  */
 function dispatch() {
-	if (active || !queue.length) {
+	if (!modal || active || !queue.length) {
 		return;
 	}
 
@@ -298,6 +298,10 @@ function createModal() {
 	document.body.appendChild(modal);
 
 	modalClose.addEventListener('click', close);
+
+	setTimeout(function () {
+		dispatch();
+	}, 1);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@internetstiftelsen/styleguide",
-	"version": "2.21.11",
+	"version": "2.21.12",
 	"main": "dist/components.js",
 	"ports": {
 		"fractal": "3000"

package/src/atoms/textarea/rich-text.js

@@ -131,9 +131,7 @@ function createToolbar(el, editor) {
 function getHTML(editor) {
 	const html = editor.getHTML();
 
-	return html
-		.replace(/<li><p>/g, '<li>')
-		.replace(/<\/p><\/li>/g, '</li>');
+	return html;
 }
 
 export function setupTextArea(el, onChange = () => {}) {
@@ -155,6 +153,7 @@ export function setupTextArea(el, onChange = () => {}) {
 		},
 		onUpdate(props) {
 			const html = getHTML(props.editor);
+			console.log(html);
 			el.value = html;
 			onChange(html);
 		},

package/src/molecules/modal/modal.js

@@ -195,7 +195,7 @@ function display() {
  * Dispatch the next modal in queue.
  */
 function dispatch() {
-	if (active || !queue.length) {
+	if (!modal || active || !queue.length) {
 		return;
 	}
 
@@ -286,6 +286,10 @@ function createModal() {
 	document.body.appendChild(modal);
 
 	modalClose.addEventListener('click', close);
+
+	setTimeout(() => {
+		dispatch();
+	}, 1);
 }
 
 /**