Merge branch 'master' into fix-disabled

Author: Roxannej

.fatherrc.js

@@ -2,4 +2,4 @@ import { defineConfig } from 'father';
 
 export default defineConfig({
   plugins: ['@rc-component/father-plugin'],
-});
+});

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: ant-design # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: ant-design # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/main.yml

@@ -1,113 +1,6 @@
-name: CI
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
+name: ✅ test
+on: [push, pull_request]
 jobs:
-  setup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@master
-
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '16'
-
-      - name: cache package-lock.json
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: create package-lock.json
-        run: npm i --package-lock-only
-
-      - name: hack for singe file
-        run: |
-          if [ ! -d "package-temp-dir" ]; then
-            mkdir package-temp-dir
-          fi
-          cp package-lock.json package-temp-dir
-      - name: cache node_modules
-        id: node_modules_cache_id
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
-
-      - name: install
-        if: steps.node_modules_cache_id.outputs.cache-hit != 'true'
-        run: npm ci
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@master
-
-      - name: restore cache from package-lock.json
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: restore cache from node_modules
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
-
-      - name: lint
-        run: npm run lint
-
-    needs: setup
-
-  compile:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@master
-
-      - name: restore cache from package-lock.json
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: restore cache from node_modules
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
-
-      - name: compile
-        run: npm run compile
-
-    needs: setup
-
-  coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@master
-
-      - name: restore cache from package-lock.json
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: restore cache from node_modules
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
-
-      - name: coverage
-        run: npm test -- --coverage && bash <(curl -s https://codecov.io/bash)
-
-    needs: setup
+  test:
+    uses: react-component/rc-test/.github/workflows/test.yml@main
+    secrets: inherit

.gitignore

@@ -40,4 +40,6 @@ coverage/
 
 # dumi
 .dumi/tmp
-.dumi/tmp-production
+.dumi/tmp-production
+
+bun.lockb

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

.lintstagedrc.json

@@ -0,0 +1,3 @@
+{
+  "*": ["prettier --ignore-unknown --write"]
+}

CHANGELOG.md

@@ -1,54 +1 @@
-# Changelog
-
-## 2.4.3
-
-`2020-11-26`
-
-- fix: Calendar should not trigger `onChange` when date is `disabled`. [#183](https://github.com/react-component/picker/pull/183)
-
-## 2.4.2
-
-`2020-11-24`
-
-- fix: week range disabled rule. [#177](https://github.com/react-component/picker/pull/177)
-
-## 2.4.1
-
-`2020-11-20`
-
-- feat: add year start & end. [#176](https://github.com/react-component/picker/pull/176)
-
-## 2.4.0
-
-`2020-11-19`
-
-- feat: add start end. [#175](https://github.com/react-component/picker/pull/175)
-
-> It has not been updated for a long time and will be maintained from now on. More in [releases](https://github.com/react-component/picker/releases).
-
----
-## 0.6.0
-
-- support `maxColumnsPerRow`.
-
-## 0.5.0
-
-- support `theme="dark|light"`.
-
-## 0.4.0
-
-- support `columnLayout`.
-- support `backgroundColor`.
-
-## 0.3.0
-
-- support `style` and `className` for footer column and footer item.
-- support `LinkComponent` for footer item.
-
-## 0.2.0
-
-- Fix `lib` and `es` folders missing.
-
-## 0.1.0
-
-- First release.
+See https://github.com/react-component/picker/releases

README.md

@@ -1,10 +1,6 @@
 # rc-picker
 
-[![NPM version][npm-image]][npm-url]
-[![build status][github-actions-image]][github-actions-url]
-[![Codecov][codecov-image]][codecov-url]
-[![npm download][download-image]][download-url]
-[![bundle size][bundlephobia-image]][bundlephobia-url]
+[![NPM version][npm-image]][npm-url] [![build status][github-actions-image]][github-actions-url] [![Codecov][codecov-image]][codecov-url] [![npm download][download-image]][download-url] [![bundle size][bundlephobia-image]][bundlephobia-url]
 
 [npm-image]: http://img.shields.io/npm/v/rc-picker.svg?style=flat-square
 [npm-url]: http://npmjs.org/package/rc-picker
@@ -49,7 +45,7 @@ render(<Picker />, mountNode);
 | className | String | '' | additional css class of root dom node |
 | style | React.CSSProperties |  | additional style of root dom node |
 | dropdownClassName | String | '' | additional className applied to dropdown |
-| dropdownAlign | Object:alignConfig of [dom-align](https://github.com/yiminghe/dom-align) |  | value will be merged into placement's dropdownAlign config |
+| popupAlign | Object:alignConfig of [dom-align](https://github.com/yiminghe/dom-align) |  | value will be merged into placement's popupAlign config |
 | popupStyle | React.CSSProperties |  | customize popup style |
 | transitionName | String | '' | css class for animation |
 | locale | Object | import from 'rc-picker/lib/locale/en_US' | rc-picker locale |

assets/index.less

@@ -37,6 +37,12 @@
   &-invalid {
     box-shadow: 0 0 2px red;
   }
+
+  &-panels {
+    display: flex;
+    flex-wrap: nowrap;
+  }
+
   &-panel {
     display: inline-block;
     vertical-align: top;
@@ -109,7 +115,9 @@
       border: none;
       outline: none;
       cursor: pointer;
-      transition: background 0.3s, border 0.3s;
+      transition:
+        background 0.3s,
+        border 0.3s;
 
       &:hover {
         background: fade(blue, 30%);
@@ -265,6 +273,7 @@
       position: relative;
       display: flex;
       max-height: 200px;
+      direction: ltr;
 
       // &::after {
       //   position: absolute;
@@ -402,14 +411,9 @@
   &-clear {
     position: absolute;
     top: 0;
-    right: 4px;
+    inset-inline-end: 4px;
     cursor: pointer;
 
-    .@{prefix-cls}-rtl & {
-      right: auto;
-      left: 4px;
-    }
-
     &-btn::after {
       content: '×';
     }
@@ -429,18 +433,22 @@
       display: none;
     }
 
+    &-rtl {
+      direction: rtl;
+    }
+
     // Panel
     @arrow-size: 10px;
 
     &-placement-topLeft,
     &-placement-topRight {
       .@{prefix-cls}-range-arrow {
-        bottom: @arrow-size / 2 + 1px;
+        bottom: (@arrow-size / 2 + 1px);
         transform: rotate(135deg);
       }
     }
     &-placement-bottomLeft,
-    &-placement-bottomright {
+    &-placement-bottomRight {
       .@{prefix-cls}-range-arrow {
         top: (@arrow-size / 2 + 1px);
         transform: rotate(-45deg);
@@ -449,32 +457,21 @@
 
     .@{prefix-cls}-range-arrow {
       position: absolute;
-      left: @arrow-size;
       z-index: 1;
       width: @arrow-size;
       height: @arrow-size;
-      margin-left: 10px;
       transition: all 0.3s;
 
-      .@{prefix-cls}-dropdown-rtl& {
-        right: @arrow-size;
-        left: auto;
-        margin-right: 10px;
-        margin-left: 0;
-      }
-
       &::before,
       &::after {
         position: absolute;
         top: 50%;
-        left: 50%;
+        inset-inline-start: 50%;
         box-sizing: border-box;
         transform: translate(-50%, -50%);
         content: '';
 
         .@{prefix-cls}-dropdown-rtl& {
-          right: 50%;
-          left: auto;
           transform: translate(50%, -50%);
         }
       }
@@ -488,7 +485,7 @@
       &::after {
         width: @arrow-size - 2px;
         height: @arrow-size - 2px;
-        border: (@arrow-size - 2px) / 2 solid blue;
+        border: ((@arrow-size - 2px) / 2) solid blue;
         border-color: @background-color @background-color transparent transparent;
       }
     }
@@ -547,6 +544,7 @@
     box-sizing: border-box;
     width: 100%;
     border: 1px solid green;
+    min-height: 1em;
 
     &-item {
       flex: none;
@@ -558,6 +556,13 @@
     border: 1px solid blue;
   }
 
+  &-selection-placeholder {
+    pointer-events: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+  }
+
   &-multiple-input {
     width: 10px;
     opacity: 0.1;

bunfig.toml

@@ -0,0 +1,2 @@
+[install]
+peer = false