fix(comp:header): remove breakground-color (#1392)

IDuxFE · Jan 9, 2023 · 55bb758 · 55bb758
1 parent 81ff47e
commit 55bb758
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 17 deletions.
diff --git a/packages/cdk/breakpoint/src/breakpoints.ts b/packages/cdk/breakpoint/src/breakpoints.ts
@@ -15,7 +15,7 @@ import { useMediaQuery } from './mediaQuery'
 
 export const BREAKPOINTS_KEYS = ['xs', 'sm', 'md', 'lg', 'xl'] as const
 
-export type BreakpointKey = typeof BREAKPOINTS_KEYS[number]
+export type BreakpointKey = (typeof BREAKPOINTS_KEYS)[number]
 
 export const BREAKPOINTS: Record<BreakpointKey, string> = {
   xs: '(max-width: 599.99px)',

diff --git a/packages/cdk/resize/src/resizable/types.ts b/packages/cdk/resize/src/resizable/types.ts
@@ -72,7 +72,7 @@ export type ResizableHandleInstance = InstanceType<DefineComponent<ResizableHand
 
 export type ResizableOptions = Omit<ResizablePublicProps, 'disabled' | 'is' | 'handlers'>
 
-export type ResizableHandlePlacement = typeof allHandlePlacements[number]
+export type ResizableHandlePlacement = (typeof allHandlePlacements)[number]
 
 export interface ResizePosition {
   width: number

diff --git a/packages/components/collapse/style/index.less b/packages/components/collapse/style/index.less
@@ -71,10 +71,6 @@
     .@{collapse-prefix}-panel {
       border-color: transparent;
 
-      .@{header-prefix} {
-        background-color: transparent;
-      }
-
       &-content {
         border-color: transparent;
         background-color: var(--ix-background-color);

diff --git a/packages/components/header/style/index.less b/packages/components/header/style/index.less
@@ -3,7 +3,7 @@
 
 .@{header-prefix} {
   .reset-component-new();
-  .reset-color(@header-color);
+  .reset-color(@header-color, transparent);
 
   position: relative;
   display: flex;

diff --git a/packages/components/loading-bar/src/types.ts b/packages/components/loading-bar/src/types.ts
@@ -11,7 +11,7 @@ import type { DefineComponent, PropType } from 'vue'
 
 export const STATUS_TYPE = ['loading', 'finish', 'error'] as const
 
-export type StatusType = typeof STATUS_TYPE[number]
+export type StatusType = (typeof STATUS_TYPE)[number]
 
 export interface LoadingBarOptions {
   mask?: boolean

diff --git a/packages/components/notification/src/types.ts b/packages/components/notification/src/types.ts
@@ -59,8 +59,8 @@ export const notificationProviderProps = {
   offset: [String, Number, Array] as PropType<string | number | (number | string)[]>,
 } as const
 
-export type NotificationType = typeof notificationType[number]
-export type NotificationPlacement = typeof notificationPlacement[number]
+export type NotificationType = (typeof notificationType)[number]
+export type NotificationPlacement = (typeof notificationPlacement)[number]
 export type NotificationNodePropKey = 'title' | 'content' | 'footer'
 export type NotificationProps = ExtractInnerPropTypes<typeof notificationProps>
 export type NotificationPublicProps = ExtractPublicPropTypes<typeof notificationProps>

diff --git a/packages/components/pagination/style/index.less b/packages/components/pagination/style/index.less
@@ -116,14 +116,14 @@
       }
     }
 
-    &:hover {
+    &:hover:not(&-disabled) {
       color: @pagination-color-hover;
       .@{pagination-prefix}-item-content {
         background-color: @pagination-background-color-hover;
       }
     }
 
-    &&-active {
+    &&-active:not(&-disabled) {
       color: @pagination-color-active;
       .@{pagination-prefix}-item-content {
         background-color: @pagination-background-color-active;
@@ -133,9 +133,6 @@
     &&-disabled {
       cursor: not-allowed;
       color: @pagination-color-disabled;
-      .@{pagination-prefix}-item-content {
-        background-color: @pagination-background-color;
-      }
     }
 
     &&-active&-disabled &-content {

diff --git a/packages/pro/search/src/types/searchFields.ts b/packages/pro/search/src/types/searchFields.ts
@@ -27,7 +27,7 @@ interface SearchFieldBase<V = unknown> {
 }
 
 export const searchDataTypes = ['select', 'input', 'datePicker', 'dateRangePicker', 'custom'] as const
-export type SearchDataTypes = typeof searchDataTypes[number]
+export type SearchDataTypes = (typeof searchDataTypes)[number]
 
 export interface SelectSearchField extends SearchFieldBase<VKey | VKey[]> {
   type: 'select'

diff --git a/packages/pro/tree/style/index.less b/packages/pro/tree/style/index.less
@@ -9,7 +9,7 @@
   display: flex;
   flex-direction: column;
   overflow: hidden;
-  transition: width @transition-duration-base;
+  transition: width var(--ix-transition-duration-medium) var(--ix-ease-in-out);
 
   &-header-wrapper,
   &-search-wrapper {
@@ -27,6 +27,8 @@
   }
 
   &-header-wrapper {
+    min-height: 40px;
+
     .@{icon-prefix} {
       font-size: @pro-tree-header-wrapper-icon-font-size;
       line-height: calc(@pro-tree-header-wrapper-icon-font-size + var(--ix-line-height-gutter));