@worktile/theia 13.0.2 → 13.0.3

package/package.json

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

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

@@ -359,14 +359,12 @@ $control-corner-width: 12px;
 }
 
 .the-temp-table-toolbar-wrap {
-    @include mixins.the-toolbar-layout();
-    z-index: 10;
-    border-radius: 5px;
     display: block;
+    border-radius: 5px;
+    z-index: 10;
 
-    .danger.thy-action:hover {
-        @include mixins.remove-link-hover();
-    }
+    @include mixins.the-toolbar-layout();
+    @include mixins.the-custom-action();
 }
 
 .the-temp-table-col-controls-wrapper {
@@ -384,7 +382,7 @@ $control-corner-width: 12px;
 .table-options {
     background: transparent;
     margin-right: 5px;
-    color: variables.$gray-600;
+    color: variables.$gray-700;
     &:hover {
         background: rgba(variables.$primary, 0.1);
         color: variables.$primary;

package/styles/editor.scss

@@ -227,28 +227,3 @@
     }
 }
 
-.the-block-toolbar {
-    .thy-popover-container {
-        min-width: auto;
-    }
-}
-
-
-.the-block-toolbar-popover {
-    display: flex;
-    padding: 5px 10px;
-    background: variables.$white;
-    box-shadow: variables.$box-shadow;
-
-    .thy-action {
-        &:last-child {
-            margin-right: 0;
-        }
-
-        &.remove-link:hover {
-            @include mixins.remove-link-hover();
-        }
-    }
-}
-
-

package/styles/mixins.scss

@@ -1,11 +1,7 @@
 @use 'ngx-tethys/styles/variables.scss';
+@use "ngx-tethys/styles/basic.scss" as thyBasic;
 @use './variables.scss' as theVariables;
 
-@mixin remove-link-hover {
-    color: variables.$danger;
-    background: hsla(0,100%,73%,.1);
-}
-
 @mixin controlSelected {
     background-color: rgba($color: variables.$primary, $alpha: 0.6);
     border-color: variables.$primary;
@@ -16,31 +12,6 @@
     border-color: variables.$danger;
 }
 
-@mixin the-custom-action() {
-    .thy-action {
-        position: relative;
-        cursor: pointer;
-
-        &:not(:last-child) {
-            margin-right: theVariables.$thy-action-margin-right;
-        }
-    }
-}
-
-@mixin the-action-disabled {
-    .thy-action {
-        &.disabled {
-            cursor: not-allowed;
-            color: variables.$gray-400;
-
-            &:hover {
-                background: transparent;
-                border-radius: unset;
-            }
-        }
-    }
-}
-
 @mixin the-toolbar-disabled {
     &.disabled {
         cursor: not-allowed;
@@ -73,4 +44,40 @@
     & + .thy-divider {
         margin-left: #{theVariables.$thy-action-margin-right} !important;
     }
+}
+
+@mixin the-custom-action() {
+    .thy-action {
+        position: relative;
+        color: variables.$gray-700;
+        cursor: pointer;
+
+        &.action-danger {
+            @include thyBasic.action-variant(variables.$action-color, variables.$danger, rgba(variables.$danger, 0.1));
+        }
+    }
+
+    .thy-action,
+    .the-toolbar-item,
+    .the-toolbar-dropdown-container {
+        &:not(:last-child) {
+            margin-right: theVariables.$thy-action-margin-right;
+        }
+
+        @include the-toolbar-divider-spacing();
+    }
+}
+
+@mixin the-action-disabled {
+    .thy-action {
+        &.disabled {
+            cursor: not-allowed;
+            color: variables.$gray-400;
+
+            &:hover {
+                background: transparent;
+                border-radius: unset;
+            }
+        }
+    }
 }

package/styles/typo.scss

@@ -143,15 +143,8 @@
      ::selection {
         background: theVariables.$selection-background;
     }
-    .thy-action {
-        margin-right: theVariables.$thy-action-margin-right;
-        &:last-child {
-            margin-right: 0;
-        }
-    }
-    .remove-link.thy-action:hover {
-        @include mixins.remove-link-hover();
-    }
+
+    @include mixins.the-custom-action();
 
     // 处理 block-card 图文混排
     .slate-block,