Bugfixes

Author: larswaechter

projects/markular/src/lib/markular.component.spec.ts

@@ -38,13 +38,43 @@ describe('Markular', () => {
       expect(component._val).toBe('# Hello');
     });
 
+    it('should insert H1 when subselect', () => {
+      component._val = 'Hello';
+      component.selStart = 2;
+      component.selEnd = 3;
+      component.toggleHeading(1);
+      expect(component._val).toBe('He# llo');
+    });
+
+    it('should insert H1 when none selected', () => {
+      component._val = 'Hello';
+      component.selStart = 3;
+      component.selEnd = 3;
+      component.toggleHeading(1);
+      expect(component._val).toBe('# Hello');
+    });
+
     it('should be H1', () => {
       component._val = '# Hello';
       component.selStart = 0;
       component.selEnd = 7;
       expect(component.isHeading(1)).toBeTruthy();
     });
 
+    it('should be H1 when none selected', () => {
+      component._val = '# Hello';
+      component.selStart = 5;
+      component.selEnd = 5;
+      expect(component.isHeading(1)).toBeTruthy();
+    });
+
+    it('should not be H1 when subselect', () => {
+      component._val = '# Hello';
+      component.selStart = 3;
+      component.selEnd = 5;
+      expect(component.isHeading(1)).toBeFalsy();
+    });
+
     it('should remove H1', () => {
       component._val = '# Hello';
       component.selStart = 0;
@@ -136,6 +166,22 @@ describe('Markular', () => {
       expect(component._val).toBe('- Hello');
     });
 
+    it('should insert ul when subselect', () => {
+      component._val = 'Hello';
+      component.selStart = 2;
+      component.selEnd = 3;
+      component.toggleUnorderedList();
+      expect(component._val).toBe('He- llo');
+    });
+
+    it('should insert ul when none selected', () => {
+      component._val = 'Hello';
+      component.selStart = 3;
+      component.selEnd = 3;
+      component.toggleUnorderedList();
+      expect(component._val).toBe('- Hello');
+    });
+
     it('should insert ul multiline', () => {
       component._val = 'Hello\nWorld';
       component.selStart = 0;
@@ -151,13 +197,27 @@ describe('Markular', () => {
       expect(component.isUnorderedList()).toBeTruthy();
     });
 
+    it('should be ul none selected', () => {
+      component._val = '- Hello';
+      component.selStart = 6;
+      component.selEnd = 6;
+      expect(component.isUnorderedList()).toBeTruthy();
+    });
+
     it('should be ul multiline', () => {
       component._val = '- Hello\n- World';
       component.selStart = 0;
       component.selEnd = 11;
       expect(component.isUnorderedList()).toBeTruthy();
     });
 
+    it('should not be ul when subselect', () => {
+      component._val = '- Hello';
+      component.selStart = 4;
+      component.selEnd = 6;
+      expect(component.isUnorderedList()).toBeFalsy();
+    });
+
     it('should remove ul', () => {
       component._val = '- Hello';
       component.selStart = 0;
@@ -208,6 +268,22 @@ describe('Markular', () => {
       expect(component._val).toBe('1. Hello');
     });
 
+    it('should insert ol when subselect', () => {
+      component._val = 'Hello';
+      component.selStart = 2;
+      component.selEnd = 3;
+      component.toggleOrderedList();
+      expect(component._val).toBe('He1. llo');
+    });
+
+    it('should insert ol when none selected', () => {
+      component._val = 'Hello';
+      component.selStart = 3;
+      component.selEnd = 3;
+      component.toggleOrderedList();
+      expect(component._val).toBe('1. Hello');
+    });
+
     it('should insert ol multiline', () => {
       component._val = 'Hello\nWorld';
       component.selStart = 0;
@@ -223,13 +299,27 @@ describe('Markular', () => {
       expect(component.isOrderedList()).toBeTruthy();
     });
 
+    it('should be ol none selected', () => {
+      component._val = '1. Hello';
+      component.selStart = 6;
+      component.selEnd = 6;
+      expect(component.isOrderedList()).toBeTruthy();
+    });
+
     it('should be ol multiline', () => {
       component._val = '1. Hello\n2. World';
       component.selStart = 0;
       component.selEnd = 13;
       expect(component.isOrderedList()).toBeTruthy();
     });
 
+    it('should not be ol when subselect', () => {
+      component._val = '1. Hello';
+      component.selStart = 4;
+      component.selEnd = 6;
+      expect(component.isOrderedList()).toBeFalsy();
+    });
+
     it('should remove ol', () => {
       component._val = '1. Hello';
       component.selStart = 0;

projects/markular/src/lib/markular.component.ts

@@ -9,7 +9,7 @@ import {
   input,
   InputSignal,
   output,
-  ViewChild,
+  ViewChild
 } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { marked } from 'marked';
@@ -79,6 +79,28 @@ export class Markular implements AfterViewInit, ControlValueAccessor {
     return this._val.slice(this.selStart, this.selEnd) || '';
   }
 
+  private get currentLine(): string {
+    const lines = this.lines;
+    if (lines.currentLineIdx >= 0) {
+      return (
+        this._val.slice(
+          lines.lines[lines.currentLineIdx].from,
+          lines.lines[lines.currentLineIdx].to,
+        ) || ''
+      );
+    }
+
+    return '';
+  }
+
+  private get selectionOrCurrentLine(): string {
+    if (this.isNoneSelected()) {
+      return this.currentLine;
+    }
+
+    return this.selection;
+  }
+
   private get lines() {
     const lines = this._val.split('\n');
     const lineRanges = [];
@@ -221,7 +243,7 @@ export class Markular implements AfterViewInit, ControlValueAccessor {
 
   isHeading(size: number): boolean {
     const regex = new RegExp(`^#{${size}}(?!#)`);
-    return regex.test(this.selection);
+    return regex.test(this.selectionOrCurrentLine);
   }
 
   toggleHeading(size: number) {
@@ -268,7 +290,9 @@ export class Markular implements AfterViewInit, ControlValueAccessor {
   }
 
   isUnorderedList(): boolean {
-    return this.selection.split('\n').every((line) => /^-(?!-)/.test(line.trimStart()));
+    return this.selectionOrCurrentLine
+      .split('\n')
+      .every((line) => /^-(?!-)/.test(line.trimStart()));
   }
 
   toggleUnorderedList() {
@@ -296,7 +320,7 @@ export class Markular implements AfterViewInit, ControlValueAccessor {
   }
 
   isOrderedList(): boolean {
-    return this.selection.split('\n').every((line) => /^\d+\./.test(line.trimStart()));
+    return this.selectionOrCurrentLine.split('\n').every((line) => /^\d+\./.test(line.trimStart()));
   }
 
   toggleOrderedList() {