diff --git a/package.json b/package.json index 0f337003..3cc2d396 100644 --- a/package.json +++ b/package.json @@ -45,12 +45,12 @@ "LICENSE" ], "dependencies": { - "@types/quill": "1.3.10", + "@types/quill": "2.0.2", "@types/react": "*", "create-react-class": "^15.6.0", "lodash": "^4.17.4", "prop-types": "^15.5.10", - "quill": "^1.2.6", + "quill": "^2.0.0-dev.3", "react-dom-factories": "^1.0.0" }, "peerDependencies": { diff --git a/src/mixin.js b/src/mixin.js index 45629153..53979f5a 100644 --- a/src/mixin.js +++ b/src/mixin.js @@ -75,7 +75,7 @@ var QuillMixin = { var sel = editor.getSelection(); if (typeof value === 'string') { - editor.setContents(editor.clipboard.convert(value)); + editor.setContents(editor.clipboard.convert({html: value})); } else { editor.setContents(value); } diff --git a/yarn.lock b/yarn.lock index ff568aa2..2e5efcd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6,9 +6,13 @@ version "6.0.78" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470" -"@types/quill@*": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@types/quill/-/quill-1.3.3.tgz#06e08fb017d9493e3708c5c13fbb8bf33ad03d9e" +"@types/quill@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/quill/-/quill-2.0.2.tgz#38c8b03157ec95d83f557890039ecd650548d1a7" + integrity sha512-Jkv4xYj9Y+1juXTEh2FV5L1XaEHXBaSLZweGBtzqDvTbFNh0kWPxH2JHogGNC3pyOLY02HydZ5A6AA5BS0LCaQ== + dependencies: + parchment "^1.1.2" + quill-delta "^4.0.1" "@types/react@*": version "16.0.10" @@ -363,9 +367,10 @@ clone@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" -clone@~2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" +clone@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= code-point-at@^1.0.0: version "1.1.0" @@ -503,7 +508,7 @@ deep-eql@^2.0.1: dependencies: type-detect "^3.0.0" -deep-equal@^1.0.1, deep-equal@~1.0.1: +deep-equal@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" @@ -667,9 +672,10 @@ esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" -eventemitter3@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba" +eventemitter3@^3.1.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" + integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== events@^1.0.0: version "1.1.1" @@ -691,7 +697,12 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" -extend@^3.0.0, extend@~3.0.0, extend@~3.0.1: +extend@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extend@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" @@ -714,9 +725,10 @@ falafel@~1.2.0: isarray "0.0.1" object-keys "^1.0.6" -fast-diff@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.1.tgz#0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b" +fast-diff@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-levenshtein@~2.0.4: version "2.0.6" @@ -1643,9 +1655,15 @@ pako@~0.2.0: version "0.2.9" resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" -parchment@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/parchment/-/parchment-1.1.0.tgz#c79387a80fc4af4ba8947b94fc55a835f62850a5" +parchment@2.0.0-dev.0: + version "2.0.0-dev.0" + resolved "https://registry.yarnpkg.com/parchment/-/parchment-2.0.0-dev.0.tgz#b1e4724821ccd0b05b2d06541ba16bb9f18972e0" + integrity sha512-andCgmOy3jFa3GWfp1sPi+1u5Y6Seis6NmKyF1QdbZ3ozn3Evd/oidDqv2il4kZ/Bt/IBiWzqRaM/BVDIeO+Mg== + +parchment@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/parchment/-/parchment-1.1.4.tgz#aeded7ab938fe921d4c34bc339ce1168bc2ffde5" + integrity sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg== parse-glob@^3.0.4: version "3.0.4" @@ -1751,24 +1769,35 @@ querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -quill-delta@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-3.5.0.tgz#5b67e685da60c34eabed4449c416c74aab89157b" +quill-delta@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-4.1.0.tgz#f250bfc86eafb70aa07835c7e03777ef5a75da5d" + integrity sha512-GQi04cJRnGcUR3fN8ChjfJGdnCF297BVTb4kEgnlewiyu/PRnWZDchmiJoc9Whq+ZwHgbUbcVgrbGU/dQgOVFw== dependencies: deep-equal "^1.0.1" - extend "^3.0.0" - fast-diff "1.1.1" + extend "^3.0.2" + fast-diff "1.2.0" -quill@^1.2.6: - version "1.3.0" - resolved "https://registry.yarnpkg.com/quill/-/quill-1.3.0.tgz#1fa485dcd0f4c45925ed32158f50d8129ccab134" - dependencies: - clone "~2.1.1" - deep-equal "~1.0.1" - eventemitter3 "~2.0.3" - extend "~3.0.1" - parchment "1.1.0" - quill-delta "3.5.0" +quill-delta@^4.0.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-4.2.1.tgz#ad4f191cdf3be5079c5dc3991b9603a5cc0db69a" + integrity sha512-Y2nksOj6Q+4hizre8n0dml76vLNGK4/y86EoI1d7rv6EL1bx7DPDYRmqQMPu1UqFQO/uQuVHQ3fOmm4ZSzWrfA== + dependencies: + deep-equal "^1.0.1" + extend "^3.0.2" + fast-diff "1.2.0" + +quill@^2.0.0-dev.3: + version "2.0.0-dev.3" + resolved "https://registry.yarnpkg.com/quill/-/quill-2.0.0-dev.3.tgz#3fc0e6113b5d991ce5d662542ae0eb7ffbbaee66" + integrity sha512-FiHFpgaHaOyPjuywLBjrHal6RS1gWHoIO9dFUE2ll46Nb0xFDEulHdiFRTPPifrE1HUmAFXJIL3iJjukD+eUEQ== + dependencies: + clone "^2.1.2" + deep-equal "^1.0.1" + eventemitter3 "^3.1.0" + extend "^3.0.2" + parchment "2.0.0-dev.0" + quill-delta "4.1.0" randomatic@^1.1.3: version "1.1.6"