Skip to content

GitLab

Commit 073acecc authored by Яков's avatar Яков
Browse files

Панель: записи и pdf-кнопки в списки

parent 14cb6b4e
Show whitespace changes
Inline Side-by-side
package.json
View file @ 073acecc
......@@ -101,6 +101,7 @@
"levenary": "^1.1.1",
"prosemirror-state": "^1.4.3",
"rc-upload": "^4.3.3",
"react-ag-qeditor": "git+https://gitlab.atma.company/lib/react-ag-qeditor.git#tiptap",
"react-device-detect": "^2.2.3",
"react-media-recorder": "^1.6.6",
"react-stopwatch": "^2.0.4",
......
src/components/ToolBar.js
View file @ 073acecc
......@@ -67,7 +67,10 @@ const LESSON = [
{ type: 'g', items: ['activityRef'] },
{ type: 'g', items: ['image'] },
{ type: 's', toggle: false, items: ['video', 'iframe'] },
{ type: 'g', items: ['voicemessage', 'webcamera', 'screencust'] },
// Три записи — голос, камера, экран — под одной кнопкой. Иконки у них
// близкие, в ряд они читались как одно и то же; в списке у каждой подпись
// словами, и различить их можно с первого взгляда.
{ type: 's', toggle: false, items: ['voicemessage', 'webcamera', 'screencust'] },
{ type: 'g', items: ['|'] },
......@@ -87,8 +90,11 @@ const LESSON = [
{ type: 'g', items: ['|'] },
{ type: 's', toggle: false, items: ['iframe_pptx', 'iframe_pdf', 'pdf'] },
{ type: 'g', items: ['link', 'file', 'iframe_custom', 'export_pdf'] },
// Все четыре «пдф-кнопки» в одном списке — это и была главная путаница
// старой панели: четыре разные вещи со словом «pdf» в подписи. Рядом,
// с человеческими названиями, они наконец различимы.
{ type: 's', toggle: false, items: ['iframe_pptx', 'iframe_pdf', 'pdf', 'export_pdf'] },
{ type: 'g', items: ['link', 'file', 'iframe_custom'] },
]
const toolsInit = {
......
yarn.lock
View file @ 073acecc
......@@ -2281,16 +2281,11 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-table-row/-/extension-table-row-2.12.0.tgz#db3583430c7e6013e8ba9c7461b054f791789af1"
integrity sha512-AEW/Zl9V0IoaYDBLMhF5lVl0xgoIJs3IuKCsIYxGDlxBfTVFC6PfQzvuy296CMjO5ZcZ0xalVipPV9ggsMRD+w==
 
"@tiptap/extension-table@2.11.7":
"@tiptap/extension-table@2.11.7", "@tiptap/extension-table@^2.0.0-beta.49":
version "2.11.7"
resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.11.7.tgz#4a8e477be809c06b43092de7db96fac6c3739ae8"
integrity sha512-rfwWkNXz/EZuhc8lylsCWPbx0Xr5FlIhreWFyeoXYrDEO3x4ytYcVOpNmbabJYP2semfM0PvPR5o84zfFkLZyg==
 
"@tiptap/extension-table@^2.0.0-beta.49":
version "2.12.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.12.0.tgz#a7fe70bae0111fb6ab6d7311b5e7b8c7fe38f111"
integrity sha512-tT3IbbBal0vPQ1Bc/3Xl+tmqqZQCYWxnycBPl/WZBqhd57DWzfJqRPESwCGUIJgjOtTnipy/ulvj0FxHi1j9JA==
"@tiptap/extension-text-align@^2.0.0-beta.29":
version "2.12.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-text-align/-/extension-text-align-2.12.0.tgz#6b316c14d0fd30d99b8cc90277c71b09d23f7601"
......@@ -11950,6 +11945,50 @@ rc-virtual-list@^3.14.2, rc-virtual-list@^3.5.1, rc-virtual-list@^3.5.2:
rc-resize-observer "^1.0.0"
rc-util "^5.36.0"
 
"react-ag-qeditor@git+https://gitlab.atma.company/lib/react-ag-qeditor.git#tiptap":
version "1.1.78"
resolved "git+https://gitlab.atma.company/lib/react-ag-qeditor.git#14cb6b4ea8570a6e36a65506e229bffa0b0af59e"
dependencies:
"@ant-design/icons" "^6.0.0"
"@babel/helper-environment-visitor" "^7.24.7"
"@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
"@tiptap/core" "^2.12.0"
"@tiptap/extension-color" "^2.0.0-beta.9"
"@tiptap/extension-document" "^2.12.0"
"@tiptap/extension-focus" "^2.0.0-beta.43"
"@tiptap/extension-highlight" "^2.0.0-beta.33"
"@tiptap/extension-image" "^2.0.0-beta.27"
"@tiptap/extension-link" "^2.0.0-beta.38"
"@tiptap/extension-paragraph" "^2.12.0"
"@tiptap/extension-subscript" "^2.1.11"
"@tiptap/extension-superscript" "^2.1.11"
"@tiptap/extension-table" "^2.0.0-beta.49"
"@tiptap/extension-table-cell" "^2.0.0-beta.20"
"@tiptap/extension-table-header" "^2.0.0-beta.22"
"@tiptap/extension-table-row" "^2.0.0-beta.19"
"@tiptap/extension-text" "^2.12.0"
"@tiptap/extension-text-align" "^2.0.0-beta.29"
"@tiptap/extension-text-style" "^2.0.0-beta.23"
"@tiptap/extension-underline" "^2.0.0-beta.23"
"@tiptap/react" "^2.12.0"
"@tiptap/starter-kit" "^2.0.0-beta.185"
antd "^5.24.7"
axios "^0.27.2"
babel-loader "8.1.0"
emojibase-data "^16.0.3"
invariant "^2.2.4"
katex "^0.15.3"
levenary "^1.1.1"
prosemirror-state "^1.4.3"
rc-upload "^4.3.3"
react-device-detect "^2.2.3"
react-media-recorder "^1.6.6"
react-stopwatch "^2.0.4"
react-webcam "^7.0.1"
sass "^1.49.9"
tiptap-extension-resize-image "^1.1.8"
tiptap-imagresize "^1.1.0"
react-app-polyfill@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz#95221e0a9bd259e5ca6b177c7bb1cb6768f68fd7"
......@@ -13334,7 +13373,7 @@ string-natural-compare@^3.0.1:
resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
......@@ -13352,6 +13391,15 @@ string-width@^3.0.0:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.1.0"
 
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
string-width@^5.0.1, string-width@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
......@@ -13462,7 +13510,7 @@ stringify-object@^3.3.0:
is-obj "^1.0.1"
is-regexp "^1.0.0"
 
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
......@@ -13483,6 +13531,13 @@ strip-ansi@^5.1.0, strip-ansi@^5.2.0:
dependencies:
ansi-regex "^4.1.0"
 
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"
strip-ansi@^7.0.1:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
......@@ -14927,7 +14982,16 @@ worker-farm@^1.7.0:
dependencies:
errno "~0.1.7"
 
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"
wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment