Skip to content

Commit

Permalink
Merge branch 'alibaba-fusion:master' into feat/box-update
Browse files Browse the repository at this point in the history
  • Loading branch information
YunMeng99 authored Jan 17, 2024
2 parents bb1fefb + 67af4ec commit f347a75
Show file tree
Hide file tree
Showing 969 changed files with 4,012 additions and 15,367 deletions.
12 changes: 6 additions & 6 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
"node": true
},
"parser": "@typescript-eslint/parser",
"extends": [
"@alifd/eslint-config-next",
"plugin:@typescript-eslint/recommended",
"prettier",
"./a11y.eslintrc"
],
"extends": ["@alifd/eslint-config-next", "plugin:@typescript-eslint/recommended", "prettier"],
"plugins": ["@typescript-eslint", "eslint-plugin-tsdoc"],
"settings": {
"react": {
Expand All @@ -22,6 +17,11 @@
"files": ["./components/**/__tests__/**/*.ts", "./components/**/__tests__/**/*.tsx"],
"extends": ["plugin:cypress/recommended"],
"plugins": ["cypress"]
},
{
"files": ["./components/**"],
"extends": ["./a11y.eslintrc"],
"excludedFiles": ["**/__tests__/**", "**/__docs__/**"]
}
],
"rules": {
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ __html/
dist/
es/
lib/
types/
test/coverage/
test/**/coverage/
compiled_docs/
Expand Down
39 changes: 39 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,44 @@
# Change Log

## [1.27.2](https://github.com/alibaba-fusion/next/compare/1.27.1...1.27.2) (2024-01-11)


### Features

* **Rating:** add tip info background token, close [#4705](https://github.com/alibaba-fusion/next/issues/4705) ([#4706](https://github.com/alibaba-fusion/next/issues/4706)) ([2f71df9](https://github.com/alibaba-fusion/next/commit/2f71df9b18126487b880de595b269b917f23ff7b))


### Bug Fixes

* **DatePicker2:** default current day when next range is empty, close [#3877](https://github.com/alibaba-fusion/next/issues/3877) ([#4711](https://github.com/alibaba-fusion/next/issues/4711)) ([62eec1b](https://github.com/alibaba-fusion/next/commit/62eec1b92c8312a03f6cba9292249aff147c8cc8))
* **Field:** compatible for Firefox, close [#4288](https://github.com/alibaba-fusion/next/issues/4288) ([#4712](https://github.com/alibaba-fusion/next/issues/4712)) ([b109dce](https://github.com/alibaba-fusion/next/commit/b109dceb74c91a4b3c1ae2faf933321cb738c961))
* **Form:** pass device to responsive-grid, close [#4513](https://github.com/alibaba-fusion/next/issues/4513) ([#4707](https://github.com/alibaba-fusion/next/issues/4707)) ([110937b](https://github.com/alibaba-fusion/next/commit/110937ba84255a888f77ca30a349caa26c239d2f))
* **Table:** fix merge width calculation logic when lock, close [#4264](https://github.com/alibaba-fusion/next/issues/4264) ([#4709](https://github.com/alibaba-fusion/next/issues/4709)) ([ed36371](https://github.com/alibaba-fusion/next/commit/ed36371b02acc1171c3abaa94e37be4e286d975d))


## [1.27.1](https://github.com/alibaba-fusion/next/compare/1.27.1-alpha.1...1.27.1) (2024-01-03)

### Bug Fixes
- Set esModuleInterop true to compat esbuild



## [1.27.1-alpha.1](https://github.com/alibaba-fusion/next/compare/1.27.1-alpha.0...1.27.1-alpha.1) (2024-01-03)


## [1.27.1-alpha.0](https://github.com/alibaba-fusion/next/compare/1.27.0...1.27.1-alpha.0) (2024-01-03)


## [1.27.0](https://github.com/alibaba-fusion/next/compare/1.26.37...1.27.0) (2024-01-02)

### Code Refactoring
- Create new project structure
- Upgrade to TypeScript Project progressive
- Improve maintenance for documentation and component APIs
- Improve test cases with cypress



## [1.27.0-alpha.2](https://github.com/alibaba-fusion/next/compare/1.27.0-alpha.1...1.27.0-alpha.2) (2023-12-29)


Expand Down
15 changes: 14 additions & 1 deletion LATESTLOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
# Latest Log

## [1.27.0-alpha.2](https://github.com/alibaba-fusion/next/compare/1.27.0-alpha.1...1.27.0-alpha.2) (2023-12-29)
## [1.27.2](https://github.com/alibaba-fusion/next/compare/1.27.1...1.27.2) (2024-01-11)


### Features

* **Rating:** add tip info background token, close [#4705](https://github.com/alibaba-fusion/next/issues/4705) ([#4706](https://github.com/alibaba-fusion/next/issues/4706)) ([2f71df9](https://github.com/alibaba-fusion/next/commit/2f71df9b18126487b880de595b269b917f23ff7b))


### Bug Fixes

* **DatePicker2:** default current day when next range is empty, close [#3877](https://github.com/alibaba-fusion/next/issues/3877) ([#4711](https://github.com/alibaba-fusion/next/issues/4711)) ([62eec1b](https://github.com/alibaba-fusion/next/commit/62eec1b92c8312a03f6cba9292249aff147c8cc8))
* **Field:** compatible for Firefox, close [#4288](https://github.com/alibaba-fusion/next/issues/4288) ([#4712](https://github.com/alibaba-fusion/next/issues/4712)) ([b109dce](https://github.com/alibaba-fusion/next/commit/b109dceb74c91a4b3c1ae2faf933321cb738c961))
* **Form:** pass device to responsive-grid, close [#4513](https://github.com/alibaba-fusion/next/issues/4513) ([#4707](https://github.com/alibaba-fusion/next/issues/4707)) ([110937b](https://github.com/alibaba-fusion/next/commit/110937ba84255a888f77ca30a349caa26c239d2f))
* **Table:** fix merge width calculation logic when lock, close [#4264](https://github.com/alibaba-fusion/next/issues/4264) ([#4709](https://github.com/alibaba-fusion/next/issues/4709)) ([ed36371](https://github.com/alibaba-fusion/next/commit/ed36371b02acc1171c3abaa94e37be4e286d975d))

124 changes: 62 additions & 62 deletions components.scss
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
@import "lib/affix/main.scss";
@import "lib/animate/main.scss";
@import "lib/icon/main.scss";
@import "lib/overlay/main.scss";
@import "lib/loading/main.scss";
@import "lib/radio/main.scss";
@import "lib/badge/main.scss";
@import "lib/balloon/main.scss";
@import "lib/menu/main.scss";
@import "lib/dropdown/main.scss";
@import "lib/breadcrumb/main.scss";
@import "lib/button/main.scss";
@import "lib/input/main.scss";
@import "lib/calendar/main.scss";
@import "lib/card/main.scss";
@import "lib/cascader/main.scss";
@import "lib/cascader-select/main.scss";
@import "lib/checkbox/main.scss";
@import "lib/collapse/main.scss";
@import "lib/config-provider/main.scss";
@import "lib/time-picker/main.scss";
@import "lib/date-picker/main.scss";
@import "lib/message/main.scss";
@import "lib/dialog/main.scss";
@import "lib/drawer/main.scss";
@import "lib/field/main.scss";
@import "lib/grid/main.scss";
@import "lib/responsive-grid/main.scss";
@import "lib/form/main.scss";
@import "lib/avatar/main.scss";
@import "lib/select/main.scss";
@import "lib/list/main.scss";
@import "lib/menu-button/main.scss";
@import "lib/nav/main.scss";
@import "lib/number-picker/main.scss";
@import "lib/pagination/main.scss";
@import "lib/paragraph/main.scss";
@import "lib/progress/main.scss";
@import "lib/range/main.scss";
@import "lib/rating/main.scss";
@import "lib/search/main.scss";
@import "lib/slider/main.scss";
@import "lib/split-button/main.scss";
@import "lib/step/main.scss";
@import "lib/switch/main.scss";
@import "lib/tab/main.scss";
@import "lib/tag/main.scss";
@import "lib/timeline/main.scss";
@import "lib/transfer/main.scss";
@import "lib/tree/main.scss";
@import "lib/tree-select/main.scss";
@import "lib/upload/main.scss";
@import "lib/virtual-list/main.scss";
@import "lib/shell/main.scss";
@import "lib/notification/main.scss";
@import "lib/typography/main.scss";
@import "lib/divider/main.scss";
@import "lib/box/main.scss";
@import "lib/table/main.scss";
@import "lib/calendar2/main.scss";
@import "lib/time-picker2/main.scss";
@import "lib/date-picker2/main.scss";
@import "./lib/affix/main.scss";
@import "./lib/animate/main.scss";
@import "./lib/icon/main.scss";
@import "./lib/overlay/main.scss";
@import "./lib/loading/main.scss";
@import "./lib/radio/main.scss";
@import "./lib/badge/main.scss";
@import "./lib/balloon/main.scss";
@import "./lib/menu/main.scss";
@import "./lib/dropdown/main.scss";
@import "./lib/breadcrumb/main.scss";
@import "./lib/button/main.scss";
@import "./lib/input/main.scss";
@import "./lib/calendar/main.scss";
@import "./lib/card/main.scss";
@import "./lib/cascader/main.scss";
@import "./lib/cascader-select/main.scss";
@import "./lib/checkbox/main.scss";
@import "./lib/collapse/main.scss";
@import "./lib/config-provider/main.scss";
@import "./lib/time-picker/main.scss";
@import "./lib/date-picker/main.scss";
@import "./lib/message/main.scss";
@import "./lib/dialog/main.scss";
@import "./lib/drawer/main.scss";
@import "./lib/field/main.scss";
@import "./lib/grid/main.scss";
@import "./lib/responsive-grid/main.scss";
@import "./lib/form/main.scss";
@import "./lib/avatar/main.scss";
@import "./lib/select/main.scss";
@import "./lib/list/main.scss";
@import "./lib/menu-button/main.scss";
@import "./lib/nav/main.scss";
@import "./lib/number-picker/main.scss";
@import "./lib/pagination/main.scss";
@import "./lib/paragraph/main.scss";
@import "./lib/progress/main.scss";
@import "./lib/range/main.scss";
@import "./lib/rating/main.scss";
@import "./lib/search/main.scss";
@import "./lib/slider/main.scss";
@import "./lib/split-button/main.scss";
@import "./lib/step/main.scss";
@import "./lib/switch/main.scss";
@import "./lib/tab/main.scss";
@import "./lib/tag/main.scss";
@import "./lib/timeline/main.scss";
@import "./lib/transfer/main.scss";
@import "./lib/tree/main.scss";
@import "./lib/tree-select/main.scss";
@import "./lib/upload/main.scss";
@import "./lib/virtual-list/main.scss";
@import "./lib/shell/main.scss";
@import "./lib/notification/main.scss";
@import "./lib/typography/main.scss";
@import "./lib/divider/main.scss";
@import "./lib/box/main.scss";
@import "./lib/table/main.scss";
@import "./lib/calendar2/main.scss";
@import "./lib/time-picker2/main.scss";
@import "./lib/date-picker2/main.scss";
4 changes: 2 additions & 2 deletions components/affix/__docs__/demo/absolute-position/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import React from 'react';
import ReactDOM from 'react-dom';
import { Affix, Button } from '@alifd/next';

class Demo extends React.Component {
Expand Down
4 changes: 2 additions & 2 deletions components/affix/__docs__/demo/basic/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import React from 'react';
import ReactDOM from 'react-dom';
import { Affix, Button } from '@alifd/next';

ReactDOM.render(
Expand Down
4 changes: 2 additions & 2 deletions components/affix/__docs__/demo/custom-container/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import React from 'react';
import ReactDOM from 'react-dom';
import { Affix, Button } from '@alifd/next';

class Demo extends React.Component {
Expand Down
4 changes: 2 additions & 2 deletions components/affix/__docs__/demo/custom-offset/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import React from 'react';
import ReactDOM from 'react-dom';
import { Affix, Button } from '@alifd/next';

ReactDOM.render(
Expand Down
4 changes: 2 additions & 2 deletions components/affix/__docs__/demo/on-affix/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import React from 'react';
import ReactDOM from 'react-dom';
import { Affix, Button } from '@alifd/next';

class Demo extends React.Component<unknown, { affixed: boolean }> {
Expand Down
2 changes: 1 addition & 1 deletion components/affix/__tests__/index-spec.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import Button from '../../button';
import Affix from '../index';

Expand Down
7 changes: 3 additions & 4 deletions components/affix/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as React from 'react';
import { Component } from 'react';
import * as PropTypes from 'prop-types';
import * as classnames from 'classnames';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import ResizeObserver from 'resize-observer-polyfill';
import { polyfill } from 'react-lifecycles-compat';

Expand Down
2 changes: 1 addition & 1 deletion components/affix/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as React from 'react';
import React from 'react';
import { CommonProps } from '../util';

export interface AffixMode {
Expand Down
4 changes: 2 additions & 2 deletions components/animate/__docs__/demo/basic/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import React from 'react';
import ReactDOM from 'react-dom';
import { Animate } from '@alifd/next';

class Demo extends React.Component {
Expand Down
4 changes: 2 additions & 2 deletions components/animate/__docs__/demo/expand/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import React from 'react';
import ReactDOM from 'react-dom';
import { Animate } from '@alifd/next';

class Demo extends React.Component {
Expand Down
4 changes: 2 additions & 2 deletions components/animate/__docs__/demo/multiple/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import React from 'react';
import ReactDOM from 'react-dom';
import { Animate } from '@alifd/next';

class TodoList extends React.Component {
Expand Down
2 changes: 1 addition & 1 deletion components/animate/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="react" />

import * as React from 'react';
import React from 'react';
import { CommonProps } from '../util';
import { TransitionProps } from 'react-transition-group/Transition';
import { TransitionGroupProps } from 'react-transition-group/TransitionGroup';
Expand Down
54 changes: 27 additions & 27 deletions components/animate/main.scss
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
@import "scss/mixin";
@import "scss/variable";
@import "./scss/mixin";
@import "./scss/variable";
@import "../core/index-noreset.scss";
@import "scss/_fading-entrances/_fadeIn.scss";
@import "scss/_fading-entrances/_fadeInDown.scss";
@import "scss/_fading-entrances/_fadeInDownSmall.scss";
@import "scss/_fading-entrances/_fadeInLeft.scss";
@import "scss/_fading-entrances/_fadeInRight.scss";
@import "scss/_fading-entrances/_fadeInUp.scss";
@import "scss/_fading-exits/_fadeOut.scss";
@import "scss/_fading-exits/_fadeOutDown.scss";
@import "scss/_fading-exits/_fadeOutLeft.scss";
@import "scss/_fading-exits/_fadeOutRight.scss";
@import "scss/_fading-exits/_fadeOutUp.scss";
@import "scss/_fading-exits/_fadeOutUpSmall.scss";
@import "scss/_sliding-exits/sliding-exits.scss";
@import "scss/_sliding-entrances/sliding-entrances.scss";
@import "scss/_zooming-entrances/_zoomIn.scss";
@import "scss/_zooming-exits/_zoomOut.scss";
@import "scss/_zooming-entrances/_zoomInBig.scss";
@import "scss/_zooming-exits/_zoomOutBig.scss";
@import "scss/_expand-entrances/_expandInDown.scss";
@import "scss/_expand-entrances/_expandInUp.scss";
@import "scss/_expand-entrances/_withFade.scss";
@import "scss/_expand-exits/_expandOutUp.scss";
@import "scss/_expand-exits/_expandOutDown.scss";
@import "scss/_expand-exits/_withFade.scss";
@import "scss/_attention-seekers/_pulse.scss";
@import "./scss/_fading-entrances/_fadeIn.scss";
@import "./scss/_fading-entrances/_fadeInDown.scss";
@import "./scss/_fading-entrances/_fadeInDownSmall.scss";
@import "./scss/_fading-entrances/_fadeInLeft.scss";
@import "./scss/_fading-entrances/_fadeInRight.scss";
@import "./scss/_fading-entrances/_fadeInUp.scss";
@import "./scss/_fading-exits/_fadeOut.scss";
@import "./scss/_fading-exits/_fadeOutDown.scss";
@import "./scss/_fading-exits/_fadeOutLeft.scss";
@import "./scss/_fading-exits/_fadeOutRight.scss";
@import "./scss/_fading-exits/_fadeOutUp.scss";
@import "./scss/_fading-exits/_fadeOutUpSmall.scss";
@import "./scss/_sliding-exits/sliding-exits.scss";
@import "./scss/_sliding-entrances/sliding-entrances.scss";
@import "./scss/_zooming-entrances/_zoomIn.scss";
@import "./scss/_zooming-exits/_zoomOut.scss";
@import "./scss/_zooming-entrances/_zoomInBig.scss";
@import "./scss/_zooming-exits/_zoomOutBig.scss";
@import "./scss/_expand-entrances/_expandInDown.scss";
@import "./scss/_expand-entrances/_expandInUp.scss";
@import "./scss/_expand-entrances/_withFade.scss";
@import "./scss/_expand-exits/_expandOutUp.scss";
@import "./scss/_expand-exits/_expandOutDown.scss";
@import "./scss/_expand-exits/_withFade.scss";
@import "./scss/_attention-seekers/_pulse.scss";

.fadeIn {
@include fadeIn();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// INDEX OF FADING EXITS

@import "_pulse";
@import "_shake";
@import "_press";
@import "_unpress";
@import "_buttonClick";
@import "./_pulse";
@import "./_shake";
@import "./_press";
@import "./_unpress";
@import "./_buttonClick";
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// INDEX OF FADING ENTRANCES

@import "_bounceIn";
@import "./_bounceIn";
2 changes: 1 addition & 1 deletion components/animate/scss/_bounce-exits/bounce-exits.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// INDEX OF FADING EXITS

@import "_bounceOut";
@import "./_bounceOut";
Loading

0 comments on commit f347a75

Please sign in to comment.