@worktile/theia 2.3.0-next.1 → 2.3.0

package/interfaces/editor.d.ts

@@ -5,7 +5,6 @@ import { ElementOptionsInfo } from './valid-children-types';
 import { Predicate } from '../utils/match';
 import { ToolbarOption } from './toolbar';
 import { FontSizes } from '../constants/node-types';
-import { CustomElement } from '../custom-types';
 export interface TheEditor extends AngularEditor, HistoryEditor {
     renderElement: (element: Element) => ViewType;
     renderLeaf: (text: Text) => ViewType;
@@ -75,10 +74,10 @@ export interface TheOptions {
     placeholderDecorate?: (editor: Editor) => SlatePlaceholder[];
     inlineToobarVisible?: boolean;
     quickInsertVisible?: boolean;
-    dragAndDrop?: boolean;
     scrollContainer?: string;
     maxHeight?: number;
     fontSize?: FontSizes;
+    richMedia?: boolean;
     toolbar?: ToolbarOption;
     disablePlugins?: string[];
     extraElementOptions?: ElementOptionsInfo[];
@@ -123,7 +122,3 @@ export interface DomEventDataInfo {
     text?: string;
     json?: Node[];
 }
-export interface DragNode {
-    node: CustomElement;
-    path: Path;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worktile/theia",
-  "version": "2.3.0-next.1",
+  "version": "2.3.0",
   "description": "theia editor",
   "author": "YanDong <nanianqiumo@foxmail.com>",
   "homepage": "https://github.com/atinc/theia#readme",

package/plugins/image/image.component.scss

@@ -192,10 +192,3 @@
         }
     }
 }
-
-.the-image-toolbar {
-
-    .thy-icon-nav .thy-icon-nav-link {
-        margin-right: 5px;
-    }
-}

package/plugins/table/components/table.component.scss

@@ -340,11 +340,11 @@ $control-corner-width: 12px;
     display: block;
 
     .danger.thy-icon-nav-link:hover {
-        color: $danger;
+        @include remove-link-hover();
     }
 
     .thy-icon-nav .thy-icon-nav-link {
-        margin-right: 5px;
+        margin-right: $thy-icon-nav-link-margin-right;
 
         &:last-child {
             margin-right: 0;

package/styles/editor.scss

@@ -61,139 +61,140 @@ $thy-icon-nav-link-margin-right: 5px;
             overflow-y: scroll;
         }
     }
-
-    // list style
-    ul,
-    ol,
-    li {
-        list-style: inherit;
-    }
-
-    ol {
-        list-style-type: decimal;
-
-        ol {
-            list-style-type: lower-alpha;
-
-            ol {
-                list-style-type: lower-roman;
-            }
-        }
-    }
-
-    ul {
-        list-style-type: disc;
-
-        ul {
-            list-style-type: circle;
-
-            ul {
-                list-style-type: square;
-            }
-        }
-    }
-
-    [the-underlined][the-strike] {
-        text-decoration: underline line-through;
-    }
-
-    [the-strike] {
-        text-decoration: line-through;
-    }
-
-    [the-underlined] {
-        text-decoration: underline;
-    }
-
-    [the-italic] {
-        font-style: italic;
-    }
-
-    [the-bold] {
-        font-weight: bold;
-    }
-
-    [the-code-line] {
-        margin: 0 4px;
-        padding: 2px 3px;
-        border: 1px solid $gray-300;
-        border-radius: 2px;
-        font-family: monospace;
-        font-size: inherit;
-        background-color: rgba(243, 243, 243, 0.8);
-        line-height: inherit;
-        word-wrap: break-word;
-        text-indent: 0;
-        color: $gray-700;
-    }
-
-    .leaf-with-placeholder {
-        background-color: $white;
-
-        &[data-slate-leaf=true] {
-            width: 12em;;
-        }
-    }
-    [data-slate-placeholder] {
-        color: initial;
-        font-weight: initial;
-        font-style: initial;
-        text-decoration: initial;
-        background-color: initial;
-    }
-
-    // list: fontSize, li marginLeft, multiDigit li marginLeft
-    @each $size, $liMl, $liMultiDigitMl in (12, 13, 14, 15, 16, 18, 20, (24 null 35px), (28 null 42px), (32 33px 50px), (40 40px 62px), (48 50px 78px)) {
-        [the-font-size="#{$size}"] {
-            font-size: #{$size}px;
-            line-height: $font-size-line-height;
-        }
-        .slate-element-list-item {
-            &.font-size-#{$size} {
-                &::marker {
-                    font-size: #{$size}px;
-                }
-            }
-        }
-        .slate-element-numbered-list {
-            .slate-element-list-item {
-                &.font-size-#{$size} {
-                    margin-left: $liMl;
-
-                    &[data-multi-digit] {
-                        margin-left: $liMultiDigitMl;
-                    }
-                }
-            }
-        }
-        .slate-element-bulleted-list {
-            .slate-element-list-item {
-                &.font-size-#{$size} {
-                    @if $size == 40 {
-                        margin-left: 2.2em;
-                    }
-                    @if $size == 48 {
-                        margin-left: 2.5em;
-                    }
-                }
-            }
-        }
-    }
-
-    // indent
-    @for $i from 1 through 17 {
-        [the-indent="#{$i}"] {
-            padding-left: $i * 2em;
-        }
-        // list
-        ol[the-level="#{$i}"],
-        ul[the-level="#{$i}"] {
-            margin-left: $i * 2em;
-        }
-        .the-check-item[the-level="#{$i}"] {
-            padding-left: calc(#{$i * 2em} + 2em);
-        }
-    }
+}
+.the-editor-typo{
+     // list style
+     ul,
+     ol,
+     li {
+         list-style: inherit;
+     }
+
+     ol {
+         list-style-type: decimal;
+
+         ol {
+             list-style-type: lower-alpha;
+
+             ol {
+                 list-style-type: lower-roman;
+             }
+         }
+     }
+
+     ul {
+         list-style-type: disc;
+
+         ul {
+             list-style-type: circle;
+
+             ul {
+                 list-style-type: square;
+             }
+         }
+     }
+
+     [the-underlined][the-strike] {
+         text-decoration: underline line-through;
+     }
+
+     [the-strike] {
+         text-decoration: line-through;
+     }
+
+     [the-underlined] {
+         text-decoration: underline;
+     }
+
+     [the-italic] {
+         font-style: italic;
+     }
+
+     [the-bold] {
+         font-weight: bold;
+     }
+
+     [the-code-line] {
+         margin: 0 4px;
+         padding: 2px 3px;
+         border: 1px solid $gray-300;
+         border-radius: 2px;
+         font-family: monospace;
+         font-size: inherit;
+         background-color: rgba(243, 243, 243, 0.8);
+         line-height: inherit;
+         word-wrap: break-word;
+         text-indent: 0;
+         color: $gray-700;
+     }
+
+     .leaf-with-placeholder {
+         background-color: $white;
+
+         &[data-slate-leaf=true] {
+             width: 12em;;
+         }
+     }
+     [data-slate-placeholder] {
+         color: initial;
+         font-weight: initial;
+         font-style: initial;
+         text-decoration: initial;
+         background-color: initial;
+     }
+
+     // list: fontSize, li marginLeft, multiDigit li marginLeft
+     @each $size, $liMl, $liMultiDigitMl in (12, 13, 14, 15, 16, 18, 20, (24 null 35px), (28 null 42px), (32 33px 50px), (40 40px 62px), (48 50px 78px)) {
+         [the-font-size="#{$size}"] {
+             font-size: #{$size}px;
+             line-height: $font-size-line-height;
+         }
+         .slate-element-list-item {
+             &.font-size-#{$size} {
+                 &::marker {
+                     font-size: #{$size}px;
+                 }
+             }
+         }
+         .slate-element-numbered-list {
+             .slate-element-list-item {
+                 &.font-size-#{$size} {
+                     margin-left: $liMl;
+
+                     &[data-multi-digit] {
+                         margin-left: $liMultiDigitMl;
+                     }
+                 }
+             }
+         }
+         .slate-element-bulleted-list {
+             .slate-element-list-item {
+                 &.font-size-#{$size} {
+                     @if $size == 40 {
+                         margin-left: 2.2em;
+                     }
+                     @if $size == 48 {
+                         margin-left: 2.5em;
+                     }
+                 }
+             }
+         }
+     }
+
+     // indent
+     @for $i from 1 through 17 {
+         [the-indent="#{$i}"] {
+             padding-left: $i * 2em;
+         }
+         // list
+         ol[the-level="#{$i}"],
+         ul[the-level="#{$i}"] {
+             margin-left: $i * 2em;
+         }
+         .the-check-item[the-level="#{$i}"] {
+             padding-left: calc(#{$i * 2em} + 2em);
+         }
+     }
 }
 
 .the-nav-split-line {
@@ -281,6 +282,32 @@ $thy-icon-nav-link-margin-right: 5px;
     }
 }
 
+.the-block-toolbar {
+    .thy-popover-container {
+        min-width: auto;
+    }
+}
+
+
+.the-block-toolbar-popover {
+    display: flex;
+    padding: 5px 10px;
+    background: $white;
+    box-shadow: $box-shadow;
+
+    .thy-icon-nav .thy-icon-nav-link {
+        margin-right: $thy-icon-nav-link-margin-right;
+
+        &:last-child {
+            margin-right: 0;
+        }
+
+        &.remove-link:hover {
+            @include remove-link-hover();
+        }
+    }
+}
+
 @mixin the-toolbar-active {
     .thy-icon-nav-link.thy-popover-origin-active,
     .the-toolbar-dropdown-container.thy-popover-origin-active .thy-icon-nav-link {

package/styles/index.scss

@@ -18,5 +18,4 @@
 @import '../plugins/quick-insert/components/quick-insert.component.scss';
 @import '../plugins/quick-insert/components/quick-toolbar/quick-toolbar.component.scss';
 @import '../plugins/font-size/toolbar-item.component.scss';
-@import '../plugins/inline-code/inline-code.component.scss';
-@import '../plugins/dnd/component/dnd.component.scss'
+@import '../plugins/inline-code/inline-code.component.scss';

package/styles/typo.scss

@@ -19,7 +19,13 @@ $nav-item-margin: 5px;
 $selection-background: rgba($color: $primary, $alpha: 0.3);
 $font-size-line-height: 1.5;
 
+@mixin remove-link-hover {
+    color: $danger;
+    background: hsla(0,100%,73%,.1);
+}
+
 .the-editor-typo {
+    display: flow-root;
     font-size: $the-font-size-base;
     min-height: 250px;
     padding: 28px 30px;
@@ -112,6 +118,9 @@ $font-size-line-height: 1.5;
         text-indent: 0;
         color: $gray-700;
     }
+    .slate-element-hr{
+        display: block;
+    }
     .slate-element-hr,
     .slate-element-code,
     .slate-element-image,
@@ -168,7 +177,7 @@ $font-size-line-height: 1.5;
         }
     }
     .remove-link.thy-icon-nav-link:hover {
-        color: $danger;
+        @include remove-link-hover();
     }
 
     // 处理 block-card 图文混排
@@ -195,6 +204,7 @@ $font-size-line-height: 1.5;
         }
         &[layout="wrap-left"] {
             float: left;
+            z-index: 1;
 
             .image-content {
                 margin: 0 12px 0 auto;
@@ -202,6 +212,7 @@ $font-size-line-height: 1.5;
         }
         &[layout="wrap-right"] {
             float: right;
+            z-index: 1;
 
             .image-content {
                 margin: 0 auto 0 12px;

package/utils/index.d.ts

@@ -4,3 +4,5 @@ export * from './get-toolbar-class';
 export * from './create-empty-paragraph';
 export * from './common';
 export * from './is-clean-empty-paragraph';
+export * from './merge-element-options';
+export * from './dom';