@worktile/theia 13.0.1 → 13.0.2

package/package.json

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

package/plugins/code/code.component.scss

@@ -1,4 +1,6 @@
-@import '~ng-codemirror/index.scss';
+@use 'ngx-tethys/styles/variables.scss';
+@use '~ng-codemirror/index.scss';
+@use '../../styles/mixins.scss' as mixins;
 
 .the-code-container {
     .resize-code-container{
@@ -6,31 +8,31 @@
         font-size: 14px;
         position: relative;
         counter-reset: codeblock-lm;
-        border: 1px solid $gray-300;
+        border: 1px solid variables.$gray-300;
         border-radius: 2px;
-        color: $gray-600;
+        color: variables.$gray-600;
         background: rgba(243, 243, 243, 0.8);
         &:hover{
-            border-color: $primary;
+            border-color: variables.$primary;
         }
     }
     .resize-code-container.readonly, .resize-code-container.focus{
-        border-color: $gray-300;
+        border-color: variables.$gray-300;
       &:hover{
-          border-color: $gray-300;
+          border-color: variables.$gray-300;
       }
     }
 
     .resize-code-container.active {
-        border-color: $primary;
+        border-color: variables.$primary;
         &:hover{
-            border-color: $primary;
+            border-color: variables.$primary;
         }
     }
     .CodeMirror {
         height: 100% !important;
         z-index: 0;
-        color: $gray-600;
+        color: variables.$gray-600;
         background: transparent;
         border: none;
 
@@ -61,7 +63,7 @@
         width: 45px;
         left: 50%;
         transform: translateX(-50%);
-        background: $gray-300;
+        background: variables.$gray-300;
         bottom: -5px;
         border-radius: 5px;
         position: absolute;
@@ -70,7 +72,7 @@
             position: absolute;
             width: 34px;
             height: 1px;
-            background: $white;
+            background: variables.$white;
             left: 50%;
             transform: translateX(-50%);
             top: 2px;
@@ -80,19 +82,10 @@
         }
     }
 
-    @include the-toolbar-active();
+    @include mixins.the-toolbar-active();
 
-    .the-toolbar-dropdown-container {
-        padding: 0;
-        width: 100px;
-    }
-
-    .auto-wrap{
-        margin-right: 5px;
-        .auto-wrap-btn{
-            margin-left: 5px;
-            transform: scale(0.8);
-        }
+    .auto-wrap-btn {
+        transform: scale(0.8);
     }
 }
 

package/plugins/font-size/toolbar-item.component.scss

@@ -1,6 +1,3 @@
-.the-toolbar-dropdown-container.font-size {
-    width: 45px;
-}
 .the-toolbar-dropdown-popover.font-size {
     .thy-popover-container {
         min-width: 90px;
@@ -8,7 +5,7 @@
     .dropdown {
         width: 90px;
     }
-    .action-menu-item {
+    .dropdown-menu-item {
         text-align: center;
     }
 }

package/plugins/image/image.component.scss

@@ -1,3 +1,5 @@
+@use 'ngx-tethys/styles/variables.scss';
+
 .slate-element-image {
     display: block;
 
@@ -32,9 +34,9 @@
                 width: 12px;
                 height: 12px;
                 border-radius: 50%;
-                background-color: $white;
-                box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.13);
-                border: 1px solid $gray-300;
+                background-color: variables.$white;
+                box-shadow: 0 0 4px 0 rgba(variables.$black, 0.13);
+                border: 1px solid variables.$gray-300;
                 z-index: 2;
                 &::before {
                     position: absolute;
@@ -47,7 +49,7 @@
                     margin-left: -4px;
                     margin-top: -4px;
                     border-radius: 50%;
-                    background-color: $primary;
+                    background-color: variables.$primary;
                 }
             }
             .left {
@@ -88,7 +90,7 @@
             }
         }
         .image-profile.outline {
-            border: 1px dashed $primary;
+            border: 1px dashed variables.$primary;
         }
 
         .uploading {
@@ -98,7 +100,7 @@
             right: 0;
             top: 0;
             display: block;
-            background-color: rgba(255, 255, 255, 0.65);
+            background-color: rgba(variables.$white, 0.65);
 
             .percentage {
                 position: absolute;
@@ -107,10 +109,10 @@
                 width: 102px;
                 height: 24px;
                 line-height: 24px;
-                border: 0.5px solid rgba(0, 0, 0, 0.05);
+                border: 0.5px solid rgba(variables.$black, 0.05);
                 border-radius: 3px;
-                box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 4px 0 rgba(0, 0, 0, 0.1);
-                background: $white;
+                box-shadow: 0 1px 1px 0 rgba(variables.$black, 0.05), 0 1px 4px 0 rgba(variables.$black, 0.1);
+                background: variables.$white;
                 color: grey;
                 font-weight: 500;
                 text-align: center;
@@ -157,10 +159,10 @@
                 height: 24px;
                 padding: 0 3px;
                 line-height: 24px;
-                border: 0.5px solid rgba(0, 0, 0, 0.05);
+                border: 0.5px solid rgba(variables.$black, 0.05);
                 border-radius: 3px;
-                box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 4px 0 rgba(0, 0, 0, 0.1);
-                background: $white;
+                box-shadow: 0 1px 1px 0 rgba(variables.$black, 0.05), 0 1px 4px 0 rgba(variables.$black, 0.1);
+                background: variables.$white;
                 color: grey;
                 font-weight: 500;
                 text-align: center;
@@ -176,7 +178,7 @@
             width: 100%;
             height: 280px;
             background: rgb(244, 245, 247);
-            color: $gray-500;
+            color: variables.$gray-500;
         }
     }
 

package/plugins/inline-code/inline-code.component.scss

@@ -1,7 +1,9 @@
+@use 'ngx-tethys/styles/variables.scss';
+
 .slate-element-inline-code{
         margin: 0 4px;
         padding: 2px 3px;
-        border: 1px solid $gray-300;
+        border: 1px solid variables.$gray-300;
         border-radius: 2px;
         font-family: monospace;
         font-size: inherit;
@@ -9,5 +11,5 @@
         line-height: 1;
         word-wrap: break-word;
         text-indent: 0;
-        color: $gray-700;
+        color: variables.$gray-700;
 }

package/plugins/link/link.component.scss

@@ -1,3 +1,5 @@
+@use 'ngx-tethys/styles/variables.scss';
+
 .slate-element-link {
     cursor: pointer;
     &:hover {
@@ -8,7 +10,7 @@
 .the-link-over {
     .thy-popover-container {
         min-width: auto;
-        box-shadow: 0 2px 17px -1px rgba(0, 0, 0, 0.18);
+        box-shadow: 0 2px 17px -1px rgba(variables.$black, 0.18);
         border-radius: 4px;
     }
 
@@ -43,7 +45,7 @@
         display: inline-block;
         width: 1px;
         height: 1rem;
-        background: #ddd;
+        background: variables.$gray-300;
         position: relative;
         margin-right: 15px;
 
@@ -56,7 +58,7 @@
 .the-link-edit {
     .thy-popover-container {
         min-width: auto;
-        box-shadow: 0 2px 17px -1px rgba(0, 0, 0, 0.18);
+        box-shadow: 0 2px 17px -1px rgba(variables.$black, 0.18);
         border-radius: 4px;
     }
 

package/plugins/quick-insert/components/quick-insert.component.scss

@@ -1,3 +1,5 @@
+@use 'ngx-tethys/styles/variables.scss';
+
 .the-quick-insert {
     position: absolute;
     width: calc(100% - 30px);
@@ -11,11 +13,11 @@
         left: -25px;
         top: 3px;
         font-size: 18px !important;
-        color: #CACACA !important;
+        color: variables.$gray-400 !important;
         cursor: pointer;
 
         &:hover {
-            color: $primary !important;
+            color: variables.$primary !important;
         }
     }
 }

package/plugins/quick-insert/components/quick-toolbar/quick-toolbar.component.scss

@@ -1,3 +1,5 @@
+@use 'ngx-tethys/styles/variables.scss';
+
 .the-quick-toolbar {
     width: 200px;
     height: 400px;
@@ -6,11 +8,11 @@
 
     .quick-toolbar-icon {
         margin-right: 8px;
-        color: $gray-600;
+        color: variables.$gray-600;
     }
     .quick-toolbar-name {
         flex: 1;
-        color: $gray-800;
+        color: variables.$gray-800;
     }
 
     &-container {

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

@@ -1,7 +1,10 @@
 @use 'sass:math';
+@use 'ngx-tethys/styles/variables.scss';
+@use '../../../styles/variables.scss' as theVariables;
+@use '../../../styles/mixins.scss' as mixins;
 
 $expand-size: 12px;
-$controls-border: 1px solid $gray-300;
+$controls-border: 1px solid variables.$gray-300;
 $table-scroll-wrap-padding-top: 31px;
 $dot-zIndex: 20;
 $dot-size: 19px;
@@ -50,13 +53,13 @@ $control-corner-width: 12px;
                     bottom: -1px;
                     border-width: 1px;
                     z-index: -1;
-                    border-color: $primary;
+                    border-color: variables.$primary;
                 }
             }
 
             &.selected-cell {
                 &::after {
-                    background: rgba($color: $primary, $alpha: 0.1);
+                    background: rgba($color: variables.$primary, $alpha: 0.1);
                 }
             }
 
@@ -69,8 +72,8 @@ $control-corner-width: 12px;
                     bottom: -1px;
                     border-width: 1px;
                     z-index: -1;
-                    border-color: $danger;
-                    background: rgba($color: $danger, $alpha: 0.1);
+                    border-color: variables.$danger;
+                    background: rgba($color: variables.$danger, $alpha: 0.1);
                 }
             }
         }
@@ -124,7 +127,7 @@ $control-corner-width: 12px;
     }
 
     .the-temp-table-col-controls-wrapper .the-temp-table-col-controls {
-        background: $gray-100;
+        background: variables.$gray-100;
         border-right: $controls-border;
         border-top: $controls-border;
         background-clip: padding-box;
@@ -154,7 +157,7 @@ $control-corner-width: 12px;
                 position: absolute;
                 width: 1px;
                 height: 12px;
-                background: $primary;
+                background: variables.$primary;
                 top: -1px;
             }
             &::before{
@@ -165,15 +168,15 @@ $control-corner-width: 12px;
             }
         }
         &.active {
-            @include controlSelected;
+            @include mixins.controlSelected;
             z-index: 11;
         }
 
         &.dangerous {
-            @include controlDangerous;
+            @include mixins.controlDangerous;
             z-index: 11;
             &::before,  &::after{
-                background: $danger;
+                background: variables.$danger;
             }
         }
     }
@@ -192,7 +195,7 @@ $control-corner-width: 12px;
         height: $control-corner-width;
         box-sizing: border-box;
         border: $controls-border;
-        background: $gray-100;
+        background: variables.$gray-100;
         padding: 0;
         border-bottom: none;
         border-right: none;
@@ -212,14 +215,14 @@ $control-corner-width: 12px;
     &.active {
         z-index: 1;
         .the-temp-table-corner-button {
-            @include controlSelected;
+            @include mixins.controlSelected;
         }
     }
 
     &.dangerous {
         z-index: 1;
         .the-temp-table-corner-button {
-            @include controlDangerous;
+            @include mixins.controlDangerous;
         }
     }
 }
@@ -263,13 +266,13 @@ $control-corner-width: 12px;
     &:not(.disabled) {
         &:hover:after,
         &:hover:before {
-            background-color: $white !important;
+            background-color: variables.$white !important;
             transform: scale(1);
         }
 
         &:hover:after {
-            box-shadow: inset $dot-padding-top 0 0 0 $primary, inset (-$dot-padding-top) 0 0 0 $primary,
-                inset 0 (-$dot-shadow-top) 0 0 $primary, inset 0 $dot-shadow-top 0 0 $primary !important;
+            box-shadow: inset $dot-padding-top 0 0 0 variables.$primary, inset (-$dot-padding-top) 0 0 0 variables.$primary,
+                inset 0 (-$dot-shadow-top) 0 0 variables.$primary, inset 0 $dot-shadow-top 0 0 variables.$primary !important;
             border-radius: 4px;
         }
 
@@ -280,7 +283,7 @@ $control-corner-width: 12px;
 
     .the-temp-table-controls-insert-line {
         position: absolute;
-        background-color: $primary;
+        background-color: variables.$primary;
         z-index: $dot-zIndex;
 
         &[data-dot-type='column'] {
@@ -315,11 +318,11 @@ $control-corner-width: 12px;
         .the-temp-table-controls-button {
             display: block;
             outline: none;
-            background-color: $gray-100;
+            background-color: variables.$gray-100;
             box-sizing: border-box;
             height: 42px;
             width: $control-width;
-            border: 1px solid $gray-300;
+            border: 1px solid variables.$gray-300;
             border-right: none;
             padding: 0;
             cursor: pointer;
@@ -329,7 +332,7 @@ $control-corner-width: 12px;
             z-index: 1;
             .the-temp-table-controls-button,
             .the-temp-table-numbered-controls-button {
-                @include controlSelected;
+                @include mixins.controlSelected;
             }
         }
 
@@ -338,7 +341,7 @@ $control-corner-width: 12px;
 
             .the-temp-table-controls-button,
             .the-temp-table-numbered-controls-button {
-                @include controlDangerous;
+                @include mixins.controlDangerous;
             }
         }
     }
@@ -356,21 +359,13 @@ $control-corner-width: 12px;
 }
 
 .the-temp-table-toolbar-wrap {
-    @include the-toolbar-layout();
+    @include mixins.the-toolbar-layout();
     z-index: 10;
     border-radius: 5px;
     display: block;
 
-    .danger.thy-icon-nav-link:hover {
-        @include remove-link-hover();
-    }
-
-    .thy-icon-nav .thy-icon-nav-link {
-        margin-right: $thy-icon-nav-link-margin-right;
-
-        &:last-child {
-            margin-right: 0;
-        }
+    .danger.thy-action:hover {
+        @include mixins.remove-link-hover();
     }
 }
 
@@ -389,23 +384,20 @@ $control-corner-width: 12px;
 .table-options {
     background: transparent;
     margin-right: 5px;
-    color: $gray-600;
+    color: variables.$gray-600;
     &:hover {
-        background: rgba($primary, 0.1);
-        color: $primary;
+        background: rgba(variables.$primary, 0.1);
+        color: variables.$primary;
     }
 }
 .table-options-active {
-    background: rgba($primary, 0.1);
-    color: $primary;
+    background: rgba(variables.$primary, 0.1);
+    color: variables.$primary;
 }
 .table-options-pannel {
     .thy-popover-container {
         min-width: 200px;
     }
-    .action-menu {
-        width: 200px;
-    }
 }
 
 .the-temp-numbered-column-container {
@@ -418,7 +410,7 @@ $control-corner-width: 12px;
         margin-left: 10px;
         cursor: pointer;
         .the-temp-table-numbered-controls-button {
-            background-color: $gray-100;
+            background-color: variables.$gray-100;
             border: $controls-border;
             border-right: none;
         }
@@ -447,7 +439,7 @@ $control-corner-width: 12px;
     }
 }
 
-  
+
 .the-editor-readonly{
     .the-temp-table-row-controls, .the-temp-table-col-controls{
         cursor: default;

package/styles/editor.scss

@@ -1,8 +1,10 @@
-$thy-icon-nav-link-margin-right: 5px;
+@use 'ngx-tethys/styles/variables.scss';
+@use './variables.scss' as theVariables;
+@use './mixins.scss' as mixins;
 
 .the-editor {
     display: block;
-    border: 1px solid $gray-200;
+    border: 1px solid variables.$gray-200;
     border-radius: 3px;
     position: relative;
     max-width: 100%;
@@ -36,7 +38,7 @@ $thy-icon-nav-link-margin-right: 5px;
                 cursor: auto;
             }
             input[type='checkbox']:not(:checked):hover {
-                border-color: $gray-300;
+                border-color: variables.$gray-300;
             }
         }
         .the-todo-item-selectable {
@@ -52,7 +54,7 @@ $thy-icon-nav-link-margin-right: 5px;
                 cursor: auto;
             }
             input[type='checkbox']:not(:checked):hover {
-                border-color: $gray-300;
+                border-color: variables.$gray-300;
             }
         }
     }
@@ -122,7 +124,7 @@ $thy-icon-nav-link-margin-right: 5px;
     [the-code-line] {
         margin: 0 4px;
         padding: 2px 3px;
-        border: 1px solid $gray-300;
+        border: 1px solid variables.$gray-300;
         border-radius: 2px;
         font-family: monospace;
         font-size: inherit;
@@ -130,7 +132,7 @@ $thy-icon-nav-link-margin-right: 5px;
         line-height: inherit;
         word-wrap: break-word;
         text-indent: 0;
-        color: $gray-700;
+        color: variables.$gray-700;
     }
 
     .leaf-with-placeholder {
@@ -159,7 +161,7 @@ $thy-icon-nav-link-margin-right: 5px;
     @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;
+            line-height: theVariables.$font-size-line-height;
         }
         .slate-element-list-item {
             &.font-size-#{$size} {
@@ -209,74 +211,8 @@ $thy-icon-nav-link-margin-right: 5px;
     }
 }
 
-.the-nav-split-line {
-    &.horizontal {
-        margin: 5px 20px;
-        display: block;
-        border-top: 1px solid $gray-200;
-    }
-    &.vertical {
-        width: 1px;
-        height: 1rem;
-        margin-top: 0.45rem;
-        margin-right: 5px;
-        background: $gray-300;
-    }
-}
-
-@mixin controlSelected {
-    background-color: rgba($color: $primary, $alpha: 0.6);
-    border-color: $primary;
-}
-
-@mixin controlDangerous {
-    background-color: rgba($color: $danger, $alpha: 0.6);
-    border-color: $danger;
-}
-
-@mixin custom-thy-icon-nav() {
-    .thy-icon-nav .thy-icon-nav-link {
-        position: relative;
-        cursor: pointer;
-        &:not(:last-child) {
-            margin-right: $thy-icon-nav-link-margin-right;
-        }
-    }
-}
-
-@mixin thy-icon-nav-disabled {
-    .thy-icon-nav .thy-icon-nav-link {
-        &.disabled {
-            cursor: not-allowed;
-            color: $gray-400;
-            &:hover {
-                background: transparent;
-                border-radius: unset;
-            }
-        }
-    }
-}
-
-@mixin the-toolbar-disabled {
-    &.disabled {
-        cursor: not-allowed;
-        opacity: 0.25;
-
-        .thy-icon-nav-link {
-            pointer-events: none;
-        }
-    }
-}
-
-@mixin the-toolbar-layout {
-    position: absolute;
-    padding: 5px 10px;
-    background: $white;
-    box-shadow: $box-shadow;
-}
-
 .the-code-block-operation {
-    @include the-toolbar-layout();
+    @include mixins.the-toolbar-layout();
     display: flex;
     transform: translateY(-100%);
     left: 0;
@@ -289,9 +225,6 @@ $thy-icon-nav-link-margin-right: 5px;
             border: none;
         }
     }
-    .thy-icon-nav {
-        flex-wrap: nowrap;
-    }
 }
 
 .the-block-toolbar {
@@ -304,28 +237,18 @@ $thy-icon-nav-link-margin-right: 5px;
 .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;
+    background: variables.$white;
+    box-shadow: variables.$box-shadow;
 
+    .thy-action {
         &:last-child {
             margin-right: 0;
         }
 
         &.remove-link:hover {
-            @include remove-link-hover();
+            @include mixins.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 {
-        color: $primary;
-        background: rgba($primary, 0.1);
-        border-radius: 0.25rem;
-        visibility: visible !important;
-    }
-}
+