fix: fix PopupCloseIconPosition type (#8480 )

Co-authored-by: zhengchuangchuang <zhengchuangchuang@kuaishou.com>
fix(Notify): Type 'Timeout' is not assignable to type 'number' (#8477 )
2025-04-06 03:57:59 +08:00 · 2021-04-08 17:13:10 +08:00 · 2021-04-08 17:09:34 +08:00 · 2021-04-08 14:16:46 +08:00 · 2021-04-08 10:14:34 +08:00
7 changed files with 38 additions and 36 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -9,7 +9,7 @@ jobs:
    - uses: actions/checkout@v1
    - uses: actions/setup-node@v1
      with:
-        node-version: '12.x'
+        node-version: '14.x'

    - name: Install dependencies
      uses: bahmutov/npm-install@v1
@ -23,7 +23,7 @@ jobs:
    - uses: actions/checkout@v1
    - uses: actions/setup-node@v1
      with:
-        node-version: '12.x'
+        node-version: '14.x'

    - name: Install dependencies
      uses: bahmutov/npm-install@v1
@ -42,7 +42,7 @@ jobs:
    - uses: actions/checkout@v1
    - uses: actions/setup-node@v1
      with:
-        node-version: '12.x'
+        node-version: '14.x'

    - name: Install dependencies
      uses: bahmutov/npm-install@v1
--- a/src/action-bar-icon/index.less
+++ b/src/action-bar-icon/index.less
@ -10,7 +10,7 @@
  font-size: @action-bar-icon-font-size;
  line-height: 1;
  text-align: center;
-  background-color: @white;
+  background-color: @action-bar-icon-background-color;
  cursor: pointer;

  &:active {
@ -18,8 +18,7 @@
  }

  &__icon {
-    width: 1em;
-    margin: 0 auto 5px;
+    margin: 0 auto @padding-base;
    color: @action-bar-icon-color;
    font-size: @action-bar-icon-size;
  }
--- a/src/action-bar-icon/var.less
+++ b/src/action-bar-icon/var.less
@ -7,3 +7,4 @@
@action-bar-icon-font-size: @font-size-xs;
@action-bar-icon-active-color: @active-color;
@action-bar-icon-text-color: @gray-7;
+@action-bar-icon-background-color: @white;
--- a/src/action-bar/README.md
+++ b/src/action-bar/README.md
@ -136,17 +136,18 @@ Use `badge` prop to show badge in icon.

 How to use: [Custom Theme](#/en-US/theme).

-| Name                             | Default Value      | Description |
-| -------------------------------- | ------------------ | ----------- |
-| @action-bar-background-color     | `@white`           | -           |
-| @action-bar-height               | `50px`             | -           |
-| @action-bar-icon-width           | `48px`             | -           |
-| @action-bar-icon-height          | `100%`             | -           |
-| @action-bar-icon-color           | `@text-color`      | -           |
-| @action-bar-icon-size            | `18px`             | -           |
-| @action-bar-icon-font-size       | `@font-size-xs`    | -           |
-| @action-bar-icon-active-color    | `@active-color`    | -           |
-| @action-bar-icon-text-color      | `@gray-7`          | -           |
-| @action-bar-button-height        | `40px`             | -           |
-| @action-bar-button-warning-color | `@gradient-orange` | -           |
-| @action-bar-button-danger-color  | `@gradient-red`    | -           |
+| Name                              | Default Value      | Description |
+| --------------------------------- | ------------------ | ----------- |
+| @action-bar-background-color      | `@white`           | -           |
+| @action-bar-height                | `50px`             | -           |
+| @action-bar-icon-width            | `48px`             | -           |
+| @action-bar-icon-height           | `100%`             | -           |
+| @action-bar-icon-color            | `@text-color`      | -           |
+| @action-bar-icon-size             | `18px`             | -           |
+| @action-bar-icon-font-size        | `@font-size-xs`    | -           |
+| @action-bar-icon-active-color     | `@active-color`    | -           |
+| @action-bar-icon-text-color       | `@gray-7`          | -           |
+| @action-bar-icon-background-color | `@white`           | -           |
+| @action-bar-button-height         | `40px`             | -           |
+| @action-bar-button-warning-color  | `@gradient-orange` | -           |
+| @action-bar-button-danger-color   | `@gradient-red`    | -           |
--- a/src/action-bar/README.zh-CN.md
+++ b/src/action-bar/README.zh-CN.md
@ -140,17 +140,18 @@ export default {

 组件提供了下列 Less 变量，可用于自定义样式，使用方法请参考[主题定制](#/zh-CN/theme)。

-| 名称                             | 默认值             | 描述 |
-| -------------------------------- | ------------------ | ---- |
-| @action-bar-background-color     | `@white`           | -    |
-| @action-bar-height               | `50px`             | -    |
-| @action-bar-icon-width           | `48px`             | -    |
-| @action-bar-icon-height          | `100%`             | -    |
-| @action-bar-icon-color           | `@text-color`      | -    |
-| @action-bar-icon-size            | `18px`             | -    |
-| @action-bar-icon-font-size       | `@font-size-xs`    | -    |
-| @action-bar-icon-active-color    | `@active-color`    | -    |
-| @action-bar-icon-text-color      | `@gray-7`          | -    |
-| @action-bar-button-height        | `40px`             | -    |
-| @action-bar-button-warning-color | `@gradient-orange` | -    |
-| @action-bar-button-danger-color  | `@gradient-red`    | -    |
+| 名称                              | 默认值             | 描述 |
+| --------------------------------- | ------------------ | ---- |
+| @action-bar-background-color      | `@white`           | -    |
+| @action-bar-height                | `50px`             | -    |
+| @action-bar-icon-width            | `48px`             | -    |
+| @action-bar-icon-height           | `100%`             | -    |
+| @action-bar-icon-color            | `@text-color`      | -    |
+| @action-bar-icon-size             | `18px`             | -    |
+| @action-bar-icon-font-size        | `@font-size-xs`    | -    |
+| @action-bar-icon-active-color     | `@active-color`    | -    |
+| @action-bar-icon-text-color       | `@gray-7`          | -    |
+| @action-bar-icon-background-color | `@white`           | -    |
+| @action-bar-button-height         | `40px`             | -    |
+| @action-bar-button-warning-color  | `@gradient-orange` | -    |
+| @action-bar-button-danger-color   | `@gradient-red`    | -    |
--- a/src/notify/function-call.tsx
+++ b/src/notify/function-call.tsx
@ -59,7 +59,7 @@ function Notify(options: NotifyMessage | NotifyOptions) {
  clearTimeout(timer);

  if (options.duration! > 0) {
-    timer = setTimeout(Notify.clear, options.duration);
+    timer = window.setTimeout(Notify.clear, options.duration);
  }

  return instance;
--- a/src/popup/Popup.tsx
+++ b/src/popup/Popup.tsx
@ -31,7 +31,7 @@ export type PopupPosition = 'top' | 'left' | 'bottom' | 'right' | 'center' | '';
 export type PopupCloseIconPosition =
  | 'top-left'
  | 'top-right'
-  | 'botttom-left'
+  | 'bottom-left'
  | 'bottom-right';

 const [name, bem] = createNamespace('popup');
Author	SHA1	Message	Date
郑闯闯	15d901ad6a	fix: fix PopupCloseIconPosition type (#8480 ) Co-authored-by: zhengchuangchuang <zhengchuangchuang@kuaishou.com>	2021-04-08 17:13:10 +08:00
yangwenkai123	9849c76f72	fix(Notify): Type 'Timeout' is not assignable to type 'number' (#8477 ) Co-authored-by: yangwk <paul>	2021-04-08 17:09:34 +08:00
neverland	6c1b7e542f	build: using node 14 (#8475 )	2021-04-08 14:16:46 +08:00
neverland	2a90cdbd71	style(AcitonBar): add @action-bar-icon-background-color less var (#8474 )	2021-04-08 10:14:34 +08:00