1.5.9: 添加保存快捷键回调 & quill升级到2.0.1

ludejun · May 2, 2024 · a573901 · a573901
1 parent 93084c4
commit a573901
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 1.5.9
 - 添加保存快捷键回调
+- quill升级到2.0.1
 
 ### 1.5.8
 - 更改quill.snow.css引入方式

diff --git a/dist/quill-react-commercial.min.css b/dist/quill-react-commercial.min.css
@@ -104,7 +104,7 @@ XCode style (c) Angel Garcia <angelgarcia.mail@gmail.com>
 }
 
 /*!
- * Quill Editor v2.0.0-rc.5
+ * Quill Editor v2.0.1
  * https://quilljs.com
  * Copyright (c) 2017-2024, Slab
  * Copyright (c) 2014, Jason Chen

diff --git a/dist/quill-react-commercial.min.js b/dist/quill-react-commercial.min.js
diff --git a/dist/quill-react-commercial.min.js.map b/dist/quill-react-commercial.min.js.map
diff --git a/example/app.js b/example/app.js
@@ -15,7 +15,7 @@ const App = () => {
   return (
     <div className="App">
       <RichTextEditor
-        i18n={'zh'}
+        i18n={'en'}
         readOnly={false}
         modules={{
           table: {},

diff --git a/example/compile/app.js b/example/compile/app.js
@@ -25,7 +25,7 @@ var App = function App() {
   return /*#__PURE__*/React.createElement("div", {
     className: "App"
   }, /*#__PURE__*/React.createElement(RichTextEditor, {
-    i18n: 'zh',
+    i18n: 'en',
     readOnly: false,
     modules: {
       table: {},
@@ -58,5 +58,4 @@ var App = function App() {
 };
 var domContainer = document.querySelector('#root');
 var root = ReactDOM.createRoot(domContainer);
-root.render( /*#__PURE__*/React.createElement(App, null));
-//# sourceMappingURL=app.js.map
+root.render( /*#__PURE__*/React.createElement(App, null));
diff --git a/example/compile/app.js.map b/example/compile/app.js.map
diff --git a/example/quill-react-commercial.min.css b/example/quill-react-commercial.min.css
@@ -104,7 +104,7 @@ XCode style (c) Angel Garcia <angelgarcia.mail@gmail.com>
 }
 
 /*!
- * Quill Editor v2.0.0-rc.5
+ * Quill Editor v2.0.1
  * https://quilljs.com
  * Copyright (c) 2017-2024, Slab
  * Copyright (c) 2014, Jason Chen

diff --git a/example/quill-react-commercial.min.js b/example/quill-react-commercial.min.js
diff --git a/lib/index.css b/lib/index.css
@@ -104,7 +104,7 @@ XCode style (c) Angel Garcia <angelgarcia.mail@gmail.com>
 }
 
 /*!
- * Quill Editor v2.0.0-rc.5
+ * Quill Editor v2.0.1
  * https://quilljs.com
  * Copyright (c) 2017-2024, Slab
  * Copyright (c) 2014, Jason Chen

diff --git a/lib/index.js b/lib/index.js
@@ -26225,7 +26225,7 @@ class Quill {
   };
   static events = Emitter.events;
   static sources = Emitter.sources;
-  static version = "2.0.0-rc.5";
+  static version = "2.0.1";
   static imports = {
     delta: Delta$3,
     parchment: Parchment$1,
@@ -26663,13 +26663,17 @@ function expandConfig(containerOrSelector, options) {
     modules: themeModuleDefaults,
     ...themeDefaults
   } = theme.DEFAULTS;
-  const modules = merge({}, expandModuleConfig(quillModuleDefaults), expandModuleConfig(themeModuleDefaults), expandModuleConfig(options.modules));
+  let userModuleOptions = expandModuleConfig(options.modules);
   // Special case toolbar shorthand
-  if (modules != null && modules.toolbar && modules.toolbar.constructor !== Object) {
-    modules.toolbar = {
-      container: modules.toolbar
+  if (userModuleOptions != null && userModuleOptions.toolbar && userModuleOptions.toolbar.constructor !== Object) {
+    userModuleOptions = {
+      ...userModuleOptions,
+      toolbar: {
+        container: userModuleOptions.toolbar
+      }
     };
   }
+  const modules = merge({}, expandModuleConfig(quillModuleDefaults), expandModuleConfig(themeModuleDefaults), userModuleOptions);
   const config = {
     ...quillDefaults,
     ...omitUndefinedValuesFromOptions(themeDefaults),
@@ -30125,6 +30129,10 @@ const directionRightToLeftIcon = "<svg viewbox=\"0 0 18 18\"><polygon class=\"ql
 const formulaIcon = "<svg viewbox=\"0 0 18 18\"><path class=\"ql-fill\" d=\"M11.759,2.482a2.561,2.561,0,0,0-3.53.607A7.656,7.656,0,0,0,6.8,6.2C6.109,9.188,5.275,14.677,4.15,14.927a1.545,1.545,0,0,0-1.3-.933A0.922,0.922,0,0,0,2,15.036S1.954,16,4.119,16s3.091-2.691,3.7-5.553c0.177-.826.36-1.726,0.554-2.6L8.775,6.2c0.381-1.421.807-2.521,1.306-2.676a1.014,1.014,0,0,0,1.02.56A0.966,0.966,0,0,0,11.759,2.482Z\"/><rect class=\"ql-fill\" height=\"1.6\" rx=\"0.8\" ry=\"0.8\" width=\"5\" x=\"5.15\" y=\"6.2\"/><path class=\"ql-fill\" d=\"M13.663,12.027a1.662,1.662,0,0,1,.266-0.276q0.193,0.069.456,0.138a2.1,2.1,0,0,0,.535.069,1.075,1.075,0,0,0,.767-0.3,1.044,1.044,0,0,0,.314-0.8,0.84,0.84,0,0,0-.238-0.619,0.8,0.8,0,0,0-.594-0.239,1.154,1.154,0,0,0-.781.3,4.607,4.607,0,0,0-.781,1q-0.091.15-.218,0.346l-0.246.38c-0.068-.288-0.137-0.582-0.212-0.885-0.459-1.847-2.494-.984-2.941-0.8-0.482.2-.353,0.647-0.094,0.529a0.869,0.869,0,0,1,1.281.585c0.217,0.751.377,1.436,0.527,2.038a5.688,5.688,0,0,1-.362.467,2.69,2.69,0,0,1-.264.271q-0.221-.08-0.471-0.147a2.029,2.029,0,0,0-.522-0.066,1.079,1.079,0,0,0-.768.3A1.058,1.058,0,0,0,9,15.131a0.82,0.82,0,0,0,.832.852,1.134,1.134,0,0,0,.787-0.3,5.11,5.11,0,0,0,.776-0.993q0.141-.219.215-0.34c0.046-.076.122-0.194,0.223-0.346a2.786,2.786,0,0,0,.918,1.726,2.582,2.582,0,0,0,2.376-.185c0.317-.181.212-0.565,0-0.494A0.807,0.807,0,0,1,14.176,15a5.159,5.159,0,0,1-.913-2.446l0,0Q13.487,12.24,13.663,12.027Z\"/></svg>";
 const headerIcon = "<svg viewBox=\"0 0 18 18\"><path class=\"ql-fill\" d=\"M10,4V14a1,1,0,0,1-2,0V10H3v4a1,1,0,0,1-2,0V4A1,1,0,0,1,3,4V8H8V4a1,1,0,0,1,2,0Zm6.06787,9.209H14.98975V7.59863a.54085.54085,0,0,0-.605-.60547h-.62744a1.01119,1.01119,0,0,0-.748.29688L11.645,8.56641a.5435.5435,0,0,0-.022.8584l.28613.30762a.53861.53861,0,0,0,.84717.0332l.09912-.08789a1.2137,1.2137,0,0,0,.2417-.35254h.02246s-.01123.30859-.01123.60547V13.209H12.041a.54085.54085,0,0,0-.605.60547v.43945a.54085.54085,0,0,0,.605.60547h4.02686a.54085.54085,0,0,0,.605-.60547v-.43945A.54085.54085,0,0,0,16.06787,13.209Z\"/></svg>";
 const header2Icon = "<svg viewBox=\"0 0 18 18\"><path class=\"ql-fill\" d=\"M16.73975,13.81445v.43945a.54085.54085,0,0,1-.605.60547H11.855a.58392.58392,0,0,1-.64893-.60547V14.0127c0-2.90527,3.39941-3.42187,3.39941-4.55469a.77675.77675,0,0,0-.84717-.78125,1.17684,1.17684,0,0,0-.83594.38477c-.2749.26367-.561.374-.85791.13184l-.4292-.34082c-.30811-.24219-.38525-.51758-.1543-.81445a2.97155,2.97155,0,0,1,2.45361-1.17676,2.45393,2.45393,0,0,1,2.68408,2.40918c0,2.45312-3.1792,2.92676-3.27832,3.93848h2.79443A.54085.54085,0,0,1,16.73975,13.81445ZM9,3A.99974.99974,0,0,0,8,4V8H3V4A1,1,0,0,0,1,4V14a1,1,0,0,0,2,0V10H8v4a1,1,0,0,0,2,0V4A.99974.99974,0,0,0,9,3Z\"/></svg>";
+const header3Icon = "<svg viewBox=\"0 0 18 18\"><path class=\"ql-fill\" d=\"M16.65186,12.30664a2.6742,2.6742,0,0,1-2.915,2.68457,3.96592,3.96592,0,0,1-2.25537-.6709.56007.56007,0,0,1-.13232-.83594L11.64648,13c.209-.34082.48389-.36328.82471-.1543a2.32654,2.32654,0,0,0,1.12256.33008c.71484,0,1.12207-.35156,1.12207-.78125,0-.61523-.61621-.86816-1.46338-.86816H13.2085a.65159.65159,0,0,1-.68213-.41895l-.05518-.10937a.67114.67114,0,0,1,.14307-.78125l.71533-.86914a8.55289,8.55289,0,0,1,.68213-.7373V8.58887a3.93913,3.93913,0,0,1-.748.05469H11.9873a.54085.54085,0,0,1-.605-.60547V7.59863a.54085.54085,0,0,1,.605-.60547h3.75146a.53773.53773,0,0,1,.60547.59375v.17676a1.03723,1.03723,0,0,1-.27539.748L14.74854,10.0293A2.31132,2.31132,0,0,1,16.65186,12.30664ZM9,3A.99974.99974,0,0,0,8,4V8H3V4A1,1,0,0,0,1,4V14a1,1,0,0,0,2,0V10H8v4a1,1,0,0,0,2,0V4A.99974.99974,0,0,0,9,3Z\"/></svg>";
+const header4Icon = "<svg viewBox=\"0 0 18 18\"><path class=\"ql-fill\" d=\"M10,4V14a1,1,0,0,1-2,0V10H3v4a1,1,0,0,1-2,0V4A1,1,0,0,1,3,4V8H8V4a1,1,0,0,1,2,0Zm7.05371,7.96582v.38477c0,.39648-.165.60547-.46191.60547h-.47314v1.29785a.54085.54085,0,0,1-.605.60547h-.69336a.54085.54085,0,0,1-.605-.60547V12.95605H11.333a.5412.5412,0,0,1-.60547-.60547v-.15332a1.199,1.199,0,0,1,.22021-.748l2.56348-4.05957a.7819.7819,0,0,1,.72607-.39648h1.27637a.54085.54085,0,0,1,.605.60547v3.7627h.33008A.54055.54055,0,0,1,17.05371,11.96582ZM14.28125,8.7207h-.022a4.18969,4.18969,0,0,1-.38525.81348l-1.188,1.80469v.02246h1.5293V9.60059A7.04058,7.04058,0,0,1,14.28125,8.7207Z\"/></svg>";
+const header5Icon = "<svg viewBox=\"0 0 18 18\"><path class=\"ql-fill\" d=\"M16.74023,12.18555a2.75131,2.75131,0,0,1-2.91553,2.80566,3.908,3.908,0,0,1-2.25537-.68164.54809.54809,0,0,1-.13184-.8252L11.73438,13c.209-.34082.48389-.36328.8252-.1543a2.23757,2.23757,0,0,0,1.1001.33008,1.01827,1.01827,0,0,0,1.1001-.96777c0-.61621-.53906-.97949-1.25439-.97949a2.15554,2.15554,0,0,0-.64893.09961,1.15209,1.15209,0,0,1-.814.01074l-.12109-.04395a.64116.64116,0,0,1-.45117-.71484l.231-3.00391a.56666.56666,0,0,1,.62744-.583H15.541a.54085.54085,0,0,1,.605.60547v.43945a.54085.54085,0,0,1-.605.60547H13.41748l-.04395.72559a1.29306,1.29306,0,0,1-.04395.30859h.022a2.39776,2.39776,0,0,1,.57227-.07715A2.53266,2.53266,0,0,1,16.74023,12.18555ZM9,3A.99974.99974,0,0,0,8,4V8H3V4A1,1,0,0,0,1,4V14a1,1,0,0,0,2,0V10H8v4a1,1,0,0,0,2,0V4A.99974.99974,0,0,0,9,3Z\"/></svg>";
+const header6Icon = "<svg viewBox=\"0 0 18 18\"><path class=\"ql-fill\" d=\"M14.51758,9.64453a1.85627,1.85627,0,0,0-1.24316.38477H13.252a1.73532,1.73532,0,0,1,1.72754-1.4082,2.66491,2.66491,0,0,1,.5498.06641c.35254.05469.57227.01074.70508-.40723l.16406-.5166a.53393.53393,0,0,0-.373-.75977,4.83723,4.83723,0,0,0-1.17773-.14258c-2.43164,0-3.7627,2.17773-3.7627,4.43359,0,2.47559,1.60645,3.69629,3.19043,3.69629A2.70585,2.70585,0,0,0,16.96,12.19727,2.43861,2.43861,0,0,0,14.51758,9.64453Zm-.23047,3.58691c-.67187,0-1.22168-.81445-1.22168-1.45215,0-.47363.30762-.583.72559-.583.96875,0,1.27734.59375,1.27734,1.12207A.82182.82182,0,0,1,14.28711,13.23145ZM10,4V14a1,1,0,0,1-2,0V10H3v4a1,1,0,0,1-2,0V4A1,1,0,0,1,3,4V8H8V4a1,1,0,0,1,2,0Z\"/></svg>";
 const italicIcon = "<svg viewbox=\"0 0 18 18\"><line class=\"ql-stroke\" x1=\"7\" x2=\"13\" y1=\"4\" y2=\"4\"/><line class=\"ql-stroke\" x1=\"5\" x2=\"11\" y1=\"14\" y2=\"14\"/><line class=\"ql-stroke\" x1=\"8\" x2=\"10\" y1=\"14\" y2=\"4\"/></svg>";
 const imageIcon = "<svg viewbox=\"0 0 18 18\"><rect class=\"ql-stroke\" height=\"10\" width=\"12\" x=\"3\" y=\"4\"/><circle class=\"ql-fill\" cx=\"6\" cy=\"7\" r=\"1\"/><polyline class=\"ql-even ql-fill\" points=\"5 12 5 11 7 9 8 10 11 7 13 9 13 12 5 12\"/></svg>";
 const indentIcon = "<svg viewbox=\"0 0 18 18\"><line class=\"ql-stroke\" x1=\"3\" x2=\"15\" y1=\"14\" y2=\"14\"/><line class=\"ql-stroke\" x1=\"3\" x2=\"15\" y1=\"4\" y2=\"4\"/><line class=\"ql-stroke\" x1=\"9\" x2=\"15\" y1=\"9\" y2=\"9\"/><polyline class=\"ql-fill ql-stroke\" points=\"3 7 3 11 5 9 3 7\"/></svg>";
@@ -30160,7 +30168,11 @@ var Icons = {
   formula: formulaIcon,
   header: {
     '1': headerIcon,
-    '2': header2Icon
+    '2': header2Icon,
+    '3': header3Icon,
+    '4': header4Icon,
+    '5': header5Icon,
+    '6': header6Icon
   },
   italic: italicIcon,
   image: imageIcon,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quill-react-commercial",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "A Quill component for React and more maturely.",
   "type": "module",
   "main": "lib/index.js",
@@ -21,7 +21,7 @@
   "dependencies": {
     "highlight.js": "^10.7.2",
     "normalize-url": "^8.0.0",
-    "quill": "2.0.0-rc.5"
+    "quill": "2.0.1"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

diff --git a/readme.md b/readme.md
@@ -10,7 +10,7 @@ As an outstanding and popular open-source rich text editor, [Quill](https://gith
 
 ## Features
 
-- Use the latest quill@2.0.0-rc.5. Implement using React Hooks, TS support, and Rollup packaging.
+- Use the latest quill@2.0.1. Implement using React Hooks, TS support, and Rollup packaging.
 - Images support local upload and image Url insertion, and can limit the format and size before.
 - All images support Base64 display, and can be uploaded remotely in the background. If fail, can click to upload again. Images support copying and dragging to insertion.
 - Image support for resizing, aligning, adding notes, deleting, scrolling to remove overlayer.

diff --git a/readme_CN.md b/readme_CN.md
@@ -10,7 +10,7 @@ Quill作为很出众并流行的开源富文本编辑器，有着良好的数据
 
 
 ## 特性
-- 使用最新的quill@2.0.0-rc.5，方便向后兼容。使用React Hooks实现，TS支持，Rollup打包。
+- 使用最新的quill@2.0.1，方便向后兼容。使用React Hooks实现，TS支持，Rollup打包。
 
 - 图片支持本地上传和图片Url插入，可以限制上传图片格式和大小