Merge pull request #234 from kommitters/v2.0

Release v2.0.24

.github/workflows/ci.yml

@@ -6,15 +6,15 @@ on:
       - 'v*.[0-9]'
   pull_request:
 
-permissions:  # added using https://github.com/step-security/secure-workflows
+permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@03bee3930647ebbf994244c21ddbc0d4933aab4f # v2.3.0
+        uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
         with:
           disable-sudo: true
           egress-policy: block

.github/workflows/codeql.yml

@@ -41,14 +41,15 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@03bee3930647ebbf994244c21ddbc0d4933aab4f # v2.3.0
+        uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
         with:
           disable-sudo: true
           egress-policy: block
           allowed-endpoints: >
-            api.github.com:443
+            *.github.com:443
             github.com:443
-            objects.githubusercontent.com:443
+            *.githubapp.com:443
+            *.githubusercontent.com:443
 
       - name: Checkout repository
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@03bee3930647ebbf994244c21ddbc0d4933aab4f # v2.3.0
+        uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
         with:
           disable-sudo: true
           egress-policy: block

.github/workflows/scorecards.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@03bee3930647ebbf994244c21ddbc0d4933aab4f # v2.3.0
+        uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
         with:
           disable-sudo: true
           egress-policy: block
@@ -34,7 +34,8 @@ jobs:
             fulcio.sigstore.dev:443
             github.com:443
             rekor.sigstore.dev:443
-            sigstore-tuf-root.storage.googleapis.com:443
+            bestpractices.dev:443
+            *.storage.googleapis.com:443
 
       - name: "Checkout code"
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.0.24 (17.10.2023)
+
+- Fix bug [#227](https://github.com/kommitters/editorjs-undo/issues/227) - Fix unexpected behavior when there are line breaks.
+- Fix bug [#202](https://github.com/kommitters/editorjs-undo/issues/202) - Solve undo with custom blocks.
+- Update [#225](https://github.com/kommitters/editorjs-undo/pull/225) - Update codeql.yml and scorecards.yml allowed-endpoints.
+
 ## 2.0.23 (15.09.2023)
 
 - Fix bug [#213](https://github.com/kommitters/editorjs-undo/issues/213) - Add support to different keyboard distributions.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "editorjs-undo",
-  "version": "2.0.23",
+  "version": "2.0.24",
   "keywords": [
     "undo",
     "redo",

src/index.js

@@ -31,7 +31,7 @@ export default class Undo {
 
     const { blocks, caret } = editor;
     const { configuration } = editor;
-    const { holder } = configuration;
+    const { holder, defaultBlock } = configuration;
     const defaultShortcuts = defaultOptions.config.shortcuts;
     const { shortcuts: configShortcuts } = config;
     const shortcuts = { ...defaultShortcuts, ...configShortcuts };
@@ -43,6 +43,7 @@ export default class Undo {
     this.holder =
       typeof holder === "string" ? document.getElementById(holder) : holder;
     this.editor = editor;
+    this.defaultBlock = defaultBlock;
     this.blocks = blocks;
     this.caret = caret;
     this.shouldSaveHistory = true;
@@ -104,7 +105,7 @@ export default class Undo {
   clear() {
     this.stack = this.initialItem
       ? [this.initialItem]
-      : [{ index: 0, state: [{ type: "paragraph", data: { text: "" } }] }];
+      : [{ index: 0, state: [{ type: this.defaultBlock, data: {} }] }];
     this.position = 0;
     this.onUpdate();
   }
@@ -271,14 +272,14 @@ export default class Undo {
       if (this.blockWasDeleted(state, nextState)) {
         this.insertDeletedBlock(state, nextState, index);
       } else if (this.blockWasSkipped(index, nextIndex, state, nextState)) {
-        this.blocks.delete();
+        this.blocks.delete(nextIndex);
         this.caret.setToBlock(index, "end");
       } else if (blockCount > state.length) {
         this.blocks
           .render({ blocks: state })
           .then(() => {
-            this.editor.blocks.insert("paragraph", {text: ""})
-            this.caret.setToLastBlock("end") ;
+            this.editor.blocks.insert(this.defaultBlock, {});
+            this.setCaretIndex(index, caretIndex);
           });
       } else if (this.blockWasDropped(state, nextState)) {
         this.blocks

test/fixtures/editor.js

@@ -17,7 +17,9 @@ const editor = {
   caret: {
     setToBlock() {},
   },
-  configuration: {},
+  configuration: {
+    defaultBlock: 'paragraph',
+  },
 };
 
 const readOnlyEditor = {

test/undo.test.js

@@ -64,7 +64,7 @@ describe('Undo', () => {
       undo = new Undo({ editor });
     });
 
-    const intialStackData = { index: 0, state: [{ type: 'paragraph', data: { text: '' } }] };
+    const intialStackData = { index: 0, state: [{ type: 'paragraph', data: {} }] };
 
     it('is unable to perform an undo operation in an empty stack', () => {
       expect(undo.canUndo()).toBe(false);