@progress/kendo-angular-editor 4.0.0-next.202204121114 → 4.1.0-dev.202205251353

package/common/font-size-item.interface.d.ts

@@ -10,10 +10,10 @@ export interface FontSizeItem {
      * The value of the [`font-size`](https://developer.mozilla.org/en-US/docs/Web/CSS/font-size) CSS property.
      * @example
      * ```ts-no-run
-     * '4'
+     * '4px'
      * ```
      */
-    size: number;
+    size: number | string;
     /**
      * The text for the font size that will be displayed in the drop-down list.
      * @example

package/common/styles.d.ts

@@ -9,7 +9,7 @@ export declare const defaultStyle = "\n    html, body {\n        margin: 0;\n
 /**
  * @hidden
  */
-export declare const tablesStyles = "\n.ProseMirror .tableWrapper {\n    overflow-x: auto;\n    margin: 1em 0;\n}\n\n.ProseMirror table {\n    margin: 0;\n    border-collapse: collapse;\n    table-layout: fixed;\n    width: 100%;\n    overflow: hidden;\n}\n\n.ProseMirror td, .ProseMirror th {\n    min-width: 1em;\n    border: 1px solid #ddd;\n    padding: 3px 5px;\n    vertical-align: top;\n    box-sizing: border-box;\n    position: relative;\n}\n\n.ProseMirror th {\n    font-weight: bold;\n    text-align: left;\n}\n\n.ProseMirror .column-resize-handle {\n    position: absolute;\n    right: -2px; top: 0; bottom: 0;\n    width: 4px;\n    z-index: 20;\n    background-color: #adf;\n    pointer-events: none;\n}\n\n.ProseMirror.resize-cursor {\n    cursor: ew-resize;\n    cursor: col-resize;\n}\n\n/* Give selected cells a blue overlay */\n.ProseMirror .selectedCell:after {\n    z-index: 2;\n    position: absolute;\n    content: \"\";\n    left: 0; right: 0; top: 0; bottom: 0;\n    background: rgba(200, 200, 255, 0.4);\n    pointer-events: none;\n}\n";
+export declare const tablesStyles = "\n    .ProseMirror .tableWrapper {\n        overflow-x: auto;\n        margin: 1em 0;\n    }\n\n    .ProseMirror table {\n        margin: 0;\n        border-collapse: collapse;\n        table-layout: fixed;\n        width: 100%;\n        overflow: hidden;\n    }\n\n    .ProseMirror td, .ProseMirror th {\n        min-width: 1em;\n        border: 1px solid #ddd;\n        padding: 3px 5px;\n        vertical-align: top;\n        box-sizing: border-box;\n        position: relative;\n    }\n\n    .ProseMirror th {\n        font-weight: bold;\n        text-align: left;\n    }\n\n    .ProseMirror .column-resize-handle {\n        position: absolute;\n        right: -2px; top: 0; bottom: 0;\n        width: 4px;\n        z-index: 20;\n        background-color: #adf;\n        pointer-events: none;\n    }\n\n    .ProseMirror.resize-cursor {\n        cursor: ew-resize;\n        cursor: col-resize;\n    }\n\n    /* Give selected cells a blue overlay */\n    .ProseMirror .selectedCell:after {\n        z-index: 2;\n        position: absolute;\n        content: \"\";\n        left: 0; right: 0; top: 0; bottom: 0;\n        background: rgba(200, 200, 255, 0.4);\n        pointer-events: none;\n    }\n\n    /* Resizing */\n    .k-editor-resize-wrap-element {\n        display: inline-block;\n        position: relative;\n    }\n\n    .ProseMirror .row-resize-handle {\n        position: absolute;\n        right: 0; left: 0; bottom: 0;\n        transform: translate(0, 50%);\n        height: 4px;\n        z-index: 20;\n        background-color: #adf;\n        pointer-events: none;\n    }\n    \n    .ProseMirror.resize-cursor-vertical {\n        cursor: sn-resize;\n        cursor: row-resize;\n    }\n\n    .k-editor-resize-wrap-element table td p,\n    .k-editor-resize-wrap-element table th p {\n        margin: 0 auto;\n    }\n";
 /**
  * @hidden
  */

package/editor.component.d.ts

@@ -134,6 +134,7 @@ export declare class EditorComponent implements AfterViewInit, ControlValueAcces
      */
     stateChange: BehaviorSubject<any>;
     get toolbar(): ToolBarComponent;
+    get toolbarElement(): ElementRef;
     /**
      * Returns the ProseMirror [EditorView](https://prosemirror.net/docs/ref/#view.EditorView) object
      * that manages the DOM structure that represents an editable document.

package/esm2015/common/styles.js

@@ -200,56 +200,82 @@ export const defaultStyle = `
  * @hidden
  */
 export const tablesStyles = `
-.ProseMirror .tableWrapper {
-    overflow-x: auto;
-    margin: 1em 0;
-}
-
-.ProseMirror table {
-    margin: 0;
-    border-collapse: collapse;
-    table-layout: fixed;
-    width: 100%;
-    overflow: hidden;
-}
-
-.ProseMirror td, .ProseMirror th {
-    min-width: 1em;
-    border: 1px solid #ddd;
-    padding: 3px 5px;
-    vertical-align: top;
-    box-sizing: border-box;
-    position: relative;
-}
-
-.ProseMirror th {
-    font-weight: bold;
-    text-align: left;
-}
-
-.ProseMirror .column-resize-handle {
-    position: absolute;
-    right: -2px; top: 0; bottom: 0;
-    width: 4px;
-    z-index: 20;
-    background-color: #adf;
-    pointer-events: none;
-}
-
-.ProseMirror.resize-cursor {
-    cursor: ew-resize;
-    cursor: col-resize;
-}
-
-/* Give selected cells a blue overlay */
-.ProseMirror .selectedCell:after {
-    z-index: 2;
-    position: absolute;
-    content: "";
-    left: 0; right: 0; top: 0; bottom: 0;
-    background: rgba(200, 200, 255, 0.4);
-    pointer-events: none;
-}
+    .ProseMirror .tableWrapper {
+        overflow-x: auto;
+        margin: 1em 0;
+    }
+
+    .ProseMirror table {
+        margin: 0;
+        border-collapse: collapse;
+        table-layout: fixed;
+        width: 100%;
+        overflow: hidden;
+    }
+
+    .ProseMirror td, .ProseMirror th {
+        min-width: 1em;
+        border: 1px solid #ddd;
+        padding: 3px 5px;
+        vertical-align: top;
+        box-sizing: border-box;
+        position: relative;
+    }
+
+    .ProseMirror th {
+        font-weight: bold;
+        text-align: left;
+    }
+
+    .ProseMirror .column-resize-handle {
+        position: absolute;
+        right: -2px; top: 0; bottom: 0;
+        width: 4px;
+        z-index: 20;
+        background-color: #adf;
+        pointer-events: none;
+    }
+
+    .ProseMirror.resize-cursor {
+        cursor: ew-resize;
+        cursor: col-resize;
+    }
+
+    /* Give selected cells a blue overlay */
+    .ProseMirror .selectedCell:after {
+        z-index: 2;
+        position: absolute;
+        content: "";
+        left: 0; right: 0; top: 0; bottom: 0;
+        background: rgba(200, 200, 255, 0.4);
+        pointer-events: none;
+    }
+
+    /* Resizing */
+    .k-editor-resize-wrap-element {
+        display: inline-block;
+        position: relative;
+    }
+
+    .ProseMirror .row-resize-handle {
+        position: absolute;
+        right: 0; left: 0; bottom: 0;
+        transform: translate(0, 50%);
+        height: 4px;
+        z-index: 20;
+        background-color: #adf;
+        pointer-events: none;
+    }
+    
+    .ProseMirror.resize-cursor-vertical {
+        cursor: sn-resize;
+        cursor: row-resize;
+    }
+
+    .k-editor-resize-wrap-element table td p,
+    .k-editor-resize-wrap-element table th p {
+        margin: 0 auto;
+    }
 `;
 /**
  * @hidden

package/esm2015/config/commands.js

@@ -12,7 +12,7 @@ const inlineCommand = {
     cleanFormatting: (options) => cleanFormatting(options),
     createLink: attrs => expandToWordWrap(applyLink, { mark: 'link', attrs: attrs.value, applyToWord: attrs.applyToWord }),
     fontFamily: attrs => expandToWordWrap(applyInlineStyle, { style: 'font-family', value: attrs.value, applyToWord: attrs.applyToWord }),
-    fontSize: attrs => expandToWordWrap(applyInlineStyle, { style: 'font-size', value: attrs.value + 'px', applyToWord: attrs.applyToWord }),
+    fontSize: attrs => expandToWordWrap(applyInlineStyle, { style: 'font-size', value: attrs.value, applyToWord: attrs.applyToWord }),
     insertFile: attrs => expandToWordWrap(applyLink, { mark: 'link', attrs: attrs, applyToWord: attrs.applyToWord }),
     insertText: text => insertText(text),
     italic: (applyToWord) => expandToWordWrap(toggleInlineFormat, Object.assign(Object.assign({}, italic), { applyToWord })),

package/esm2015/editor.component.js

@@ -8,7 +8,7 @@ import { BehaviorSubject, fromEvent, Subject, zip } from 'rxjs';
 import { map, filter, take } from 'rxjs/operators';
 import { ToolBarComponent } from '@progress/kendo-angular-toolbar';
 import { hasObservers, isDocumentAvailable, KendoInput } from '@progress/kendo-angular-common';
-import { buildKeymap, buildListKeymap, getHtml, pasteCleanup, sanitize, removeComments, sanitizeClassAttr, sanitizeStyleAttr, removeAttribute, placeholder, EditorView, EditorState, baseKeymap, keymap, history, parseContent, Plugin, PluginKey, TextSelection, Schema, AllSelection, gapCursor, getSelectionText, imageResizing, tableEditing, caretColor } from '@progress/kendo-editor-common';
+import { buildKeymap, buildListKeymap, getHtml, pasteCleanup, sanitize, removeComments, sanitizeClassAttr, sanitizeStyleAttr, removeAttribute, placeholder, EditorView, EditorState, baseKeymap, keymap, history, parseContent, Plugin, PluginKey, TextSelection, Schema, AllSelection, gapCursor, getSelectionText, imageResizing, tableEditing, caretColor, tableResizing } from '@progress/kendo-editor-common';
 import { validatePackage } from '@progress/kendo-licensing';
 import { packageMetadata } from './package-metadata';
 import { schema } from './config/schema';
@@ -201,7 +201,7 @@ export class EditorComponent {
         this.onChangeCallback = (value) => {
             this.changeValue(value);
         };
-        this.onTouchedCallback = (_) => { }; // tslint:disable-line:no-empty
+        this.onTouchedCallback = (_) => { };
         this.onPaste = (_view, nativeEvent) => {
             this._pasteEvent = nativeEvent;
             return false;
@@ -382,6 +382,9 @@ export class EditorComponent {
     get toolbar() {
         return this.defaultToolbarComponent || this.userToolBarComponent;
     }
+    get toolbarElement() {
+        return this.defaultToolbar || this.userToolBarElement;
+    }
     /**
      * Returns the ProseMirror [EditorView](https://prosemirror.net/docs/ref/#view.EditorView) object
      * that manages the DOM structure that represents an editable document.
@@ -402,6 +405,7 @@ export class EditorComponent {
         this.subs.add(this.toolsService.needsCheck.subscribe(() => this.cdr.markForCheck()));
     }
     ngAfterViewInit() {
+        var _a;
         this.afterViewInit.next();
         if (!this.iframe) {
             this.contentAreaLoaded.next();
@@ -409,6 +413,13 @@ export class EditorComponent {
         if (this.resizable) {
             this.normalizeSize();
         }
+        // address edge cases for responsive toolbar tools
+        // calculations - https://github.com/telerik/kendo-angular/issues/3661
+        if ((_a = this.toolbar) === null || _a === void 0 ? void 0 : _a.resizable) {
+            this.ngZone.runOutsideAngular(() => {
+                setTimeout(() => this.toolbar.onResize(), 70);
+            });
+        }
     }
     ngOnChanges(changes) {
         if (changes.value && this.view) {
@@ -659,6 +670,7 @@ export class EditorComponent {
             keymap(baseKeymap),
             gapCursor(),
             imageResizing(),
+            ...tableResizing(),
             tableEditing(),
             caretColor()
         ];
@@ -740,7 +752,7 @@ export class EditorComponent {
         }));
         this.subs.add(fromEvent(this.viewMountElement, 'keyup')
             .pipe(map((e) => e.keyCode), filter((code) => code === 121), // F10
-        map(() => this.userToolBarElement || this.defaultToolbar))
+        map(() => this.toolbarElement))
             .subscribe((toolbar) => toolbar.nativeElement.focus()));
         this.subs.add(fromEvent(this.viewMountElement, 'blur')
             .pipe(filter((event) => !this.viewMountElement.contains(event.relatedTarget)))
@@ -819,7 +831,7 @@ EditorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", versio
             provide: KendoInput,
             useExisting: forwardRef(() => EditorComponent)
         }
-    ], queries: [{ propertyName: "userToolBarComponent", first: true, predicate: ToolBarComponent, descendants: true }, { propertyName: "userToolBarElement", first: true, predicate: ToolBarComponent, descendants: true, read: ElementRef }], viewQueries: [{ propertyName: "dialogContainer", first: true, predicate: ["dialogsContainer"], descendants: true, read: ViewContainerRef, static: true }, { propertyName: "container", first: true, predicate: ["content"], descendants: true, read: ViewContainerRef }, { propertyName: "defaultToolbar", first: true, predicate: ["defaultToolbar"], descendants: true, read: ElementRef }, { propertyName: "defaultToolbarComponent", first: true, predicate: ["defaultToolbar"], descendants: true, read: ToolBarComponent }], usesOnChanges: true, ngImport: i0, template: `
+    ], queries: [{ propertyName: "userToolBarComponent", first: true, predicate: ToolBarComponent, descendants: true }, { propertyName: "userToolBarElement", first: true, predicate: ToolBarComponent, descendants: true, read: ElementRef }], viewQueries: [{ propertyName: "dialogContainer", first: true, predicate: ["dialogsContainer"], descendants: true, read: ViewContainerRef }, { propertyName: "container", first: true, predicate: ["content"], descendants: true, read: ViewContainerRef }, { propertyName: "defaultToolbar", first: true, predicate: ["defaultToolbar"], descendants: true, read: ElementRef }, { propertyName: "defaultToolbarComponent", first: true, predicate: ["defaultToolbar"], descendants: true, read: ToolBarComponent }], usesOnChanges: true, ngImport: i0, template: `
         <ng-container
             kendoEditorLocalizedMessages
             i18n-alignCenter="kendo.editor.alignCenter|The title of the tool that aligns text in the center."
@@ -930,7 +942,6 @@ EditorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", versio
             deleteTable="Delete table"
         >
         </ng-container>
-
         <ng-content select="kendo-toolbar"></ng-content>
         <kendo-toolbar [overflow]="true" [tabindex]="readonly ? -1 : 0" *ngIf="!userToolBarElement" #defaultToolbar>
             <kendo-toolbar-buttongroup>
@@ -1103,7 +1114,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImpo
             deleteTable="Delete table"
         >
         </ng-container>
-
         <ng-content select="kendo-toolbar"></ng-content>
         <kendo-toolbar [overflow]="true" [tabindex]="readonly ? -1 : 0" *ngIf="!userToolBarElement" #defaultToolbar>
             <kendo-toolbar-buttongroup>
@@ -1224,16 +1234,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImpo
                 args: ['style.maxHeight']
             }], userToolBarComponent: [{
                 type: ContentChild,
-                args: [ToolBarComponent, { static: false }]
+                args: [ToolBarComponent]
             }], userToolBarElement: [{
                 type: ContentChild,
-                args: [ToolBarComponent, { read: ElementRef, static: false }]
+                args: [ToolBarComponent, { read: ElementRef }]
             }], dialogContainer: [{
                 type: ViewChild,
-                args: ['dialogsContainer', { read: ViewContainerRef, static: true }]
+                args: ['dialogsContainer', { read: ViewContainerRef }]
             }], container: [{
                 type: ViewChild,
-                args: ['content', { read: ViewContainerRef, static: false }]
+                args: ['content', { read: ViewContainerRef }]
             }], defaultToolbar: [{
                 type: ViewChild,
                 args: ['defaultToolbar', { read: ElementRef, static: false }]

package/esm2015/package-metadata.js

@@ -9,7 +9,7 @@ export const packageMetadata = {
     name: '@progress/kendo-angular-editor',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1649761501,
+    publishDate: 1653486755,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
 };

package/esm2015/tools/fontsize/editor-fontsize.component.js

@@ -38,21 +38,31 @@ export class EditorFontSizeComponent extends ToolBarToolComponent {
          */
         this.valueChange = new EventEmitter();
         this._data = [
-            { text: '8px', size: 8 },
-            { text: '10px', size: 10 },
-            { text: '12px', size: 12 },
-            { text: '14px', size: 14 },
-            { text: '18px', size: 18 },
-            { text: '24px', size: 24 },
-            { text: '36px', size: 36 }
+            { text: '8px', size: '8px' },
+            { text: '10px', size: '10px' },
+            { text: '12px', size: '12px' },
+            { text: '14px', size: '14px' },
+            { text: '18px', size: '18px' },
+            { text: '24px', size: '24px' },
+            { text: '36px', size: '36px' }
         ];
         this.editor = providerService.editor;
     }
     /**
      * Overrides the default font size list.
+     * Numeric values are treated as pixels.
      */
     set data(sizes) {
-        this._data = sizes || this._data;
+        let normalizedSizes;
+        if (sizes) {
+            normalizedSizes = sizes.map(s => {
+                if (typeof s.size === 'number') {
+                    return Object.assign(Object.assign({}, s), { size: `${s.size}px` });
+                }
+                return s;
+            });
+        }
+        this._data = normalizedSizes || this._data;
     }
     get data() {
         return this._data;
@@ -73,7 +83,7 @@ export class EditorFontSizeComponent extends ToolBarToolComponent {
         this.subs = this.editor.stateChange.subscribe(({ style }) => {
             // remove units(px, em, rem...)
             // string#match returns array
-            this.value = (getUniqueStyleValues(style.selected, 'font-size').match(/\d+/g) || [null])[0];
+            this.value = getUniqueStyleValues(style.selected, 'font-size') || null;
             this.disabled = style.disabled;
         });
     }
@@ -84,7 +94,7 @@ export class EditorFontSizeComponent extends ToolBarToolComponent {
         if (isPresent(ev)) {
             this.editor.exec('fontSize', ev);
             this.editor.view.focus();
-            this.valueChange.emit(this.data.find(d => d.size === parseInt(ev, 10)));
+            this.valueChange.emit(this.data.find(d => d.size === ev));
         }
     }
     ngOnDestroy() {