Merge pull request #988 from deckgo/inline-editor-list

peterpeterparker · web-flow · commit d3f8cc4b4664 · 2020-10-29T13:18:17.000+01:00
fix: inline editor style all list
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,7 +41,7 @@
 - demo: v2.0.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/demo/CHANGELOG.md))
 - drag-resize-rotate: v2.0.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md))
 - highlight-code: v2.1.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md))
-- inline-editor: v3.0.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/inline-editor/CHANGELOG.md))
+- inline-editor: v3.0.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/inline-editor/CHANGELOG.md))
 - lazy-img: v2.0.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/lazy-img/CHANGELOG.md))
 - math: v2.0.3 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/math/CHANGELOG.md))
 - qrcode: v2.0.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/qrcode/CHANGELOG.md))
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -21,7 +21,7 @@
     "@deckdeckgo/demo": "^2.0.1",
     "@deckdeckgo/drag-resize-rotate": "^2.0.1",
     "@deckdeckgo/highlight-code": "^2.1.1",
-    "@deckdeckgo/inline-editor": "^3.0.1",
+    "@deckdeckgo/inline-editor": "^3.0.2",
     "@deckdeckgo/lazy-img": "^2.0.1",
     "@deckdeckgo/math": "^2.0.3",
     "@deckdeckgo/qrcode": "^2.0.1",
diff --git a/studio/package-lock.json b/studio/package-lock.json
diff --git a/studio/package.json b/studio/package.json
@@ -25,7 +25,7 @@
     "@deckdeckgo/demo": "^2.0.1",
     "@deckdeckgo/drag-resize-rotate": "^2.0.1",
     "@deckdeckgo/highlight-code": "^2.1.1",
-    "@deckdeckgo/inline-editor": "^3.0.1",
+    "@deckdeckgo/inline-editor": "^3.0.2",
     "@deckdeckgo/lazy-img": "^2.0.1",
     "@deckdeckgo/math": "^2.0.3",
     "@deckdeckgo/qrcode": "^2.0.1",
diff --git a/webcomponents/inline-editor/CHANGELOG.md b/webcomponents/inline-editor/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 3.0.2 (2020-10-29)
+
+### Fix
+
+- apply style if all list is selected
+
 # 3.0.1 (2020-10-23)
 
 ### Fix
diff --git a/webcomponents/inline-editor/package-lock.json b/webcomponents/inline-editor/package-lock.json
diff --git a/webcomponents/inline-editor/package.json b/webcomponents/inline-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deckdeckgo/inline-editor",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "A WYSIWYG HTML Inline Editor Web Component",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
diff --git a/webcomponents/inline-editor/src/index.html b/webcomponents/inline-editor/src/index.html
@@ -11,6 +11,11 @@
   <body style="overflow: hidden">
     <p contenteditable>Bet on the Web</p>
 
+    <ul contenteditable="true">
+      <li>lksandsk</li>
+      <li>sadflkmdsklm</li>
+    </ul>
+
     <h2 contenteditable>Environment variables with StencilJS</h2>
 
     <div>
@@ -34,7 +39,7 @@ <h3 contenteditable>Credits</h3>
 
     <p contenteditable><img style="width: 100px" src="https://deckdeckgo.com/assets/favicon/android-chrome-512x512.png" /></p>
 
-    <deckgo-inline-editor sticky-mobile="true" containers="h1,h2,h3,h4,h5,h6,p" img-editable="true" custom-actions="my-inline-action">
+    <deckgo-inline-editor sticky-mobile="true" containers="h1,h2,h3,h4,h5,h6,p,ol,ul" img-editable="true" custom-actions="my-inline-action">
       <span style="color: red" slot="my-inline-action">My</span>
     </deckgo-inline-editor>
 
diff --git a/webcomponents/inline-editor/src/utils/execcommand-style.utils.tsx b/webcomponents/inline-editor/src/utils/execcommand-style.utils.tsx
@@ -32,6 +32,12 @@ async function updateSelection(container: HTMLElement, action: ExecCommandStyle,
 async function replaceSelection(container: HTMLElement, action: ExecCommandStyle, selection: Selection, containers: string) {
   const range: Range = selection.getRangeAt(0);
 
+  // User selected a all list?
+  if (range.commonAncestorContainer && ['ol', 'ul', 'dl'].some((listType) => listType === range.commonAncestorContainer.nodeName.toLowerCase())) {
+    await updateSelection(range.commonAncestorContainer as HTMLElement, action, containers);
+    return;
+  }
+
   const fragment: DocumentFragment = range.extractContents();
 
   const span: HTMLSpanElement = await createSpan(container, action, containers);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@deckdeckgo/inline-editor",`
`3`		`- "version": "3.0.1",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"description": "A WYSIWYG HTML Inline Editor Web Component",`
`5`	`5`	`"main": "dist/index.cjs.js",`
`6`	`6`	`"module": "dist/index.js",`