Merge branch 'master' into production

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tui-editor",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "GFM  Markdown Wysiwyg Editor - Productive and Extensible",
   "keywords": [
     "toast",

src/js/extensions/chart/chart.js

@@ -51,7 +51,9 @@ const DEFAULT_CHART_OPTIONS = {
   minWidth: 0,
   maxWidth: Infinity,
   minHeight: 0,
-  maxHeight: Infinity
+  maxHeight: Infinity,
+  height: 'auto',
+  width: 'auto'
 };
 
 /**
@@ -334,8 +336,11 @@ function setDefaultOptions(chartOptions, extensionOptions, chartContainer) {
     const {
       width: containerWidth
     } = chartContainer.getBoundingClientRect();
-    width = isWidthUndefined ? containerWidth : width;
-    height = isHeightUndefined ? containerWidth : height;
+
+    width = isWidthUndefined ? extensionOptions.width : width;
+    height = isHeightUndefined ? extensionOptions.height : height;
+    width = width === 'auto' ? containerWidth : width;
+    height = height === 'auto' ? containerWidth : height;
   }
   width = Math.min(extensionOptions.maxWidth, width);
   height = Math.min(extensionOptions.maxHeight, height);
@@ -498,10 +503,12 @@ function _onMDPasteBefore(cm, {source, data: eventData}) {
  * chart plugin
  * @param {Editor} editor - editor
  * @param {Object} options - chart options
-  * @param {number} options.minWidth - minimum width
-  * @param {number} options.maxWidth - maximum width
-  * @param {number} options.minHeight - minimum height
-  * @param {number} options.maxHeight - maximum height
+  * @param {number} [options.minWidth=0] - minimum width
+  * @param {number} [options.maxWidth=0] - maximum width
+  * @param {number} [options.minHeight=Infinity] - minimum height
+  * @param {number} [options.maxHeight=Infinity] - maximum height
+  * @param {number|string} [options.width='auto'] - default height
+  * @param {number|string} [options.height='auto'] - default height
  * @ignore
  */
 function chartExtension(editor, options = {}) {

test/unit/extensions/chart.spec.js

@@ -421,12 +421,24 @@ describe('CodeBlockChart', () => {
       expect(chartOptions.chart.height).toBe(0);
     });
 
+    it('should respect default width/height', () =>{
+      let chartOptions = setDefaultOptions({
+      }, {
+        width: 300,
+        height: 400
+      }, container);
+      expect(chartOptions.chart.width).toBe(300);
+      expect(chartOptions.chart.height).toBe(400);
+    });
+
     it('should use width/height from codeblock', () =>{
       const extensionOptions = {
         minWidth: 300,
         minHeight: 400,
         maxWidth: 700,
-        maxHeight: 800
+        maxHeight: 800,
+        width: 400,
+        height: 500
       };
       let chartOptions = setDefaultOptions({
         chart: {