@seafile/sdoc-editor 1.0.54 → 1.0.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/sdoc-server-api.js +45 -38
- package/dist/api/seafile-api.js +18 -11
- package/dist/basic-sdk/comment/comment-decorate.js +11 -4
- package/dist/basic-sdk/comment/components/comment-all-participants/index.js +29 -21
- package/dist/basic-sdk/comment/components/comment-all-participants/participant-avatar.js +21 -13
- package/dist/basic-sdk/comment/components/comment-delete-popover.js +22 -15
- package/dist/basic-sdk/comment/components/comment-editor.js +58 -50
- package/dist/basic-sdk/comment/components/comment-item-content.js +59 -51
- package/dist/basic-sdk/comment/components/comment-item-reply.js +54 -46
- package/dist/basic-sdk/comment/components/comment-item-resolved-reply.js +22 -14
- package/dist/basic-sdk/comment/components/comment-item-wrapper.js +67 -59
- package/dist/basic-sdk/comment/components/comment-list.js +40 -32
- package/dist/basic-sdk/comment/components/comment-participants-editor/index.js +33 -25
- package/dist/basic-sdk/comment/components/comment-participants-editor/searched-collaborators.js +23 -16
- package/dist/basic-sdk/comment/components/comment-participants-editor/selected-participants.js +20 -13
- package/dist/basic-sdk/comment/components/editor-comment.js +40 -32
- package/dist/basic-sdk/comment/components/elements-comment-count/element-comment-count.js +29 -22
- package/dist/basic-sdk/comment/components/elements-comment-count/index.js +13 -6
- package/dist/basic-sdk/comment/components/global-comment/global-comment-body-header.js +37 -29
- package/dist/basic-sdk/comment/components/global-comment/global-comment-editor.js +15 -8
- package/dist/basic-sdk/comment/components/global-comment/global-comment-header.js +42 -34
- package/dist/basic-sdk/comment/components/global-comment/index.js +78 -70
- package/dist/basic-sdk/comment/components/index.js +21 -4
- package/dist/basic-sdk/comment/constants/index.js +15 -9
- package/dist/basic-sdk/comment/helper.js +25 -13
- package/dist/basic-sdk/comment/hooks/comment-hooks/use-comment-context.js +13 -5
- package/dist/basic-sdk/comment/hooks/comment-hooks/use-comment-list.js +19 -13
- package/dist/basic-sdk/comment/hooks/comment-hooks/use-comment-mount.js +21 -13
- package/dist/basic-sdk/comment/hooks/notification-hooks/index.js +25 -2
- package/dist/basic-sdk/comment/hooks/notification-hooks/use-notification-context.js +13 -5
- package/dist/basic-sdk/comment/hooks/notification-hooks/use-notification-mount.js +34 -26
- package/dist/basic-sdk/comment/hooks/use-participants.js +45 -35
- package/dist/basic-sdk/comment/index.js +26 -18
- package/dist/basic-sdk/comment/provider/comment-context-provider.js +16 -9
- package/dist/basic-sdk/comment/provider/index.js +13 -6
- package/dist/basic-sdk/comment/provider/notification-context-provider.js +15 -8
- package/dist/basic-sdk/comment/reducer/comment-reducer.js +23 -11
- package/dist/basic-sdk/comment/reducer/notification-reducer.js +23 -16
- package/dist/basic-sdk/comment/utils/index.js +51 -27
- package/dist/basic-sdk/comment/utils/notification-utils.js +20 -11
- package/dist/basic-sdk/constants/index.js +24 -17
- package/dist/basic-sdk/constants/z-index.js +8 -2
- package/dist/basic-sdk/cursor/helper.js +15 -6
- package/dist/basic-sdk/cursor/use-cursors.js +13 -6
- package/dist/basic-sdk/decorates/index.js +16 -8
- package/dist/basic-sdk/editor/comment-article.js +42 -34
- package/dist/basic-sdk/editor/editable-article.js +82 -74
- package/dist/basic-sdk/editor/revision-editor.js +28 -20
- package/dist/basic-sdk/editor/sdoc-comment-editor.js +53 -45
- package/dist/basic-sdk/editor/sdoc-editor.js +66 -58
- package/dist/basic-sdk/editor/wiki-editor.js +66 -58
- package/dist/basic-sdk/extension/commons/Inline-bug-fix-wrapper/index.js +10 -4
- package/dist/basic-sdk/extension/commons/color-menu/color-item.js +13 -6
- package/dist/basic-sdk/extension/commons/color-menu/index.js +75 -67
- package/dist/basic-sdk/extension/commons/dropdown-menu-item/index.js +25 -17
- package/dist/basic-sdk/extension/commons/element-popover/index.js +14 -7
- package/dist/basic-sdk/extension/commons/file-insert-dialog/index.js +85 -77
- package/dist/basic-sdk/extension/commons/index.js +47 -6
- package/dist/basic-sdk/extension/commons/insert-element-dialog/index.js +53 -45
- package/dist/basic-sdk/extension/commons/menu/index.js +21 -4
- package/dist/basic-sdk/extension/commons/menu/menu-group.js +13 -6
- package/dist/basic-sdk/extension/commons/menu/menu-item.js +22 -14
- package/dist/basic-sdk/extension/commons/menu-shortcut-indicator/index.js +15 -8
- package/dist/basic-sdk/extension/commons/more-dropdown/index.js +16 -9
- package/dist/basic-sdk/extension/commons/select/_option.js +17 -10
- package/dist/basic-sdk/extension/commons/select/field-setting.js +27 -20
- package/dist/basic-sdk/extension/commons/select/index.js +36 -29
- package/dist/basic-sdk/extension/commons/select/menu/index.js +11 -4
- package/dist/basic-sdk/extension/commons/select/menu/item.js +19 -12
- package/dist/basic-sdk/extension/commons/select/menu/menu.js +13 -6
- package/dist/basic-sdk/extension/commons/select-file-dialog/helpers.js +11 -4
- package/dist/basic-sdk/extension/commons/select-file-dialog/index.js +37 -29
- package/dist/basic-sdk/extension/commons/select-file-dialog/local-files/index.js +52 -44
- package/dist/basic-sdk/extension/constants/color.js +16 -10
- package/dist/basic-sdk/extension/constants/diff-view.js +9 -3
- package/dist/basic-sdk/extension/constants/element-type.js +44 -38
- package/dist/basic-sdk/extension/constants/font.js +13 -8
- package/dist/basic-sdk/extension/constants/index.js +473 -51
- package/dist/basic-sdk/extension/constants/keyboard.js +10 -4
- package/dist/basic-sdk/extension/constants/menus-config.js +113 -107
- package/dist/basic-sdk/extension/core/index.js +38 -3
- package/dist/basic-sdk/extension/core/queries/index.js +159 -110
- package/dist/basic-sdk/extension/core/transforms/focus-editor.js +15 -8
- package/dist/basic-sdk/extension/core/transforms/index.js +60 -5
- package/dist/basic-sdk/extension/core/transforms/move-children.js +16 -9
- package/dist/basic-sdk/extension/core/transforms/remove-node-children.js +12 -5
- package/dist/basic-sdk/extension/core/transforms/replace-node.js +21 -12
- package/dist/basic-sdk/extension/core/transforms/update-parent-node.js +21 -14
- package/dist/basic-sdk/extension/core/utils/index.js +28 -16
- package/dist/basic-sdk/extension/index.js +60 -20
- package/dist/basic-sdk/extension/plugins/blockquote/helpers.js +51 -38
- package/dist/basic-sdk/extension/plugins/blockquote/index.js +18 -11
- package/dist/basic-sdk/extension/plugins/blockquote/menu/index.js +22 -15
- package/dist/basic-sdk/extension/plugins/blockquote/model.js +9 -3
- package/dist/basic-sdk/extension/plugins/blockquote/plugin.js +55 -49
- package/dist/basic-sdk/extension/plugins/blockquote/render-elem.js +10 -3
- package/dist/basic-sdk/extension/plugins/callout/constant.js +10 -5
- package/dist/basic-sdk/extension/plugins/callout/helper.js +68 -50
- package/dist/basic-sdk/extension/plugins/callout/index.js +16 -9
- package/dist/basic-sdk/extension/plugins/callout/menu/index.js +30 -22
- package/dist/basic-sdk/extension/plugins/callout/plugin.js +46 -40
- package/dist/basic-sdk/extension/plugins/callout/render-elem/callout-color-selector/index.js +25 -18
- package/dist/basic-sdk/extension/plugins/callout/render-elem/callout-hover-menu/index.js +38 -30
- package/dist/basic-sdk/extension/plugins/callout/render-elem/callout-icon/index.js +23 -16
- package/dist/basic-sdk/extension/plugins/callout/render-elem/index.js +53 -44
- package/dist/basic-sdk/extension/plugins/check-list/helpers.js +43 -33
- package/dist/basic-sdk/extension/plugins/check-list/index.js +12 -5
- package/dist/basic-sdk/extension/plugins/check-list/menu/index.js +25 -18
- package/dist/basic-sdk/extension/plugins/check-list/model.js +9 -3
- package/dist/basic-sdk/extension/plugins/check-list/plugin.js +31 -24
- package/dist/basic-sdk/extension/plugins/check-list/render-elem.js +24 -16
- package/dist/basic-sdk/extension/plugins/clear-format/helpers.js +21 -13
- package/dist/basic-sdk/extension/plugins/clear-format/menu/index.js +17 -10
- package/dist/basic-sdk/extension/plugins/code-block/helpers.js +63 -48
- package/dist/basic-sdk/extension/plugins/code-block/hover-menu/index.js +66 -58
- package/dist/basic-sdk/extension/plugins/code-block/index.js +16 -9
- package/dist/basic-sdk/extension/plugins/code-block/menu/index.js +20 -12
- package/dist/basic-sdk/extension/plugins/code-block/model.js +9 -3
- package/dist/basic-sdk/extension/plugins/code-block/plugin.js +66 -59
- package/dist/basic-sdk/extension/plugins/code-block/prismjs.js +30 -21
- package/dist/basic-sdk/extension/plugins/code-block/render-elem.js +58 -50
- package/dist/basic-sdk/extension/plugins/file-link/constants/index.js +9 -3
- package/dist/basic-sdk/extension/plugins/file-link/helpers.js +52 -39
- package/dist/basic-sdk/extension/plugins/file-link/hover-menu/index.js +54 -46
- package/dist/basic-sdk/extension/plugins/file-link/index.js +16 -9
- package/dist/basic-sdk/extension/plugins/file-link/menu/index.js +21 -13
- package/dist/basic-sdk/extension/plugins/file-link/plugin.js +15 -9
- package/dist/basic-sdk/extension/plugins/file-link/render-elem.js +48 -40
- package/dist/basic-sdk/extension/plugins/font/helpers.js +72 -56
- package/dist/basic-sdk/extension/plugins/font/index.js +10 -3
- package/dist/basic-sdk/extension/plugins/font/menu/font-family/font-item.js +21 -14
- package/dist/basic-sdk/extension/plugins/font/menu/font-family/index.js +55 -47
- package/dist/basic-sdk/extension/plugins/font/menu/font-size/font-size-scale.js +14 -7
- package/dist/basic-sdk/extension/plugins/font/menu/font-size/index.js +40 -32
- package/dist/basic-sdk/extension/plugins/font/menu/index.js +13 -6
- package/dist/basic-sdk/extension/plugins/font/plugin.js +10 -4
- package/dist/basic-sdk/extension/plugins/header/helpers.js +30 -21
- package/dist/basic-sdk/extension/plugins/header/index.js +14 -7
- package/dist/basic-sdk/extension/plugins/header/menu/index.js +53 -45
- package/dist/basic-sdk/extension/plugins/header/plugin.js +33 -26
- package/dist/basic-sdk/extension/plugins/header/render-elem.js +29 -19
- package/dist/basic-sdk/extension/plugins/html/helper.js +32 -25
- package/dist/basic-sdk/extension/plugins/html/index.js +10 -3
- package/dist/basic-sdk/extension/plugins/html/plugin.js +17 -10
- package/dist/basic-sdk/extension/plugins/html/rules/blockquote.js +12 -5
- package/dist/basic-sdk/extension/plugins/html/rules/check-list.js +13 -6
- package/dist/basic-sdk/extension/plugins/html/rules/code-block.js +28 -21
- package/dist/basic-sdk/extension/plugins/html/rules/header.js +10 -3
- package/dist/basic-sdk/extension/plugins/html/rules/image.js +13 -6
- package/dist/basic-sdk/extension/plugins/html/rules/index.js +18 -11
- package/dist/basic-sdk/extension/plugins/html/rules/link.js +13 -6
- package/dist/basic-sdk/extension/plugins/html/rules/list.js +22 -15
- package/dist/basic-sdk/extension/plugins/html/rules/paragraph.js +12 -5
- package/dist/basic-sdk/extension/plugins/html/rules/table.js +16 -9
- package/dist/basic-sdk/extension/plugins/html/rules/text.js +16 -9
- package/dist/basic-sdk/extension/plugins/image/constants/index.js +15 -8
- package/dist/basic-sdk/extension/plugins/image/dialogs/image-previewer.js +22 -15
- package/dist/basic-sdk/extension/plugins/image/helpers.js +107 -87
- package/dist/basic-sdk/extension/plugins/image/hover-menu/index.js +94 -86
- package/dist/basic-sdk/extension/plugins/image/index.js +18 -11
- package/dist/basic-sdk/extension/plugins/image/menu/index.js +30 -22
- package/dist/basic-sdk/extension/plugins/image/model.js +9 -3
- package/dist/basic-sdk/extension/plugins/image/plugin.js +62 -55
- package/dist/basic-sdk/extension/plugins/image/render-elem.js +87 -78
- package/dist/basic-sdk/extension/plugins/index.js +173 -28
- package/dist/basic-sdk/extension/plugins/link/dialog/add-link-dialog/index.js +38 -31
- package/dist/basic-sdk/extension/plugins/link/helpers.js +70 -53
- package/dist/basic-sdk/extension/plugins/link/hover/index.js +25 -18
- package/dist/basic-sdk/extension/plugins/link/index.js +18 -11
- package/dist/basic-sdk/extension/plugins/link/menu/index.js +26 -18
- package/dist/basic-sdk/extension/plugins/link/model.js +9 -3
- package/dist/basic-sdk/extension/plugins/link/plugin.js +52 -45
- package/dist/basic-sdk/extension/plugins/link/render-elem.js +41 -34
- package/dist/basic-sdk/extension/plugins/list/helpers.js +38 -28
- package/dist/basic-sdk/extension/plugins/list/index.js +14 -7
- package/dist/basic-sdk/extension/plugins/list/menu/index.js +26 -19
- package/dist/basic-sdk/extension/plugins/list/model.js +23 -13
- package/dist/basic-sdk/extension/plugins/list/plugin/index.js +33 -27
- package/dist/basic-sdk/extension/plugins/list/plugin/insert-break-list.js +16 -9
- package/dist/basic-sdk/extension/plugins/list/plugin/insert-fragment-list.js +55 -46
- package/dist/basic-sdk/extension/plugins/list/plugin/normalize-list.js +32 -25
- package/dist/basic-sdk/extension/plugins/list/plugin/on-tab-handle.js +23 -15
- package/dist/basic-sdk/extension/plugins/list/plugin/shortcut.js +36 -30
- package/dist/basic-sdk/extension/plugins/list/queries/index.js +27 -17
- package/dist/basic-sdk/extension/plugins/list/render-elem.js +18 -9
- package/dist/basic-sdk/extension/plugins/list/transforms/index.js +76 -11
- package/dist/basic-sdk/extension/plugins/list/transforms/insert-list-item.js +40 -34
- package/dist/basic-sdk/extension/plugins/list/transforms/move-list-item-down.js +19 -12
- package/dist/basic-sdk/extension/plugins/list/transforms/move-list-item-up.js +37 -30
- package/dist/basic-sdk/extension/plugins/list/transforms/move-list-items-to-list.js +19 -12
- package/dist/basic-sdk/extension/plugins/list/transforms/move-list-items.js +28 -21
- package/dist/basic-sdk/extension/plugins/list/transforms/normalize-list-item.js +40 -33
- package/dist/basic-sdk/extension/plugins/list/transforms/normalize-nested-list.js +18 -11
- package/dist/basic-sdk/extension/plugins/list/transforms/remove-first-list-item.js +13 -6
- package/dist/basic-sdk/extension/plugins/list/transforms/toggle-list.js +50 -44
- package/dist/basic-sdk/extension/plugins/list/transforms/unwrap-list.js +22 -15
- package/dist/basic-sdk/extension/plugins/markdown/index.js +10 -3
- package/dist/basic-sdk/extension/plugins/markdown/plugin.js +45 -40
- package/dist/basic-sdk/extension/plugins/mention/helper.js +56 -42
- package/dist/basic-sdk/extension/plugins/mention/index.js +14 -7
- package/dist/basic-sdk/extension/plugins/mention/plugin.js +72 -65
- package/dist/basic-sdk/extension/plugins/mention/render-elem/comment-participant-item.js +21 -14
- package/dist/basic-sdk/extension/plugins/mention/render-elem/index.js +29 -19
- package/dist/basic-sdk/extension/plugins/mention/render-elem/participant-popover.js +82 -74
- package/dist/basic-sdk/extension/plugins/paragraph/helper.js +12 -5
- package/dist/basic-sdk/extension/plugins/paragraph/index.js +14 -7
- package/dist/basic-sdk/extension/plugins/paragraph/plugin/index.js +27 -20
- package/dist/basic-sdk/extension/plugins/paragraph/render-elem.js +27 -19
- package/dist/basic-sdk/extension/plugins/quick-insert/helper.js +27 -18
- package/dist/basic-sdk/extension/plugins/quick-insert/index.js +14 -7
- package/dist/basic-sdk/extension/plugins/quick-insert/plugin/index.js +44 -38
- package/dist/basic-sdk/extension/plugins/quick-insert/render-elem.js +42 -34
- package/dist/basic-sdk/extension/plugins/sdoc-link/constants/index.js +9 -3
- package/dist/basic-sdk/extension/plugins/sdoc-link/helpers.js +91 -70
- package/dist/basic-sdk/extension/plugins/sdoc-link/hover-menu/index.js +53 -45
- package/dist/basic-sdk/extension/plugins/sdoc-link/index.js +17 -10
- package/dist/basic-sdk/extension/plugins/sdoc-link/menu/index.js +21 -13
- package/dist/basic-sdk/extension/plugins/sdoc-link/plugin.js +37 -31
- package/dist/basic-sdk/extension/plugins/sdoc-link/render/render-elem.js +54 -46
- package/dist/basic-sdk/extension/plugins/sdoc-link/render/render-file-link-temp-input.js +20 -12
- package/dist/basic-sdk/extension/plugins/search-replace/constant.js +8 -2
- package/dist/basic-sdk/extension/plugins/search-replace/helper.js +42 -32
- package/dist/basic-sdk/extension/plugins/search-replace/index.js +14 -7
- package/dist/basic-sdk/extension/plugins/search-replace/menu/index.js +31 -23
- package/dist/basic-sdk/extension/plugins/search-replace/plugin.js +14 -7
- package/dist/basic-sdk/extension/plugins/search-replace/popover/index.js +83 -75
- package/dist/basic-sdk/extension/plugins/search-replace/popover/replace-all-confirm-modal.js +16 -9
- package/dist/basic-sdk/extension/plugins/seatable-column/constants/cell-types.js +35 -29
- package/dist/basic-sdk/extension/plugins/seatable-column/constants/column.js +10 -4
- package/dist/basic-sdk/extension/plugins/seatable-column/helpers.js +54 -40
- package/dist/basic-sdk/extension/plugins/seatable-column/index.js +14 -7
- package/dist/basic-sdk/extension/plugins/seatable-column/menu/column-list-menu.js +30 -23
- package/dist/basic-sdk/extension/plugins/seatable-column/menu/index.js +22 -14
- package/dist/basic-sdk/extension/plugins/seatable-column/model.js +9 -3
- package/dist/basic-sdk/extension/plugins/seatable-column/plugin.js +10 -4
- package/dist/basic-sdk/extension/plugins/seatable-column/render-elem.js +17 -10
- package/dist/basic-sdk/extension/plugins/seatable-tables/draggable/index.js +24 -18
- package/dist/basic-sdk/extension/plugins/seatable-tables/formatter/collaborator-wrapper.js +23 -17
- package/dist/basic-sdk/extension/plugins/seatable-tables/formatter/index.js +91 -83
- package/dist/basic-sdk/extension/plugins/seatable-tables/formatter/link-formatter/index.js +98 -91
- package/dist/basic-sdk/extension/plugins/seatable-tables/formatter/link-formatter/utils.js +20 -8
- package/dist/basic-sdk/extension/plugins/seatable-tables/helpers.js +48 -37
- package/dist/basic-sdk/extension/plugins/seatable-tables/index.js +18 -11
- package/dist/basic-sdk/extension/plugins/seatable-tables/menu/index.js +25 -17
- package/dist/basic-sdk/extension/plugins/seatable-tables/menu/seatable-list.js +16 -9
- package/dist/basic-sdk/extension/plugins/seatable-tables/model.js +9 -3
- package/dist/basic-sdk/extension/plugins/seatable-tables/op-menu/index.js +96 -88
- package/dist/basic-sdk/extension/plugins/seatable-tables/plugin.js +27 -21
- package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/index.js +11 -4
- package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/record-header.js +22 -14
- package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/record-item.js +16 -9
- package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/record-list.js +12 -5
- package/dist/basic-sdk/extension/plugins/seatable-tables/render-element/seatable-table.js +63 -55
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/common-add-tool/index.js +15 -8
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/custom-switch/index.js +12 -5
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/dtable-search-input/index.js +26 -18
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/calendar-filter/date-translate.js +7 -2
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/calendar-filter/dayjs.js +11 -4
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/calendar-filter/index.js +40 -32
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/collaborator-filter/index.js +35 -27
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/_department-utils.js +12 -4
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/department-multiple-select-filter.js +33 -25
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/department-multiple-select.js +35 -27
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/department-single-select-filter.js +35 -27
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/department-single-select.js +58 -50
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/index.js +20 -3
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/selected-departments.js +35 -28
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/use-click-outside.js +9 -3
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/filter-item-utils.js +26 -19
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/filter-item.js +146 -138
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/filters-list.js +36 -28
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/number-editor/index.js +39 -31
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/rate-item/index.js +21 -14
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover.js +43 -36
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/filters-utils.js +127 -107
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/filter-setter/index.js +20 -13
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/hide-column-setter/hide-column-item.js +17 -10
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/hide-column-setter/hide-column-popover.js +38 -31
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/hide-column-setter/index.js +18 -10
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/index.js +48 -40
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/sort-setter/index.js +18 -10
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/sort-setter/sort-popover.js +72 -64
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/sort-setter/sort-utils.js +18 -9
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/table-setting/index.js +15 -8
- package/dist/basic-sdk/extension/plugins/seatable-tables/seatable-settings/utils/utils.js +21 -10
- package/dist/basic-sdk/extension/plugins/table/constants/index.js +30 -24
- package/dist/basic-sdk/extension/plugins/table/dialogs/custom-table-size-dialog/index.js +38 -30
- package/dist/basic-sdk/extension/plugins/table/dialogs/custom-table-size-dialog/number-input.js +11 -4
- package/dist/basic-sdk/extension/plugins/table/dialogs/index.js +20 -3
- package/dist/basic-sdk/extension/plugins/table/dialogs/split-cell-setting-dialog.js +32 -25
- package/dist/basic-sdk/extension/plugins/table/helpers.js +436 -365
- package/dist/basic-sdk/extension/plugins/table/index.js +18 -11
- package/dist/basic-sdk/extension/plugins/table/menu/active-table-menu/common-menu.js +26 -18
- package/dist/basic-sdk/extension/plugins/table/menu/color-selector-popover/color-item.js +13 -6
- package/dist/basic-sdk/extension/plugins/table/menu/color-selector-popover/index.js +66 -58
- package/dist/basic-sdk/extension/plugins/table/menu/horizontal-align-popover/index.js +39 -31
- package/dist/basic-sdk/extension/plugins/table/menu/index.js +20 -3
- package/dist/basic-sdk/extension/plugins/table/menu/table-context-menu/index.js +84 -77
- package/dist/basic-sdk/extension/plugins/table/menu/table-context-menu/insert-table-element.js +29 -21
- package/dist/basic-sdk/extension/plugins/table/menu/table-menu/index.js +23 -15
- package/dist/basic-sdk/extension/plugins/table/menu/vertical-align-popover/index.js +40 -32
- package/dist/basic-sdk/extension/plugins/table/model.js +15 -9
- package/dist/basic-sdk/extension/plugins/table/plugin.js +121 -114
- package/dist/basic-sdk/extension/plugins/table/popover/table-size-popover/index.js +37 -29
- package/dist/basic-sdk/extension/plugins/table/popover/table-template/index.js +21 -13
- package/dist/basic-sdk/extension/plugins/table/popover/table-template/sample-table.js +21 -13
- package/dist/basic-sdk/extension/plugins/table/render/drag-handlers/column-drag-handler.js +12 -5
- package/dist/basic-sdk/extension/plugins/table/render/drag-handlers/index.js +23 -15
- package/dist/basic-sdk/extension/plugins/table/render/drag-handlers/row-drag-handler.js +12 -5
- package/dist/basic-sdk/extension/plugins/table/render/hooks.js +38 -26
- package/dist/basic-sdk/extension/plugins/table/render/index.js +104 -96
- package/dist/basic-sdk/extension/plugins/table/render/render-cell.js +72 -64
- package/dist/basic-sdk/extension/plugins/table/render/render-row.js +10 -3
- package/dist/basic-sdk/extension/plugins/table/render/resize-handlers/column-resize-handler.js +36 -29
- package/dist/basic-sdk/extension/plugins/table/render/resize-handlers/first-column-left-resize-handler.js +34 -27
- package/dist/basic-sdk/extension/plugins/table/render/resize-handlers/index.js +25 -17
- package/dist/basic-sdk/extension/plugins/table/render/resize-handlers/row-resize-handler.js +37 -30
- package/dist/basic-sdk/extension/plugins/table/render/resize-mask/index.js +44 -36
- package/dist/basic-sdk/extension/plugins/table/render/table-header/columns-header/column-header.js +28 -20
- package/dist/basic-sdk/extension/plugins/table/render/table-header/columns-header/index.js +34 -26
- package/dist/basic-sdk/extension/plugins/table/render/table-header/index.js +36 -29
- package/dist/basic-sdk/extension/plugins/table/render/table-header/rows-columns-header.js +16 -9
- package/dist/basic-sdk/extension/plugins/table/render/table-header/rows-header/index.js +31 -23
- package/dist/basic-sdk/extension/plugins/table/render/table-header/rows-header/row-header.js +38 -30
- package/dist/basic-sdk/extension/plugins/table/render/table-root.js +27 -19
- package/dist/basic-sdk/extension/plugins/table/render-elem.js +27 -4
- package/dist/basic-sdk/extension/plugins/text-align/helpers.js +22 -13
- package/dist/basic-sdk/extension/plugins/text-align/index.js +7 -1
- package/dist/basic-sdk/extension/plugins/text-align/menu/index.js +41 -33
- package/dist/basic-sdk/extension/plugins/text-style/caret.js +12 -5
- package/dist/basic-sdk/extension/plugins/text-style/helpers.js +31 -21
- package/dist/basic-sdk/extension/plugins/text-style/index.js +12 -5
- package/dist/basic-sdk/extension/plugins/text-style/menu/comemnt-editor-menu.js +29 -22
- package/dist/basic-sdk/extension/plugins/text-style/menu/index.js +59 -51
- package/dist/basic-sdk/extension/plugins/text-style/plugin.js +15 -9
- package/dist/basic-sdk/extension/plugins/text-style/render-elem.js +45 -38
- package/dist/basic-sdk/extension/plugins/wiki-link/helpers.js +33 -23
- package/dist/basic-sdk/extension/plugins/wiki-link/index.js +14 -7
- package/dist/basic-sdk/extension/render/custom-element.js +88 -82
- package/dist/basic-sdk/extension/render/element-decorate/index.js +13 -2
- package/dist/basic-sdk/extension/render/element-decorate/rebase-decorate/index.js +23 -16
- package/dist/basic-sdk/extension/render/element-decorate/rebase-decorate/rebase-delete-modify-decorate.js +37 -30
- package/dist/basic-sdk/extension/render/element-decorate/rebase-decorate/rebase-modify-delete-decorate.js +37 -30
- package/dist/basic-sdk/extension/render/element-decorate/rebase-decorate/rebase-modify-modify-decorate.js +51 -43
- package/dist/basic-sdk/extension/render/helper.js +21 -13
- package/dist/basic-sdk/extension/render/render-comment-editor-element.js +37 -31
- package/dist/basic-sdk/extension/render/render-element.js +16 -9
- package/dist/basic-sdk/extension/render/render-leaf.js +14 -7
- package/dist/basic-sdk/extension/toolbar/comment-editor-toolbar/index.js +33 -26
- package/dist/basic-sdk/extension/toolbar/comment-editor-toolbar/post-comment/index.js +16 -8
- package/dist/basic-sdk/extension/toolbar/context-toolbar/index.js +34 -26
- package/dist/basic-sdk/extension/toolbar/header-toolbar/index.js +44 -37
- package/dist/basic-sdk/extension/toolbar/header-toolbar/insert-toolbar/index.js +42 -34
- package/dist/basic-sdk/extension/toolbar/header-toolbar/redo-undo.js +22 -15
- package/dist/basic-sdk/extension/toolbar/index.js +27 -4
- package/dist/basic-sdk/extension/toolbar/insert-element-toolbar/const.js +25 -19
- package/dist/basic-sdk/extension/toolbar/insert-element-toolbar/index.js +110 -102
- package/dist/basic-sdk/extension/toolbar/side-toolbar/event.js +28 -17
- package/dist/basic-sdk/extension/toolbar/side-toolbar/helpers.js +108 -88
- package/dist/basic-sdk/extension/toolbar/side-toolbar/index.js +103 -95
- package/dist/basic-sdk/extension/toolbar/side-toolbar/insert-below-menu.js +16 -9
- package/dist/basic-sdk/extension/toolbar/side-toolbar/insert-block-menu.js +81 -73
- package/dist/basic-sdk/extension/toolbar/side-toolbar/side-menu.js +61 -53
- package/dist/basic-sdk/extension/toolbar/side-toolbar/transform-menus.js +34 -26
- package/dist/basic-sdk/extension/utils/index.js +17 -7
- package/dist/basic-sdk/highlight/index.js +18 -6
- package/dist/basic-sdk/highlight/setNodeToDecorations.js +24 -16
- package/dist/basic-sdk/hooks/use-color-context.js +20 -11
- package/dist/basic-sdk/hooks/use-force-update.js +10 -4
- package/dist/basic-sdk/hooks/use-scroll-context.js +13 -5
- package/dist/basic-sdk/hooks/use-selection-element.js +14 -7
- package/dist/basic-sdk/hooks/use-selection-position.js +19 -11
- package/dist/basic-sdk/hooks/use-selection-update.js +13 -6
- package/dist/basic-sdk/index.js +59 -6
- package/dist/basic-sdk/layout/article-container.js +31 -23
- package/dist/basic-sdk/layout/editor-container.js +19 -12
- package/dist/basic-sdk/layout/editor-content.js +32 -24
- package/dist/basic-sdk/layout/index.js +27 -4
- package/dist/basic-sdk/node-id/constants.js +15 -9
- package/dist/basic-sdk/node-id/helpers.js +37 -26
- package/dist/basic-sdk/node-id/index.js +14 -8
- package/dist/basic-sdk/outline/index.js +39 -29
- package/dist/basic-sdk/outline/outline-item.js +17 -10
- package/dist/basic-sdk/socket/helpers.js +43 -28
- package/dist/basic-sdk/socket/index.js +20 -3
- package/dist/basic-sdk/socket/socket-client.js +66 -59
- package/dist/basic-sdk/socket/socket-manager.js +91 -85
- package/dist/basic-sdk/socket/with-socket-io.js +18 -11
- package/dist/basic-sdk/utils/Kebab-to-camel.js +8 -2
- package/dist/basic-sdk/utils/debounce.js +7 -1
- package/dist/basic-sdk/utils/debug.js +13 -7
- package/dist/basic-sdk/utils/diff-text.js +24 -17
- package/dist/basic-sdk/utils/diff.js +57 -46
- package/dist/basic-sdk/utils/document-utils.js +29 -18
- package/dist/basic-sdk/utils/dom-utils.js +15 -5
- package/dist/basic-sdk/utils/event-bus.js +7 -1
- package/dist/basic-sdk/utils/event-handler.js +40 -33
- package/dist/basic-sdk/utils/mouse-event.js +19 -7
- package/dist/basic-sdk/utils/object-utils.js +15 -8
- package/dist/basic-sdk/utils/rebase.js +73 -63
- package/dist/basic-sdk/views/index.js +41 -6
- package/dist/basic-sdk/views/published-revision-diff-viewer.js +22 -14
- package/dist/basic-sdk/views/readonly-article.js +23 -15
- package/dist/basic-sdk/views/revision-diff-viewer.js +26 -18
- package/dist/basic-sdk/views/sdoc-diff-viewer.js +23 -15
- package/dist/basic-sdk/views/sdoc-viewer.js +22 -15
- package/dist/basic-sdk/views/sdoc-wiki-viewer.js +28 -20
- package/dist/basic-sdk/wiki-outline/index.js +24 -16
- package/dist/basic-sdk/wiki-outline/outline-item.js +14 -6
- package/dist/components/common-loading/index.js +11 -4
- package/dist/components/doc-info/index.js +62 -54
- package/dist/components/doc-operations/collaborators-operation/collaborators-popover.js +22 -15
- package/dist/components/doc-operations/collaborators-operation/index.js +23 -15
- package/dist/components/doc-operations/comments-operation/index.js +24 -17
- package/dist/components/doc-operations/index.js +25 -18
- package/dist/components/doc-operations/more-operations.js +54 -46
- package/dist/components/doc-operations/revision-operations/changes-count/index.js +36 -28
- package/dist/components/doc-operations/revision-operations/index.js +87 -79
- package/dist/components/doc-operations/revision-operations/more-revision-operations/index.js +35 -27
- package/dist/components/doc-operations/revision-operations/publish-revision/index.js +14 -7
- package/dist/components/doc-operations/revision-operations/revisions/index.js +28 -20
- package/dist/components/doc-operations/revision-operations/revisions/revisions-dialog/index.js +81 -73
- package/dist/components/doc-operations/revision-operations/revisions/revisions-dialog/revision-operation/index.js +24 -16
- package/dist/components/doc-operations/revision-operations/view-changes/index.js +31 -23
- package/dist/components/doc-operations/share-operation/index.js +16 -9
- package/dist/components/draft-dropdown/index.js +26 -19
- package/dist/components/loading/index.js +14 -7
- package/dist/components/modal-portal/index.js +12 -5
- package/dist/components/switch/index.js +17 -10
- package/dist/components/tip-dialog/index.js +47 -39
- package/dist/components/tip-message/index.js +43 -36
- package/dist/components/toast/alert.js +19 -12
- package/dist/components/toast/index.js +10 -3
- package/dist/components/toast/toast.js +26 -18
- package/dist/components/toast/toastManager.js +22 -14
- package/dist/components/toast/toaster.js +25 -17
- package/dist/components/tooltip/index.js +14 -7
- package/dist/constants/index.js +23 -8
- package/dist/constants/key-codes.js +2 -0
- package/dist/constants/transfer-types.js +9 -3
- package/dist/context.js +21 -14
- package/dist/hooks/index.js +25 -3
- package/dist/hooks/use-collaborators.js +25 -15
- package/dist/hooks/use-document.js +22 -14
- package/dist/index.js +75 -10
- package/dist/layout/content.js +15 -6
- package/dist/layout/header.js +15 -6
- package/dist/layout/index.js +24 -6
- package/dist/layout/layout.js +22 -14
- package/dist/model/index.js +27 -4
- package/dist/model/notification.js +9 -3
- package/dist/model/revision.js +10 -4
- package/dist/model/user.js +7 -1
- package/dist/pages/diff-viewer.js +8 -2
- package/dist/pages/document-plugin-editor.js +37 -29
- package/dist/pages/error-boundary.js +14 -5
- package/dist/pages/error-page.js +19 -11
- package/dist/pages/published-revision-viewer.js +39 -31
- package/dist/pages/sdoc-wiki-editor.js +29 -21
- package/dist/pages/simple-editor.js +53 -45
- package/dist/pages/simple-viewer.js +40 -32
- package/dist/pages/wiki-viewer.js +15 -8
- package/dist/slate-convert/html-to-slate/constants.js +32 -26
- package/dist/slate-convert/html-to-slate/helper.js +9 -2
- package/dist/slate-convert/html-to-slate/index.js +30 -24
- package/dist/slate-convert/html-to-slate/rules/blockquote.js +12 -5
- package/dist/slate-convert/html-to-slate/rules/check-list.js +13 -6
- package/dist/slate-convert/html-to-slate/rules/code-block.js +28 -21
- package/dist/slate-convert/html-to-slate/rules/header.js +13 -6
- package/dist/slate-convert/html-to-slate/rules/image.js +13 -6
- package/dist/slate-convert/html-to-slate/rules/index.js +18 -11
- package/dist/slate-convert/html-to-slate/rules/link.js +13 -6
- package/dist/slate-convert/html-to-slate/rules/list.js +22 -15
- package/dist/slate-convert/html-to-slate/rules/paragraph.js +12 -5
- package/dist/slate-convert/html-to-slate/rules/table.js +16 -9
- package/dist/slate-convert/html-to-slate/rules/text.js +16 -9
- package/dist/slate-convert/index.js +34 -8
- package/dist/slate-convert/md-to-html/index.js +31 -26
- package/dist/slate-convert/md-to-html/sanitize-schema.js +11 -4
- package/dist/slate-convert/md-to-slate/index.js +18 -12
- package/dist/slate-convert/md-to-slate/transform.js +109 -83
- package/dist/slate-convert/slate-to-md/index.js +16 -10
- package/dist/slate-convert/slate-to-md/transform.js +18 -11
- package/dist/utils/base64-to-unit8array.js +7 -1
- package/dist/utils/date-utils.js +18 -12
- package/dist/utils/get-event-transfer.js +9 -3
- package/dist/utils/hotkey.js +32 -25
- package/dist/utils/index.js +54 -18
- package/dist/utils/is-punctuation-mark.js +7 -1
- package/dist/utils/local-storage-utils.js +7 -1
- package/package.json +1 -1
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.getSelectionRange = exports.getDomMarginTop = exports.getDomHeight = exports.getCursorPosition = void 0;
|
|
7
|
+
const getDomHeight = dom => {
|
|
2
8
|
const styles = window.getComputedStyle(dom);
|
|
3
9
|
const rect = dom.getBoundingClientRect();
|
|
4
10
|
const marginTop = styles['marginTop'];
|
|
@@ -9,12 +15,14 @@ export const getDomHeight = dom => {
|
|
|
9
15
|
} = rect;
|
|
10
16
|
return height + parseInt(marginTop);
|
|
11
17
|
};
|
|
12
|
-
|
|
18
|
+
exports.getDomHeight = getDomHeight;
|
|
19
|
+
const getDomMarginTop = dom => {
|
|
13
20
|
const styles = window.getComputedStyle(dom);
|
|
14
21
|
const marginTop = styles['marginTop'];
|
|
15
22
|
return parseInt(marginTop);
|
|
16
23
|
};
|
|
17
|
-
|
|
24
|
+
exports.getDomMarginTop = getDomMarginTop;
|
|
25
|
+
const getSelectionRange = () => {
|
|
18
26
|
if (window.getSelection) {
|
|
19
27
|
const sel = window.getSelection();
|
|
20
28
|
if (sel.getRangeAt && sel.rangeCount) {
|
|
@@ -25,7 +33,8 @@ export const getSelectionRange = () => {
|
|
|
25
33
|
}
|
|
26
34
|
return null;
|
|
27
35
|
};
|
|
28
|
-
|
|
36
|
+
exports.getSelectionRange = getSelectionRange;
|
|
37
|
+
const getCursorPosition = function () {
|
|
29
38
|
let isScrollUp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
|
|
30
39
|
let x = 0;
|
|
31
40
|
let y = 0;
|
|
@@ -44,4 +53,5 @@ export const getCursorPosition = function () {
|
|
|
44
53
|
x: x,
|
|
45
54
|
y: y
|
|
46
55
|
};
|
|
47
|
-
};
|
|
56
|
+
};
|
|
57
|
+
exports.getCursorPosition = getCursorPosition;
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.default = void 0;
|
|
1
7
|
class EventBus {
|
|
2
8
|
constructor() {
|
|
3
9
|
this.instance = null;
|
|
@@ -31,4 +37,4 @@ class EventBus {
|
|
|
31
37
|
}
|
|
32
38
|
}
|
|
33
39
|
}
|
|
34
|
-
|
|
40
|
+
var _default = exports.default = EventBus;
|
|
@@ -1,13 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.default = void 0;
|
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
9
|
+
var _isHotkey = _interopRequireDefault(require("is-hotkey"));
|
|
10
|
+
var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
|
|
11
|
+
var _queries = require("../extension/core/queries/");
|
|
12
|
+
var _documentUtils = require("./document-utils");
|
|
13
|
+
var _constants = require("../extension/constants");
|
|
14
|
+
var _constants2 = require("../constants");
|
|
8
15
|
class EventProxy {
|
|
9
16
|
constructor(_editor) {
|
|
10
|
-
|
|
17
|
+
(0, _defineProperty2.default)(this, "onKeyDown", event => {
|
|
11
18
|
const editor = this.editor;
|
|
12
19
|
if (editor.onHotKeyDown) {
|
|
13
20
|
const isHandled = editor.onHotKeyDown(event);
|
|
@@ -15,34 +22,34 @@ class EventProxy {
|
|
|
15
22
|
}
|
|
16
23
|
|
|
17
24
|
// bold
|
|
18
|
-
if (
|
|
25
|
+
if ((0, _isHotkey.default)('mod+b', event)) {
|
|
19
26
|
event.preventDefault();
|
|
20
27
|
editor.toggleTextBold();
|
|
21
28
|
}
|
|
22
29
|
|
|
23
30
|
// italic
|
|
24
|
-
if (
|
|
31
|
+
if ((0, _isHotkey.default)('mod+i', event)) {
|
|
25
32
|
event.preventDefault();
|
|
26
33
|
editor.toggleTextItalic();
|
|
27
34
|
}
|
|
28
35
|
|
|
29
36
|
// font scale
|
|
30
|
-
if (
|
|
37
|
+
if ((0, _isHotkey.default)('opt+.', event)) {
|
|
31
38
|
event.preventDefault();
|
|
32
39
|
editor.increaseFontSize();
|
|
33
40
|
}
|
|
34
|
-
if (
|
|
41
|
+
if ((0, _isHotkey.default)('opt+,', event)) {
|
|
35
42
|
event.preventDefault();
|
|
36
43
|
editor.reduceFontSize();
|
|
37
44
|
}
|
|
38
45
|
|
|
39
46
|
// disable the default 'save page'
|
|
40
|
-
if (
|
|
47
|
+
if ((0, _isHotkey.default)('mod+s', event)) {
|
|
41
48
|
event.preventDefault();
|
|
42
49
|
}
|
|
43
50
|
|
|
44
51
|
// redo
|
|
45
|
-
if (
|
|
52
|
+
if ((0, _isHotkey.default)('mod+y', event)) {
|
|
46
53
|
event.preventDefault();
|
|
47
54
|
const {
|
|
48
55
|
history
|
|
@@ -54,7 +61,7 @@ class EventProxy {
|
|
|
54
61
|
}
|
|
55
62
|
|
|
56
63
|
// undo
|
|
57
|
-
if (
|
|
64
|
+
if ((0, _isHotkey.default)('mod+z', event)) {
|
|
58
65
|
event.preventDefault();
|
|
59
66
|
const {
|
|
60
67
|
history
|
|
@@ -64,54 +71,54 @@ class EventProxy {
|
|
|
64
71
|
}
|
|
65
72
|
editor.undo();
|
|
66
73
|
}
|
|
67
|
-
if (
|
|
74
|
+
if ((0, _isHotkey.default)('tab', event) || (0, _isHotkey.default)('shift+tab', event)) {
|
|
68
75
|
editor.handleTab && editor.handleTab(event);
|
|
69
76
|
}
|
|
70
|
-
if (
|
|
77
|
+
if ((0, _isHotkey.default)('mod+p', event)) {
|
|
71
78
|
event.preventDefault();
|
|
72
|
-
const eventBus =
|
|
73
|
-
eventBus.dispatch(INTERNAL_EVENT.ON_PRINT);
|
|
79
|
+
const eventBus = _eventBus.default.getInstance();
|
|
80
|
+
eventBus.dispatch(_constants2.INTERNAL_EVENT.ON_PRINT);
|
|
74
81
|
}
|
|
75
|
-
const node = getSelectedNodeByType(editor, ELEMENT_TYPE.TABLE);
|
|
82
|
+
const node = (0, _queries.getSelectedNodeByType)(editor, _constants.ELEMENT_TYPE.TABLE);
|
|
76
83
|
if (node) {
|
|
77
84
|
this.editor.tableOnKeyDown(event);
|
|
78
85
|
}
|
|
79
|
-
const imageNode = getSelectedNodeByType(editor, ELEMENT_TYPE.IMAGE);
|
|
86
|
+
const imageNode = (0, _queries.getSelectedNodeByType)(editor, _constants.ELEMENT_TYPE.IMAGE);
|
|
80
87
|
if (imageNode) {
|
|
81
88
|
this.editor.imageOnKeyDown(event);
|
|
82
89
|
}
|
|
83
|
-
if (getSelectedNodeByType(editor, ELEMENT_TYPE.CODE_BLOCK)) {
|
|
90
|
+
if ((0, _queries.getSelectedNodeByType)(editor, _constants.ELEMENT_TYPE.CODE_BLOCK)) {
|
|
84
91
|
this.editor.codeBlockOnKeyDown(event);
|
|
85
|
-
const eventBus =
|
|
86
|
-
eventBus.dispatch(INTERNAL_EVENT.HIDDEN_CODE_BLOCK_HOVER_MENU);
|
|
92
|
+
const eventBus = _eventBus.default.getInstance();
|
|
93
|
+
eventBus.dispatch(_constants2.INTERNAL_EVENT.HIDDEN_CODE_BLOCK_HOVER_MENU);
|
|
87
94
|
}
|
|
88
95
|
});
|
|
89
|
-
|
|
96
|
+
(0, _defineProperty2.default)(this, "onCopy", event => {
|
|
90
97
|
if (this.editor.onCopy) this.editor.onCopy(event);
|
|
91
|
-
setOriginSdocKey(event);
|
|
98
|
+
(0, _documentUtils.setOriginSdocKey)(event);
|
|
92
99
|
});
|
|
93
|
-
|
|
94
|
-
setOriginSdocKey(event);
|
|
100
|
+
(0, _defineProperty2.default)(this, "onCut", event => {
|
|
101
|
+
(0, _documentUtils.setOriginSdocKey)(event);
|
|
95
102
|
if (this.editor.cut) {
|
|
96
103
|
this.editor.cut(event);
|
|
97
104
|
}
|
|
98
105
|
});
|
|
99
|
-
|
|
100
|
-
|
|
106
|
+
(0, _defineProperty2.default)(this, "onPaste", event => {});
|
|
107
|
+
(0, _defineProperty2.default)(this, "onCompositionStart", event => {
|
|
101
108
|
const editor = this.editor;
|
|
102
109
|
if (editor.onCompositionStart) {
|
|
103
110
|
const isHandled = editor.onCompositionStart(event);
|
|
104
111
|
if (isHandled) return;
|
|
105
112
|
}
|
|
106
113
|
});
|
|
107
|
-
|
|
114
|
+
(0, _defineProperty2.default)(this, "onCompositionUpdate", event => {
|
|
108
115
|
const editor = this.editor;
|
|
109
116
|
if (editor.onCompositionUpdate) {
|
|
110
117
|
const isHandled = editor.onCompositionUpdate(event);
|
|
111
118
|
if (isHandled) return;
|
|
112
119
|
}
|
|
113
120
|
});
|
|
114
|
-
|
|
121
|
+
(0, _defineProperty2.default)(this, "onCompositionEnd", event => {
|
|
115
122
|
const editor = this.editor;
|
|
116
123
|
if (editor.onCompositionUpdate) {
|
|
117
124
|
const isHandled = editor.onCompositionEnd(event);
|
|
@@ -121,4 +128,4 @@ class EventProxy {
|
|
|
121
128
|
this.editor = _editor;
|
|
122
129
|
}
|
|
123
130
|
}
|
|
124
|
-
|
|
131
|
+
var _default = exports.default = EventProxy;
|
|
@@ -1,21 +1,30 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.unregisterResizeEvents = exports.registerResizeEvents = exports.getMouseMoveInfo = exports.getMouseDownInfo = exports.eventStopPropagation = exports.createObjectWithProperties = void 0;
|
|
7
|
+
const eventStopPropagation = event => {
|
|
2
8
|
if (!event) return;
|
|
3
9
|
event.stopPropagation();
|
|
4
10
|
event.nativeEvent && event.nativeEvent.stopImmediatePropagation && event.nativeEvent.stopImmediatePropagation();
|
|
5
11
|
};
|
|
6
|
-
|
|
12
|
+
exports.eventStopPropagation = eventStopPropagation;
|
|
13
|
+
const registerResizeEvents = function () {
|
|
7
14
|
let eventsMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
8
15
|
for (let key in eventsMap) {
|
|
9
16
|
document.addEventListener(key, eventsMap[key]);
|
|
10
17
|
}
|
|
11
18
|
};
|
|
12
|
-
|
|
19
|
+
exports.registerResizeEvents = registerResizeEvents;
|
|
20
|
+
const unregisterResizeEvents = function () {
|
|
13
21
|
let eventsMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
14
22
|
for (let key in eventsMap) {
|
|
15
23
|
document.removeEventListener(key, eventsMap[key]);
|
|
16
24
|
}
|
|
17
25
|
};
|
|
18
|
-
|
|
26
|
+
exports.unregisterResizeEvents = unregisterResizeEvents;
|
|
27
|
+
const getMouseDownInfo = (event, scrollContainer) => {
|
|
19
28
|
let positionX = 0;
|
|
20
29
|
let positionY = 0;
|
|
21
30
|
let scrollLeft = 0;
|
|
@@ -35,7 +44,8 @@ export const getMouseDownInfo = (event, scrollContainer) => {
|
|
|
35
44
|
scrollTop
|
|
36
45
|
};
|
|
37
46
|
};
|
|
38
|
-
|
|
47
|
+
exports.getMouseDownInfo = getMouseDownInfo;
|
|
48
|
+
const getMouseMoveInfo = (event, mouseDownInfo, scrollContainer) => {
|
|
39
49
|
let displacementX = 0;
|
|
40
50
|
let displacementY = 0;
|
|
41
51
|
if (!event) return {
|
|
@@ -59,11 +69,13 @@ export const getMouseMoveInfo = (event, mouseDownInfo, scrollContainer) => {
|
|
|
59
69
|
displacementY
|
|
60
70
|
};
|
|
61
71
|
};
|
|
62
|
-
|
|
72
|
+
exports.getMouseMoveInfo = getMouseMoveInfo;
|
|
73
|
+
const createObjectWithProperties = (originalObj, properties) => {
|
|
63
74
|
return properties.reduce((result, property) => {
|
|
64
75
|
if (property in originalObj) {
|
|
65
76
|
result[property] = originalObj[property];
|
|
66
77
|
}
|
|
67
78
|
return result;
|
|
68
79
|
}, {});
|
|
69
|
-
};
|
|
80
|
+
};
|
|
81
|
+
exports.createObjectWithProperties = createObjectWithProperties;
|
|
@@ -1,5 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.default = void 0;
|
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
9
|
+
var _ObjectUtils;
|
|
3
10
|
class ObjectUtils {
|
|
4
11
|
static getDataType(data) {
|
|
5
12
|
let type = typeof data;
|
|
@@ -13,7 +20,7 @@ class ObjectUtils {
|
|
|
13
20
|
}
|
|
14
21
|
static isObjectChanged(source, comparison, notIncludeKeys) {
|
|
15
22
|
if (!this.iterable(source)) {
|
|
16
|
-
throw new Error(
|
|
23
|
+
throw new Error(`source should be a Object or Array , but got ${this.getDataType(source)}`);
|
|
17
24
|
}
|
|
18
25
|
if (this.getDataType(source) !== this.getDataType(comparison)) {
|
|
19
26
|
return true;
|
|
@@ -40,12 +47,12 @@ class ObjectUtils {
|
|
|
40
47
|
return !this.isObjectChanged(source, comparison, notIncludeKeys);
|
|
41
48
|
}
|
|
42
49
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return
|
|
50
|
+
_ObjectUtils = ObjectUtils;
|
|
51
|
+
(0, _defineProperty2.default)(ObjectUtils, "isObject", data => {
|
|
52
|
+
return _ObjectUtils.getDataType(data) === 'Object';
|
|
46
53
|
});
|
|
47
|
-
|
|
54
|
+
(0, _defineProperty2.default)(ObjectUtils, "hasProperty", (obj, prop) => {
|
|
48
55
|
if (!obj) return false;
|
|
49
56
|
return Object.prototype.hasOwnProperty.call(obj, prop);
|
|
50
57
|
});
|
|
51
|
-
|
|
58
|
+
var _default = exports.default = ObjectUtils;
|
|
@@ -1,9 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.hasConflict = exports.getRebase = exports.canMerge = void 0;
|
|
8
|
+
var _diff = require("./diff");
|
|
9
|
+
var _objectUtils = _interopRequireDefault(require("./object-utils"));
|
|
10
|
+
var _constants = require("../constants");
|
|
11
|
+
var _constants2 = require("../extension/constants");
|
|
12
|
+
var _helpers = require("../node-id/helpers");
|
|
13
|
+
const hasConflict = content => {
|
|
7
14
|
if (!Array.isArray(content) || content.length === 0) return false;
|
|
8
15
|
let flag = false;
|
|
9
16
|
for (let i = 0; i < content.length; i++) {
|
|
@@ -12,7 +19,7 @@ export const hasConflict = content => {
|
|
|
12
19
|
rebase_type,
|
|
13
20
|
children
|
|
14
21
|
} = element;
|
|
15
|
-
if (REBASE_TYPES.includes(rebase_type)) {
|
|
22
|
+
if (_constants.REBASE_TYPES.includes(rebase_type)) {
|
|
16
23
|
flag = true;
|
|
17
24
|
break;
|
|
18
25
|
} else {
|
|
@@ -24,16 +31,17 @@ export const hasConflict = content => {
|
|
|
24
31
|
}
|
|
25
32
|
return flag;
|
|
26
33
|
};
|
|
34
|
+
exports.hasConflict = hasConflict;
|
|
27
35
|
const getChanges = (masterContent, revisionContent) => {
|
|
28
36
|
const {
|
|
29
37
|
map: masterContentMap,
|
|
30
38
|
ids: masterIds
|
|
31
|
-
} = generateIdMapAndIds(masterContent.children);
|
|
39
|
+
} = (0, _diff.generateIdMapAndIds)(masterContent.children);
|
|
32
40
|
const {
|
|
33
41
|
map: currentContentMap,
|
|
34
42
|
ids: currentIds
|
|
35
|
-
} = generateIdMapAndIds(revisionContent.children);
|
|
36
|
-
const idDiffs = getIdDiffs(masterIds, currentIds);
|
|
43
|
+
} = (0, _diff.generateIdMapAndIds)(revisionContent.children);
|
|
44
|
+
const idDiffs = (0, _diff.getIdDiffs)(masterIds, currentIds);
|
|
37
45
|
let content = [];
|
|
38
46
|
idDiffs.forEach(idDiff => {
|
|
39
47
|
const {
|
|
@@ -44,32 +52,32 @@ const getChanges = (masterContent, revisionContent) => {
|
|
|
44
52
|
if (added) {
|
|
45
53
|
const addedList = value.map(item => ({
|
|
46
54
|
...currentContentMap[item],
|
|
47
|
-
[REBASE_MARK_KEY.MODIFY_TYPE]: MODIFY_TYPE.ADD
|
|
55
|
+
[_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.ADD
|
|
48
56
|
}));
|
|
49
57
|
content.push(...addedList);
|
|
50
58
|
} else if (removed) {
|
|
51
59
|
const deletedList = value.map(item => ({
|
|
52
60
|
...masterContentMap[item],
|
|
53
|
-
[REBASE_MARK_KEY.MODIFY_TYPE]: MODIFY_TYPE.DELETE
|
|
61
|
+
[_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.DELETE
|
|
54
62
|
}));
|
|
55
63
|
content.push(...deletedList);
|
|
56
64
|
} else {
|
|
57
65
|
value.forEach(elementId => {
|
|
58
|
-
if (
|
|
66
|
+
if (_objectUtils.default.isSameObject(masterContentMap[elementId], currentContentMap[elementId])) {
|
|
59
67
|
content.push(currentContentMap[elementId]);
|
|
60
68
|
} else {
|
|
61
69
|
const oldElement = masterContentMap[elementId];
|
|
62
70
|
const currentElement = currentContentMap[elementId];
|
|
63
71
|
let newElement = {
|
|
64
72
|
...currentElement,
|
|
65
|
-
[REBASE_MARK_KEY.MODIFY_TYPE]: MODIFY_TYPE.MODIFY,
|
|
66
|
-
[REBASE_MARK_KEY.OLD_ELEMENT]: oldElement
|
|
73
|
+
[_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.MODIFY,
|
|
74
|
+
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: oldElement
|
|
67
75
|
};
|
|
68
76
|
if (currentElement.type === oldElement.type) {
|
|
69
77
|
const elementType = currentElement.type;
|
|
70
|
-
if ([ELEMENT_TYPE.UNORDERED_LIST, ELEMENT_TYPE.ORDERED_LIST].includes(elementType)) {
|
|
78
|
+
if ([_constants2.ELEMENT_TYPE.UNORDERED_LIST, _constants2.ELEMENT_TYPE.ORDERED_LIST].includes(elementType)) {
|
|
71
79
|
const listContent = getChanges(oldElement, currentElement);
|
|
72
|
-
newElement[REBASE_MARK_KEY.MODIFY_TYPE] = MODIFY_TYPE.CHILDREN_MODIFY;
|
|
80
|
+
newElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE] = _constants.MODIFY_TYPE.CHILDREN_MODIFY;
|
|
73
81
|
newElement['children'] = listContent;
|
|
74
82
|
}
|
|
75
83
|
}
|
|
@@ -81,20 +89,20 @@ const getChanges = (masterContent, revisionContent) => {
|
|
|
81
89
|
return content;
|
|
82
90
|
};
|
|
83
91
|
const getMergeElement = (diffElement, baseElement) => {
|
|
84
|
-
const modifyType = diffElement[REBASE_MARK_KEY.MODIFY_TYPE];
|
|
92
|
+
const modifyType = diffElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE];
|
|
85
93
|
const newElement = {
|
|
86
94
|
...diffElement
|
|
87
95
|
};
|
|
88
|
-
newElement[REBASE_MARK_KEY.MODIFY_TYPE] && delete newElement[REBASE_MARK_KEY.MODIFY_TYPE];
|
|
96
|
+
newElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE] && delete newElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE];
|
|
89
97
|
|
|
90
98
|
// revision does not have this element, master has this element
|
|
91
|
-
if (modifyType === MODIFY_TYPE.DELETE) {
|
|
99
|
+
if (modifyType === _constants.MODIFY_TYPE.DELETE) {
|
|
92
100
|
// base content does not have this element, indicating that it is newly added by master and needs to be retained, and will not be counted as a conflict.
|
|
93
101
|
if (!baseElement) return [newElement];
|
|
94
102
|
|
|
95
103
|
// base content has this element, master modified it, indicating that revision deleted it, and the user manually selected the conflict
|
|
96
|
-
if (!
|
|
97
|
-
newElement[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.MODIFY_DELETE;
|
|
104
|
+
if (!_objectUtils.default.isSameObject(baseElement, diffElement, [_constants.REBASE_MARK_KEY.MODIFY_TYPE])) {
|
|
105
|
+
newElement[_constants.REBASE_MARK_KEY.REBASE_TYPE] = _constants.REBASE_TYPE.MODIFY_DELETE;
|
|
98
106
|
return [newElement];
|
|
99
107
|
}
|
|
100
108
|
|
|
@@ -103,13 +111,13 @@ const getMergeElement = (diffElement, baseElement) => {
|
|
|
103
111
|
}
|
|
104
112
|
|
|
105
113
|
// revision has this element, master does not have this element
|
|
106
|
-
if (modifyType === MODIFY_TYPE.ADD) {
|
|
114
|
+
if (modifyType === _constants.MODIFY_TYPE.ADD) {
|
|
107
115
|
// base content does not have this element, indicating that it is newly added by revision and needs to be retained, and will not be counted as a conflict.
|
|
108
116
|
if (!baseElement) return [newElement];
|
|
109
117
|
|
|
110
118
|
// master deleted it, revision modified it, and the user manually selected the conflict
|
|
111
|
-
if (!
|
|
112
|
-
newElement[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.DELETE_MODIFY;
|
|
119
|
+
if (!_objectUtils.default.isSameObject(baseElement, diffElement, [_constants.REBASE_MARK_KEY.MODIFY_TYPE])) {
|
|
120
|
+
newElement[_constants.REBASE_MARK_KEY.REBASE_TYPE] = _constants.REBASE_TYPE.DELETE_MODIFY;
|
|
113
121
|
return [newElement];
|
|
114
122
|
}
|
|
115
123
|
|
|
@@ -118,68 +126,68 @@ const getMergeElement = (diffElement, baseElement) => {
|
|
|
118
126
|
}
|
|
119
127
|
|
|
120
128
|
// Elements that differ between revision and master
|
|
121
|
-
if (modifyType === MODIFY_TYPE.MODIFY) {
|
|
129
|
+
if (modifyType === _constants.MODIFY_TYPE.MODIFY) {
|
|
122
130
|
const masterElement = {
|
|
123
|
-
...diffElement[REBASE_MARK_KEY.OLD_ELEMENT]
|
|
131
|
+
...diffElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT]
|
|
124
132
|
};
|
|
125
|
-
delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
|
|
133
|
+
delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
|
|
126
134
|
|
|
127
135
|
// revision and master both add a new element, but the content is different. ===》 At present, this situation does not exist, it only exists in the theoretical stage.
|
|
128
136
|
if (!baseElement) {
|
|
129
137
|
return [{
|
|
130
|
-
...replaceNodeId(masterElement),
|
|
131
|
-
[REBASE_MARK_KEY.REBASE_TYPE]: REBASE_TYPE.MODIFY_MODIFY,
|
|
132
|
-
[REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
133
|
-
[REBASE_MARK_KEY.ORIGIN]: REBASE_ORIGIN.OTHER
|
|
138
|
+
...(0, _helpers.replaceNodeId)(masterElement),
|
|
139
|
+
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
140
|
+
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
141
|
+
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.OTHER
|
|
134
142
|
}, {
|
|
135
143
|
...newElement,
|
|
136
|
-
[REBASE_MARK_KEY.REBASE_TYPE]: REBASE_TYPE.MODIFY_MODIFY,
|
|
137
|
-
[REBASE_MARK_KEY.ORIGIN]: REBASE_ORIGIN.MY
|
|
144
|
+
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
145
|
+
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
|
|
138
146
|
}];
|
|
139
147
|
}
|
|
140
148
|
|
|
141
149
|
// master is the same as base, indicating that revision has modified the content
|
|
142
|
-
if (
|
|
150
|
+
if (_objectUtils.default.isSameObject(masterElement, baseElement)) return [newElement];
|
|
143
151
|
|
|
144
152
|
// revision is the same as base, indicating that master has modified the content
|
|
145
|
-
if (
|
|
153
|
+
if (_objectUtils.default.isSameObject(newElement, baseElement)) return [masterElement];
|
|
146
154
|
|
|
147
155
|
// They are all different. Revision and master were modified at the same time. If there is a conflict, the conflict needs to be resolved manually.
|
|
148
156
|
return [{
|
|
149
|
-
...replaceNodeId(masterElement),
|
|
150
|
-
[REBASE_MARK_KEY.REBASE_TYPE]: REBASE_TYPE.MODIFY_MODIFY,
|
|
151
|
-
[REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
152
|
-
[REBASE_MARK_KEY.ORIGIN]: REBASE_ORIGIN.OTHER
|
|
157
|
+
...(0, _helpers.replaceNodeId)(masterElement),
|
|
158
|
+
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
159
|
+
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
160
|
+
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.OTHER
|
|
153
161
|
}, {
|
|
154
162
|
...newElement,
|
|
155
|
-
[REBASE_MARK_KEY.REBASE_TYPE]: REBASE_TYPE.MODIFY_MODIFY,
|
|
156
|
-
[REBASE_MARK_KEY.ORIGIN]: REBASE_ORIGIN.MY
|
|
163
|
+
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
164
|
+
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
|
|
157
165
|
}];
|
|
158
166
|
}
|
|
159
|
-
if (modifyType === MODIFY_TYPE.CHILDREN_MODIFY) {
|
|
167
|
+
if (modifyType === _constants.MODIFY_TYPE.CHILDREN_MODIFY) {
|
|
160
168
|
const masterElement = {
|
|
161
|
-
...diffElement[REBASE_MARK_KEY.OLD_ELEMENT]
|
|
169
|
+
...diffElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT]
|
|
162
170
|
};
|
|
163
|
-
delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
|
|
171
|
+
delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
|
|
164
172
|
|
|
165
173
|
// revision and master both add a new element, but the content is different. ===》 At present, this situation does not exist, it only exists in the theoretical stage.
|
|
166
174
|
if (!baseElement) {
|
|
167
175
|
return [{
|
|
168
|
-
...replaceNodeId(masterElement),
|
|
169
|
-
[REBASE_MARK_KEY.REBASE_TYPE]: REBASE_TYPE.MODIFY_MODIFY,
|
|
170
|
-
[REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
171
|
-
[REBASE_MARK_KEY.ORIGIN]: REBASE_ORIGIN.OTHER
|
|
176
|
+
...(0, _helpers.replaceNodeId)(masterElement),
|
|
177
|
+
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
178
|
+
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
179
|
+
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.OTHER
|
|
172
180
|
}, {
|
|
173
181
|
...newElement,
|
|
174
|
-
[REBASE_MARK_KEY.REBASE_TYPE]: REBASE_TYPE.MODIFY_MODIFY,
|
|
175
|
-
[REBASE_MARK_KEY.ORIGIN]: REBASE_ORIGIN.MY
|
|
182
|
+
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
183
|
+
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
|
|
176
184
|
}];
|
|
177
185
|
}
|
|
178
|
-
if (
|
|
179
|
-
if (
|
|
180
|
-
if (
|
|
181
|
-
if (
|
|
182
|
-
if (
|
|
186
|
+
if (_objectUtils.default.isSameObject(masterElement, baseElement)) return [newElement];
|
|
187
|
+
if (_objectUtils.default.isSameObject(newElement, baseElement)) return [masterElement];
|
|
188
|
+
if (_objectUtils.default.isSameObject(masterElement, newElement, ['type'])) {
|
|
189
|
+
if (_objectUtils.default.isSameObject(masterElement, baseElement, ['type'])) return [newElement];
|
|
190
|
+
if (_objectUtils.default.isSameObject(newElement, baseElement, ['type'])) return [masterElement];
|
|
183
191
|
}
|
|
184
192
|
|
|
185
193
|
// The content of the subnode has changed and needs to be solved manually.
|
|
@@ -189,17 +197,17 @@ const getMergeElement = (diffElement, baseElement) => {
|
|
|
189
197
|
children: childrenContent
|
|
190
198
|
}];
|
|
191
199
|
}
|
|
192
|
-
newElement[REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
|
|
200
|
+
newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
|
|
193
201
|
return [newElement];
|
|
194
202
|
};
|
|
195
203
|
const getMergeContent = (baseContent, diffChanges) => {
|
|
196
204
|
const {
|
|
197
205
|
map: diffChangesContentMap,
|
|
198
206
|
ids: diffChangesContentIds
|
|
199
|
-
} = generateIdMapAndIds(diffChanges);
|
|
207
|
+
} = (0, _diff.generateIdMapAndIds)(diffChanges);
|
|
200
208
|
const {
|
|
201
209
|
map: baseContentMap
|
|
202
|
-
} = generateIdMapAndIds(baseContent.children);
|
|
210
|
+
} = (0, _diff.generateIdMapAndIds)(baseContent.children);
|
|
203
211
|
let content = [];
|
|
204
212
|
diffChangesContentIds.forEach(elementId => {
|
|
205
213
|
const diffElement = diffChangesContentMap[elementId];
|
|
@@ -209,12 +217,12 @@ const getMergeContent = (baseContent, diffChanges) => {
|
|
|
209
217
|
});
|
|
210
218
|
return content;
|
|
211
219
|
};
|
|
212
|
-
|
|
220
|
+
const canMerge = (content, reference) => {
|
|
213
221
|
if (hasConflict(content)) return false;
|
|
214
222
|
if (!Array.isArray(reference) || reference.length === 0) return true;
|
|
215
223
|
const {
|
|
216
224
|
map: referenceMap
|
|
217
|
-
} = generateIdMapAndIds(reference);
|
|
225
|
+
} = (0, _diff.generateIdMapAndIds)(reference);
|
|
218
226
|
let flag = true;
|
|
219
227
|
for (let i = 0; i < content.length; i++) {
|
|
220
228
|
const element = content[i];
|
|
@@ -230,7 +238,8 @@ export const canMerge = (content, reference) => {
|
|
|
230
238
|
}
|
|
231
239
|
return flag;
|
|
232
240
|
};
|
|
233
|
-
|
|
241
|
+
exports.canMerge = canMerge;
|
|
242
|
+
const getRebase = (masterContent, baseContent, revisionContent) => {
|
|
234
243
|
// master no changes, merged directly
|
|
235
244
|
if (masterContent.version === baseContent.version) {
|
|
236
245
|
return {
|
|
@@ -259,4 +268,5 @@ export const getRebase = (masterContent, baseContent, revisionContent) => {
|
|
|
259
268
|
version: Math.max(masterContent.version, revisionContent.version) + 1
|
|
260
269
|
}
|
|
261
270
|
};
|
|
262
|
-
};
|
|
271
|
+
};
|
|
272
|
+
exports.getRebase = getRebase;
|
|
@@ -1,6 +1,41 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
Object.defineProperty(exports, "DiffViewer", {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
get: function () {
|
|
10
|
+
return _sdocDiffViewer.default;
|
|
11
|
+
}
|
|
12
|
+
});
|
|
13
|
+
Object.defineProperty(exports, "PublishedRevisionDiffViewer", {
|
|
14
|
+
enumerable: true,
|
|
15
|
+
get: function () {
|
|
16
|
+
return _publishedRevisionDiffViewer.default;
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
Object.defineProperty(exports, "RevisionDiffViewer", {
|
|
20
|
+
enumerable: true,
|
|
21
|
+
get: function () {
|
|
22
|
+
return _revisionDiffViewer.default;
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
Object.defineProperty(exports, "SDocViewer", {
|
|
26
|
+
enumerable: true,
|
|
27
|
+
get: function () {
|
|
28
|
+
return _sdocViewer.default;
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
Object.defineProperty(exports, "SDocWikiViewer", {
|
|
32
|
+
enumerable: true,
|
|
33
|
+
get: function () {
|
|
34
|
+
return _sdocWikiViewer.default;
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
var _sdocViewer = _interopRequireDefault(require("./sdoc-viewer"));
|
|
38
|
+
var _sdocDiffViewer = _interopRequireDefault(require("./sdoc-diff-viewer"));
|
|
39
|
+
var _revisionDiffViewer = _interopRequireDefault(require("./revision-diff-viewer"));
|
|
40
|
+
var _publishedRevisionDiffViewer = _interopRequireDefault(require("./published-revision-diff-viewer"));
|
|
41
|
+
var _sdocWikiViewer = _interopRequireDefault(require("./sdoc-wiki-viewer"));
|